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: app.parseAndTranslate to always return promise

Browse Source
This commit is contained in:
Julian Lam
2021-03-05 14:27:24 -05:00
parent 4f4cdacc46
commit c265016944
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/src/app.js
View File

@@ -742,23 +742,21 @@ app.cacheBuster = null;
blockName = undefined; blockName = undefined;
} }
const execute = (resolve, reject) => { return new Promise((resolve, reject) => {
require(['translator', 'benchpress'], function (translator, Benchpress) { require(['translator', 'benchpress'], function (translator, Benchpress) {
Benchpress.render(template, data, blockName) Benchpress.render(template, data, blockName)
.then(rendered => translator.translate(rendered)) .then(rendered => translator.translate(rendered))
.then(translated => translator.unescape(translated)) .then(translated => translator.unescape(translated))
.then(resolve, reject); .then(resolve, reject);
}); });
}; }).then((html) => {
html = $(html);
if (callback) { if (callback && typeof callback === 'function') {
execute( setTimeout(callback, 0, html);
result => setTimeout(callback, 0, $(result)),
err => console.error(err)
);
} else {
return new Promise(execute).then(html => $(html));
} }
return html;
});
}; };
app.showCookieWarning = function () { app.showCookieWarning = function () {