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

fixed conflicts, added new language key for users/online

Browse Source
This commit is contained in:
psychobunny
2013-09-24 15:15:39 -04:00
parent cd63dd429b fbfdf561fc
commit 1fbc038e64
40 changed files with 11076 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/templates.js
View File

@@ -180,7 +180,6 @@
else
template_data['relative_path'] = RELATIVE_PATH;
translator.translate(templates[tpl_url].parse(template_data), function (translatedTemplate) {
document.getElementById('content').innerHTML = translatedTemplate;
});
@@ -233,7 +232,7 @@
}
function makeRegex(block) {
return new RegExp("<!-- BEGIN " + block + " -->[^]*<!-- END " + block + " -->", 'g');
return new RegExp("<!-- BEGIN " + block + " -->[\\s\\S]*<!-- END " + block + " -->", 'g');
}
function getBlock(regex, block, template) {
@@ -302,7 +301,7 @@
}
if (namespace) {
var regex = new RegExp("{" + namespace + "[^]*?}", 'g');
var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g');
template = template.replace(regex, '');
}