Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 09:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: making rendering of header and footer async functions

Browse Source 
* refactor: make middleware.admin.renderHeader async

* refactor: making rendering of header and footer async functions

* fix: use app.renderAsync instead of promifying it
This commit is contained in:
Julian Lam
2020-06-03 19:07:08 -04:00
committed by GitHub
parent f6ad9605c6
commit 023942da7d
3 changed files with 204 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/middleware/render.js
View File

@@ -12,8 +12,6 @@ const widgets = require('../widgets');
const utils = require('../utils');
module.exports = function (middleware) {
const renderHeaderFooterAsync = util.promisify(renderHeaderFooter);
middleware.processRender = function processRender(req, res, next) {
// res.render post-processing, modified from here: https://gist.github.com/mrlannigan/5051687
const render = res.render;
@@ -63,9 +61,9 @@ module.exports = function (middleware) {
const renderAsync = util.promisify((templateToRender, options, next) => render.call(self, templateToRender, options, next));
const results = await utils.promiseParallel({
header: renderHeaderFooterAsync('renderHeader', req, res, options),
header: renderHeaderFooter('renderHeader', req, res, options),
content: renderAsync(templateToRender, options),
footer: renderHeaderFooterAsync('renderFooter', req, res, options),
footer: renderHeaderFooter('renderFooter', req, res, options),
});
const str = results.header +
@@ -89,14 +87,13 @@ module.exports = function (middleware) {
next();
};
function renderHeaderFooter(method, req, res, options, next) {
async function renderHeaderFooter(method, req, res, options) {
if (res.locals.renderHeader) {
middleware[method](req, res, options, next);
return await middleware[method](req, res, options);
} else if (res.locals.renderAdminHeader) {
middleware.admin[method](req, res, options, next);
} else {
next(null, '');
return await middleware.admin[method](req, res, options);
}
return '';
}
async function translate(str, req, res) {