From 2bfccac72aeaad210ca7ab6f1814f3c7ae0e9964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 28 May 2022 19:43:45 -0400 Subject: [PATCH] fix: #10642, fix order of dom ready events plugin $().ready hooks will fire first, core will fire last --- public/src/admin/admin.js | 2 ++ public/src/app.js | 17 ++++++++++------- public/src/client.js | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index c31dea6acc..dd1b80b05e 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -7,6 +7,8 @@ require('../app'); // eslint-disable-next-line import/no-unresolved require('../../scripts-admin'); +app.onDomReady(); + (function () { let logoutTimer = 0; let logoutMessage; diff --git a/public/src/app.js b/public/src/app.js index eb2ef78280..b0187e9361 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -24,13 +24,16 @@ app.currentRoom = null; app.widgets = {}; app.flags = {}; -document.addEventListener('DOMContentLoaded', async function () { - if (app.user.timeagoCode && app.user.timeagoCode !== 'en') { - await import(/* webpackChunkName: "timeago/[request]" */ 'timeago/locales/jquery.timeago.' + app.user.timeagoCode); - } - ajaxify.parseData(); - app.load(); -}); +app.onDomReady = function () { + $(document).ready(async function () { + if (app.user.timeagoCode && app.user.timeagoCode !== 'en') { + await import(/* webpackChunkName: "timeago/[request]" */ 'timeago/locales/jquery.timeago.' + app.user.timeagoCode); + } + ajaxify.parseData(); + app.load(); + }); +}; + (function () { let appLoaded = false; diff --git a/public/src/client.js b/public/src/client.js index 74720c2f3f..67a641e4e4 100644 --- a/public/src/client.js +++ b/public/src/client.js @@ -6,3 +6,5 @@ require('./app'); // from plugins that add files to "scripts" block in plugin.json // eslint-disable-next-line import/no-unresolved require('../scripts-client'); + +app.onDomReady();