Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-05 05:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: app.parseAndTranslate to return promise if no callback passed

Browse Source
This commit is contained in:
Julian Lam
2021-03-04 12:46:54 -05:00
parent c1b3079d93
commit b5a6a3149d
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
public/src/app.js
View File

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