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

fix: #10642, fix order of dom ready events

Browse Source 
plugin $().ready hooks will fire first, core will fire last
This commit is contained in:
Barış Soner Uşaklı
2022-05-28 19:43:45 -04:00
parent abd8e216b0
commit 2bfccac72a
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,8 @@ require('../app');
// eslint-disable-next-line import/no-unresolved // eslint-disable-next-line import/no-unresolved
require('../../scripts-admin'); require('../../scripts-admin');
app.onDomReady();
(function () { (function () {
let logoutTimer = 0; let logoutTimer = 0;
let logoutMessage; let logoutMessage;

17
public/src/app.js
View File

@@ -24,13 +24,16 @@ app.currentRoom = null;
app.widgets = {}; app.widgets = {};
app.flags = {}; app.flags = {};
document.addEventListener('DOMContentLoaded', async function () { app.onDomReady = function () {
if (app.user.timeagoCode && app.user.timeagoCode !== 'en') { $(document).ready(async function () {
await import(/* webpackChunkName: "timeago/[request]" */ 'timeago/locales/jquery.timeago.' + app.user.timeagoCode); if (app.user.timeagoCode && app.user.timeagoCode !== 'en') {
} await import(/* webpackChunkName: "timeago/[request]" */ 'timeago/locales/jquery.timeago.' + app.user.timeagoCode);
ajaxify.parseData(); }
app.load(); ajaxify.parseData();
}); app.load();
});
};
(function () { (function () {
let appLoaded = false; let appLoaded = false;

2
public/src/client.js
View File

@@ -6,3 +6,5 @@ require('./app');
// from plugins that add files to "scripts" block in plugin.json // from plugins that add files to "scripts" block in plugin.json
// eslint-disable-next-line import/no-unresolved // eslint-disable-next-line import/no-unresolved
require('../scripts-client'); require('../scripts-client');
app.onDomReady();