Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-09-02 02:16:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: cleanup, require timeago locale earlier

Browse Source 
remove translator.prepareDOM, it is in header.tpl html tag
This commit is contained in:
Barış Soner Uşaklı
2022-03-09 22:58:12 -05:00
parent 7c04a74d38
commit 748f352a77
2 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
public/src/app.js
View File

@@ -11,7 +11,6 @@ require('timeago');
const Visibility = require('visibilityjs');
const Benchpress = require('benchpressjs');
Benchpress.setGlobal('config', config);
require('./sockets');
@@ -25,24 +24,25 @@ app.currentRoom = null;
app.widgets = {};
app.flags = {};
window.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();
});
(function () {
let appLoaded = false;
const isTouchDevice = utils.isTouchDevice();
app.cacheBuster = config['cache-buster'];
$(document).ready(function () {
ajaxify.parseData();
app.load();
});
app.coldLoad = function () {
if (appLoaded) {
ajaxify.coldLoad();
} else {
$(window).on('action:app.load', function () {
ajaxify.coldLoad();
});
$(window).one('action:app.load', ajaxify.coldLoad);
}
};
@@ -99,31 +99,20 @@ app.flags = {};
'taskbar',
'helpers',
'forum/pagination',
'translator',
'messages',
'search',
'forum/header',
'hooks',
'timeago/jquery.timeago',
], function (taskbar, helpers, pagination, translator, messages, search, header, hooks) {
], function (taskbar, helpers, pagination, messages, search, header, hooks) {
header.prepareDOM();
translator.prepareDOM();
taskbar.init();
helpers.register();
pagination.init();
search.init();
function finishLoad() {
hooks.fire('action:app.load');
messages.show();
appLoaded = true;
}
overrides.overrideTimeago();
if (app.user.timeagoCode && app.user.timeagoCode !== 'en') {
translator.switchTimeagoLanguage(app.user.timeagoCode, finishLoad);
} else {
finishLoad();
}
hooks.fire('action:app.load');
messages.show();
appLoaded = true;
});
};

9
public/src/modules/translator.common.js
View File

@@ -627,15 +627,6 @@ module.exports = function (utils, load, warn) {
delete adaptor.timeagoShort;
import(/* webpackChunkName: "timeago/[request]" */ 'timeago/locales/jquery.timeago.' + langCode).then(callback);
},
prepareDOM: function prepareDOM() {
// Add directional code if necessary
adaptor.translate('[[language:dir]]', function (value) {
if (value && !$('html').attr('data-dir')) {
jQuery('html').css('direction', value).attr('data-dir', value);
}
});
},
};
return adaptor;