Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2017-02-15 12:06:52 -05:00
113 changed files with 2486 additions and 383 deletions

View File

@@ -78,14 +78,17 @@ module.exports = function (middleware) {
function (results, next) {
var str = results.header +
(res.locals.postHeader || '') +
results.content +
results.content + '<script id="ajaxify-data"></script>' +
(res.locals.preFooter || '') +
results.footer;
translate(str, req, res, next);
},
function (translated, next) {
next(null, translated + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>');
translated = translated.replace('<script id="ajaxify-data"></script>', function () {
return '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
});
next(null, translated);
}
], fn);
};