Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8538, go to first unread instead of last read

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-07-31 10:34:10 -04:00
parent 029f477434
commit 519e665939
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/client/topic.js
View File

@@ -136,7 +136,7 @@ define('forum/topic', [
timeout: 0, timeout: 0,
type: 'info', type: 'info',
clickfn: function () { clickfn: function () {
navigator.scrollToIndex(parseInt(bookmark - 1, 10), true); navigator.scrollToIndex(parseInt(bookmark, 10), true);
}, },
closefn: function () { closefn: function () {
storage.removeItem('topic:' + tid + ':bookmark'); storage.removeItem('topic:' + tid + ':bookmark');
@@ -259,7 +259,7 @@ define('forum/topic', [
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
ajaxify.data.bookmark = index; ajaxify.data.bookmark = index + 1;
}); });
} else { } else {
storage.setItem(bookmarkKey, index); storage.setItem(bookmarkKey, index);

4
src/topics/index.js
View File

@@ -119,7 +119,9 @@ Topics.getTopicsByTids = async function (tids, options) {
topic.isOwner = topic.uid === parseInt(uid, 10); topic.isOwner = topic.uid === parseInt(uid, 10);
topic.ignored = isIgnored[i]; topic.ignored = isIgnored[i];
topic.unread = !hasRead[i] && !isIgnored[i]; topic.unread = !hasRead[i] && !isIgnored[i];
topic.bookmark = sortOldToNew ? Math.max(1, topic.postcount + 2 - bookmarks[i]) : bookmarks[i]; topic.bookmark = sortOldToNew ?
Math.max(1, topic.postcount + 2 - bookmarks[i]) :
Math.min(topic.postcount, bookmarks[i] + 1);
topic.unreplied = !topic.teaser; topic.unreplied = !topic.teaser;
topic.icons = []; topic.icons = [];