gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix #38 - Unread indicator when new content appears above the fold

Browse source
This commit is contained in:
Eugen Rochko 2017-02-21 00:10:49 +01:00
parent f338cc6c94
commit 5997bb47a8
10 changed files with 116 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/components/reducers/timelines.jsx
View file

@ -36,6 +36,7 @@ const initialState = Immutable.Map({
isLoading: false,
loaded: false,
top: true,
unread: 0,
items: Immutable.List()
}),
@ -45,6 +46,7 @@ const initialState = Immutable.Map({
isLoading: false,
loaded: false,
top: true,
unread: 0,
items: Immutable.List()
}),
@ -55,6 +57,7 @@ const initialState = Immutable.Map({
isLoading: false,
loaded: false,
top: true,
unread: 0,
items: Immutable.List()
}),
@ -65,6 +68,7 @@ const initialState = Immutable.Map({
id: null,
loaded: false,
top: true,
unread: 0,
items: Immutable.List()
}),
@ -155,6 +159,10 @@ const updateTimeline = (state, timeline, status, references) => {
state = normalizeStatus(state, status);
if (!top) {
state = state.updateIn([timeline, 'unread'], unread => unread + 1);
}
state = state.updateIn([timeline, 'items'], Immutable.List(), list => {
if (top && list.size > 40) {
list = list.take(20);
@ -249,6 +257,14 @@ const resetTimeline = (state, timeline, id) => {
return state;
};
const updateTop = (state, timeline, top) => {
if (top) {
state = state.setIn([timeline, 'unread'], 0);
}
return state.setIn([timeline, 'top'], top);
};
export default function timelines(state = initialState, action) {
switch(action.type) {
case TIMELINE_REFRESH_REQUEST:
@ -280,7 +296,7 @@ export default function timelines(state = initialState, action) {
case ACCOUNT_BLOCK_SUCCESS:
return filterTimelines(state, action.relationship, action.statuses);
case TIMELINE_SCROLL_TOP:
return state.setIn([action.timeline, 'top'], action.top);
return updateTop(state, action.timeline, action.top);
default:
return state;
}