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

closes https://github.com/NodeBB/nodebb-theme-persona/issues/206

Browse Source
This commit is contained in:
barisusakli
2015-11-23 10:57:36 -05:00
parent f87a8bd016
commit ecd777b659
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/variables.js
View File

@@ -6,7 +6,7 @@
ajaxify.variables = {};
ajaxify.variables.parse = function() {
var dataEl = $('#content #ajaxify-data');
var dataEl = $('#ajaxify-data');
if (dataEl.length) {
ajaxify.data = JSON.parse(dataEl.text());
}

7
src/middleware/render.js
View File

@@ -47,16 +47,13 @@ module.exports = function(middleware) {
}
var ajaxifyData = JSON.stringify(options);
ajaxifyData = ajaxifyData.replace(/<\//g, '<\\/');
render.call(self, template, options, function(err, str) {
if (err) {
return fn(err);
}
ajaxifyData = ajaxifyData.replace(/<\//g, '<\\/');
str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : '');
if (res.locals.footer) {
@@ -75,10 +72,12 @@ module.exports = function(middleware) {
var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
language = req.query.lang || language;
translator.translate(str, language, function(translated) {
translated = translated + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
fn(err, translated);
});
});
} else {
str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
fn(err, str);
}
});