Skip to content

Node.js based forum software built for the modern web

fix: #14293, close crosspost modal when navigating away from topic

Julian Lam29e09dd3dbf4
diff --git a/public/src/client/topic/crosspost.js b/public/src/client/topic/crosspost.js
index 473450f3d1..13b5523d4a 100644
--- a/public/src/client/topic/crosspost.js
+++ b/public/src/client/topic/crosspost.js
@@ -62,9 +62,19 @@ define('forum/topic/crosspost', [
modal.find('#crosspost_thread_commit').on('click', onCommitClicked);
modal.find('#crosspost_topic_cancel').on('click', closeCrosspostModal);
+
+ $(window).off('action:ajaxify.end', onAjaxifyEnd)
+ .on('action:ajaxify.end', onAjaxifyEnd);
});
}
+ function onAjaxifyEnd() {
+ if (ajaxify.data.template.name !== 'topic' || ajaxify.data.tid !== Crosspost.tid) {
+ closeCrosspostModal();
+ $(window).off('action:ajaxify.end', onAjaxifyEnd);
+ }
+ }
+
function onCategoriesSelected(data) {
selectedCids = data.selectedCids.filter(cid => utils.isNumber(cid) && cid > 0);
if (data.changed) {
@@ -146,6 +156,7 @@ define('forum/topic/crosspost', [
if (modal) {
modal.remove();
modal = null;
+ $(window).off('action:ajaxify.end', onAjaxifyEnd);
}
}