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: show messages after app load

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-11-19 20:34:26 -05:00
parent 814771bdc7
commit 46acbfdaf1
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/src/app.js
View File

@@ -114,16 +114,16 @@ app.cacheBuster = null;
if (app.user.uid > 0) { if (app.user.uid > 0) {
unread.initUnreadTopics(); unread.initUnreadTopics();
} }
function finishLoad() {
$(window).trigger('action:app.load');
app.showMessages();
appLoaded = true;
}
overrides.overrideTimeago(); overrides.overrideTimeago();
if (app.user.timeagoCode && app.user.timeagoCode !== 'en') { if (app.user.timeagoCode && app.user.timeagoCode !== 'en') {
require(['timeago/locales/jquery.timeago.' + app.user.timeagoCode], function () { require(['timeago/locales/jquery.timeago.' + app.user.timeagoCode], finishLoad);
$(window).trigger('action:app.load');
appLoaded = true;
});
} else { } else {
$(window).trigger('action:app.load'); finishLoad();
appLoaded = true;
} }
}); });
}; };

1
public/src/sockets.js
View File

@@ -101,7 +101,6 @@ socket = window.socket;
function onConnect() { function onConnect() {
if (!reconnecting) { if (!reconnecting) {
app.showMessages();
$(window).trigger('action:connected'); $(window).trigger('action:connected');
} }