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

refactor: remove old hack

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-12-02 14:14:56 -05:00
parent 6f68f4d20a
commit 73746bb489
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
public/src/ajaxify.js
View File

@@ -7,19 +7,9 @@ ajaxify = window.ajaxify || {};
var apiXHR = null; var apiXHR = null;
var ajaxifyTimer; var ajaxifyTimer;
var translator;
var Benchpress;
var retry = true; var retry = true;
var previousBodyClass = ''; var previousBodyClass = '';
// Dumb hack to fool ajaxify into thinking translator is still a global
// When ajaxify is migrated to a require.js module, then this can be merged into the "define" call
require(['translator', 'benchpress'], function (_translator, _Benchpress) {
translator = _translator;
translator.translate('[[error:no-connection]]');
Benchpress = _Benchpress;
});
ajaxify.count = 0; ajaxify.count = 0;
ajaxify.currentPage = null; ajaxify.currentPage = null;
@@ -170,26 +160,27 @@ ajaxify = window.ajaxify || {};
function renderTemplate(url, tpl_url, data, callback) { function renderTemplate(url, tpl_url, data, callback) {
$(window).trigger('action:ajaxify.loadingTemplates', {}); $(window).trigger('action:ajaxify.loadingTemplates', {});
require(['translator', 'benchpress'], function (translator, Benchpress) {
Benchpress.render(tpl_url, data)
.then(rendered => translator.translate(rendered))
.then(function (translated) {
translated = translator.unescape(translated);
$('body').removeClass(previousBodyClass).addClass(data.bodyClass);
$('#content').html(translated);
Benchpress.render(tpl_url, data) ajaxify.end(url, tpl_url);
.then(rendered => translator.translate(rendered))
.then(function (translated) {
translated = translator.unescape(translated);
$('body').removeClass(previousBodyClass).addClass(data.bodyClass);
$('#content').html(translated);
ajaxify.end(url, tpl_url); if (typeof callback === 'function') {
callback();
}
if (typeof callback === 'function') { $('#content, #footer').removeClass('ajaxifying');
callback();
}
$('#content, #footer').removeClass('ajaxifying'); // Only executed on ajaxify. Otherwise these'd be in ajaxify.end()
updateTitle(data.title);
// Only executed on ajaxify. Otherwise these'd be in ajaxify.end() updateTags();
updateTitle(data.title); });
updateTags(); });
});
} }
function updateTitle(title) { function updateTitle(title) {