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(hooks): update action:ajaxify.end to use new hooks module

Browse Source
This commit is contained in:
Julian Lam
2021-01-26 14:32:50 -05:00
parent 412d285850
commit 1d77572117
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/admin/admin.js
View File

@@ -30,10 +30,12 @@
}, 3600000);
}
$(window).on('action:ajaxify.end', function () {
require(['hooks'], (hooks) => {
hooks.on('action:ajaxify.end', () => {
showCorrectNavTab();
startLogoutTimer();
});
});
function showCorrectNavTab() {
// show correct tab if url has #
@@ -66,12 +68,12 @@
});
function setupNProgress() {
require(['nprogress'], function (NProgress) {
require(['nprogress', 'hooks'], function (NProgress, hooks) {
$(window).on('action:ajaxify.start', function () {
NProgress.set(0.7);
});
$(window).on('action:ajaxify.end', function () {
hooks.on('action:ajaxify.end', function () {
NProgress.done();
});
});

8
public/src/ajaxify.js
View File

@@ -52,7 +52,9 @@ ajaxify = window.ajaxify || {};
// If any listeners alter url and set it to an empty string, abort the ajaxification
if (url === null) {
$(window).trigger('action:ajaxify.end', { url: url, tpl_url: ajaxify.data.template.name, title: ajaxify.data.title });
require(['hooks'], function (hooks) {
hooks.fire('action:ajaxify.end', { url: url, tpl_url: ajaxify.data.template.name, title: ajaxify.data.title });
});
return false;
}
@@ -281,7 +283,9 @@ ajaxify = window.ajaxify || {};
window.scrollTo(0, 0);
}
ajaxify.loadScript(tpl_url, function done() {
$(window).trigger('action:ajaxify.end', { url: url, tpl_url: tpl_url, title: ajaxify.data.title });
require(['hooks'], function (hooks) {
hooks.fire('action:ajaxify.end', { url: url, tpl_url: tpl_url, title: ajaxify.data.title });
});
});
ajaxify.widgets.render(tpl_url);

4
public/src/app.js
View File

@@ -55,13 +55,15 @@ app.cacheBuster = null;
}
};
document.body.addEventListener('click', earlyClick);
$(window).on('action:ajaxify.end', function () {
require(['hooks'], function (hooks) {
hooks.on('action:ajaxify.end', function () {
document.body.removeEventListener('click', earlyClick);
earlyQueue.forEach(function (el) {
el.click();
});
earlyQueue = [];
});
});
} else {
setTimeout(app.handleEarlyClicks, 50);
}

4
public/src/modules/navigator.js
View File

@@ -1,6 +1,6 @@
'use strict';
define('navigator', ['forum/pagination', 'components'], function (pagination, components) {
define('navigator', ['forum/pagination', 'components', 'hooks'], function (pagination, components, hooks) {
var navigator = {};
var index = 0;
var count = 0;
@@ -142,7 +142,7 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
}
var mouseDragging = false;
$(window).on('action:ajaxify.end', function () {
hooks.on('action:ajaxify.end', function () {
renderPostIndex = null;
});
$('.pagination-block .dropdown-menu').parent().on('shown.bs.dropdown', function () {