imported latest templates.js updates

v1.18.x
psychobunny 11 years ago
parent 0c8c246be4
commit f913c58925

@ -155,7 +155,7 @@
block = template.replace(new RegExp("[\\s\\S]*<!--[\\s]*BEGIN " + block + "[\\s]*-->[\r\n]*([\\s\\S]*?)[\r\n]*<!--[\\s]*END " + block + "[\\s]*-->[\\s\\S]*", 'g'), '$1'); block = template.replace(new RegExp("[\\s\\S]*<!--[\\s]*BEGIN " + block + "[\\s]*-->[\r\n]*([\\s\\S]*?)[\r\n]*<!--[\\s]*END " + block + "[\\s]*-->[\\s\\S]*", 'g'), '$1');
if (typeof block === "undefined") { if (typeof block === "undefined" || !array[key].length) {
return template; return template;
} }
@ -255,7 +255,7 @@
continue; continue;
} else if (obj[key] === null) { } else if (obj[key] === null) {
template = replace(template, namespace + key, ''); template = replace(template, namespace + key, '');
} else if (obj[key].constructor === Array && obj[key].length) { } else if (obj[key].constructor === Array) {
template = parseArray(template, obj, key, namespace + key + '.', bind); template = parseArray(template, obj, key, namespace + key + '.', bind);
} else if (obj[key] instanceof Object) { } else if (obj[key] instanceof Object) {
defineParent(obj[key], originalObj); defineParent(obj[key], originalObj);
@ -283,7 +283,7 @@
// clean up all undefined conditionals // clean up all undefined conditionals
template = setBindContainer(template.replace(/\s*<!-- ELSE -->\s*/gi, 'ENDIF -->\r\n') template = setBindContainer(template.replace(/\s*<!-- ELSE -->\s*/gi, 'ENDIF -->\r\n')
.replace(/\s*<!-- IF([\s\S]*?)ENDIF([\s\S]*?)-->/gi, '') .replace(/\s*<!-- IF([\s\S]*?)ENDIF([\s\S]*?)-->/gi, '')
.replace(/\s*<!-- BEGIN([\s\S]*?)END([\s\S]*?)-->/gi, '') .replace(/\s*<!-- BEGIN([\s\S]*?)END ([\s\S]*?)-->/gi, '')
.replace(/\s*<!-- ENDIF ([\s\S]*?)-->\s*/gi, ''), bind); .replace(/\s*<!-- ENDIF ([\s\S]*?)-->\s*/gi, ''), bind);
template = setBindContainer(template, bind); template = setBindContainer(template, bind);

Loading…
Cancel
Save