Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ilja
pleroma-fe
Commits
0f8ace48
Commit
0f8ace48
authored
5 years ago
by
Tae Hoon
Browse files
Options
Downloads
Patches
Plain Diff
update status eliminating logic
parent
876c6de8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/timeline/timeline.js
+10
-4
10 additions, 4 deletions
src/components/timeline/timeline.js
src/components/timeline/timeline.vue
+9
-7
9 additions, 7 deletions
src/components/timeline/timeline.vue
with
19 additions
and
11 deletions
src/components/timeline/timeline.js
+
10
−
4
View file @
0f8ace48
...
...
@@ -41,12 +41,18 @@ const Timeline = {
footer
:
[
'
timeline-footer
'
].
concat
(
!
this
.
embedded
?
[
'
panel-footer
'
]
:
[])
}
},
statuses
()
{
// id map of statuses which need to be hidden in the main list due to pinning logic
excludedStatusIdsObject
()
{
const
result
=
{}
if
(
this
.
pinnedStatusIds
&&
this
.
pinnedStatusIds
.
length
>
0
)
{
return
this
.
timeline
.
visibleStatuses
&&
this
.
timeline
.
visibleStatuses
.
filter
(
status
=>
!
this
.
pinnedStatusIds
.
includes
(
status
.
id
))
}
else
{
return
this
.
timeline
.
visibleStatuses
for
(
let
status
of
this
.
timeline
.
visibleStatuses
)
{
if
(
this
.
pinnedStatusIds
.
indexOf
(
status
.
id
)
===
-
1
)
{
break
}
result
[
status
.
id
]
=
true
}
}
return
result
}
},
components
:
{
...
...
This diff is collapsed.
Click to expand it.
src/components/timeline/timeline.vue
+
9
−
7
View file @
0f8ace48
...
...
@@ -38,13 +38,15 @@
:show-pinned=
"true"
/>
</
template
>
<conversation
v-for=
"status in statuses"
:key=
"status.id"
class=
"status-fadein"
:statusoid=
"status"
:collapsable=
"true"
/>
<
template
v-for=
"status in timeline.visibleStatuses"
>
<conversation
v-if=
"!excludedStatusIdsObject[status.id]"
:key=
"status.id"
class=
"status-fadein"
:statusoid=
"status"
:collapsable=
"true"
/>
</
template
>
</div>
</div>
<div
:class=
"classes.footer"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment