Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8558, only navigate if user is in same topic

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-08-11 10:20:17 -04:00
parent b5a2e4b69f
commit 79e847d424
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,14 +21,13 @@ define('forum/topic', [
clearTimeout(Topic.replaceURLTimeout); clearTimeout(Topic.replaceURLTimeout);
Topic.replaceURLTimeout = 0; Topic.replaceURLTimeout = 0;
} }
events.removeListeners();
if (!String(data.url).startsWith('topic/')) { if (!String(data.url).startsWith('topic/')) {
navigator.disable(); navigator.disable();
components.get('navbar/title').find('span').text('').hide(); components.get('navbar/title').find('span').text('').hide();
app.removeAlert('bookmark'); app.removeAlert('bookmark');
events.removeListeners();
require(['search'], function (search) { require(['search'], function (search) {
if (search.topicDOM.active) { if (search.topicDOM.active) {
search.topicDOM.end(); search.topicDOM.end();

6
public/src/client/topic/events.js
View File

@@ -83,14 +83,14 @@ define('forum/topic/events', [
}).html(data.post.bookmarks).attr('data-bookmarks', data.post.bookmarks); }).html(data.post.bookmarks).attr('data-bookmarks', data.post.bookmarks);
} }
function onTopicPurged() { function onTopicPurged(data) {
if (ajaxify.data.category && ajaxify.data.category.slug) { if (ajaxify.data.category && ajaxify.data.category.slug && parseInt(data.tid, 10) === parseInt(ajaxify.data.tid, 10)) {
ajaxify.go('category/' + ajaxify.data.category.slug, null, true); ajaxify.go('category/' + ajaxify.data.category.slug, null, true);
} }
} }
function onTopicMoved(data) { function onTopicMoved(data) {
if (data && data.slug) { if (data && data.slug && parseInt(data.tid, 10) === parseInt(ajaxify.data.tid, 10)) {
ajaxify.go('topic/' + data.slug, null, true); ajaxify.go('topic/' + data.slug, null, true);
} }
} }