Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mastofe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Pleroma
mastofe
Commits
3e0ed36e
Unverified
Commit
3e0ed36e
authored
6 years ago
by
Eugen Rochko
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix home timeline perpetually reloading when empty (#10130)
Regression from #6876
parent
5ecbf4d4
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
app/javascript/mastodon/features/home_timeline/index.js
+1
-1
1 addition, 1 deletion
app/javascript/mastodon/features/home_timeline/index.js
app/javascript/mastodon/reducers/timelines.js
+2
-0
2 additions, 0 deletions
app/javascript/mastodon/reducers/timelines.js
with
3 additions
and
1 deletion
app/javascript/mastodon/features/home_timeline/index.js
+
1
−
1
View file @
3e0ed36e
...
...
@@ -16,7 +16,7 @@ const messages = defineMessages({
const
mapStateToProps
=
state
=>
({
hasUnread
:
state
.
getIn
([
'
timelines
'
,
'
home
'
,
'
unread
'
])
>
0
,
isPartial
:
state
.
getIn
([
'
timelines
'
,
'
home
'
,
'
i
tems
'
,
0
],
null
)
===
null
,
isPartial
:
state
.
getIn
([
'
timelines
'
,
'
home
'
,
'
i
sPartial
'
])
,
});
export
default
@
connect
(
mapStateToProps
)
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/reducers/timelines.js
+
2
−
0
View file @
3e0ed36e
...
...
@@ -29,6 +29,8 @@ const initialTimeline = ImmutableMap({
const
expandNormalizedTimeline
=
(
state
,
timeline
,
statuses
,
next
,
isPartial
,
isLoadingRecent
)
=>
{
return
state
.
update
(
timeline
,
initialTimeline
,
map
=>
map
.
withMutations
(
mMap
=>
{
mMap
.
set
(
'
isLoading
'
,
false
);
mMap
.
set
(
'
isPartial
'
,
isPartial
);
if
(
!
next
&&
!
isLoadingRecent
)
mMap
.
set
(
'
hasMore
'
,
false
);
if
(
!
statuses
.
isEmpty
())
{
...
...
This diff is collapsed.
Click to expand it.
Haelwenn
@lanodan
mentioned in commit
cce1c325
·
6 years ago
mentioned in commit
cce1c325
mentioned in commit cce1c3252f271bb5daa5ace05c971d6e1b8f298d
Toggle commit list
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