Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joseph Nuthalapati
pleroma-fe
Commits
7f9feacd
Commit
7f9feacd
authored
May 26, 2019
by
Tae Hoon
Browse files
prevent showing pinned statuses twice
parent
4827e4d9
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/components/timeline/timeline.js
View file @
7f9feacd
...
...
@@ -11,7 +11,8 @@ const Timeline = {
'
userId
'
,
'
tag
'
,
'
embedded
'
,
'
count
'
'
count
'
,
'
excludedStatusIds
'
],
data
()
{
return
{
...
...
@@ -39,6 +40,13 @@ const Timeline = {
body
:
[
'
timeline-body
'
].
concat
(
!
this
.
embedded
?
[
'
panel-body
'
]
:
[]),
footer
:
[
'
timeline-footer
'
].
concat
(
!
this
.
embedded
?
[
'
panel-footer
'
]
:
[])
}
},
statuses
()
{
if
(
this
.
excludedStatusIds
&&
this
.
excludedStatusIds
.
length
>
0
)
{
return
this
.
timeline
.
visibleStatuses
&&
this
.
timeline
.
visibleStatuses
.
filter
(
status
=>
!
this
.
excludedStatusIds
.
includes
(
status
.
id
))
}
else
{
return
this
.
timeline
.
visibleStatuses
}
}
},
components
:
{
...
...
src/components/timeline/timeline.vue
View file @
7f9feacd
...
...
@@ -29,7 +29,7 @@
<div
:class=
"classes.body"
>
<div
class=
"timeline"
>
<conversation
v-for=
"status in
timeline.visibleS
tatuses"
v-for=
"status in
s
tatuses"
:key=
"status.id"
class=
"status-fadein"
:statusoid=
"status"
...
...
src/components/user_profile/user_profile.vue
View file @
7f9feacd
...
...
@@ -75,6 +75,7 @@
timeline-name=
"media"
:timeline=
"media"
:user-id=
"userId"
:excludedStatusIds=
"user.pinnedStatuseIds"
/>
<Timeline
v-if=
"isUs"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment