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

feat: return to previous page and/or category after marking topic unread

Browse Source 
... also return to category if pagination is active and previous page was another page in the thread
This commit is contained in:
psychobunny
2020-09-23 07:57:45 -04:00
parent 6ebd2c80e7
commit 48a8ec4ab2
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/src/client/topic/threadTools.js
View File

@@ -4,7 +4,8 @@
define('forum/topic/threadTools', [ define('forum/topic/threadTools', [
'components', 'components',
'translator', 'translator',
], function (components, translator) { 'handleBack',
], function (components, translator, handleBack) {
var ThreadTools = {}; var ThreadTools = {};
ThreadTools.init = function (tid, topicContainer) { ThreadTools.init = function (tid, topicContainer) {
@@ -50,6 +51,13 @@ define('forum/topic/threadTools', [
if (err) { if (err) {
return app.alertError(err); return app.alertError(err);
} }
if (app.previousUrl && !app.previousUrl.match('^/topic')) {
ajaxify.go(app.previousUrl, handleBack.onBackClicked);
} else if (ajaxify.data.category) {
ajaxify.go('category/' + ajaxify.data.category.slug, handleBack.onBackClicked);
}
app.alertSuccess('[[topic:mark_unread.success]]'); app.alertSuccess('[[topic:mark_unread.success]]');
}); });
return false; return false;

2
public/src/modules/handleBack.js
View File

@@ -15,6 +15,8 @@ define('handleBack', [
$(window).off('action:popstate', onBackClicked).on('action:popstate', onBackClicked); $(window).off('action:popstate', onBackClicked).on('action:popstate', onBackClicked);
}; };
handleBack.onBackClicked = onBackClicked;
function saveClickedIndex() { function saveClickedIndex() {
$('[component="category"]').on('click', '[component="topic/header"]', function () { $('[component="category"]').on('click', '[component="topic/header"]', function () {
var clickedIndex = $(this).parents('[data-index]').attr('data-index'); var clickedIndex = $(this).parents('[data-index]').attr('data-index');