X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FDomTemplate.js;h=3ffe06071494d9b7b4b7d78fc4e2adccc61c2b14;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hp=0e294e3b44e1b705b74a59320cba1c1e03fe4f75;hpb=19595fb29f7df4ba612d98cc62bb104db48ddb5a;p=roojs1 diff --git a/Roo/DomTemplate.js b/Roo/DomTemplate.js index 0e294e3b44..3ffe060714 100644 --- a/Roo/DomTemplate.js +++ b/Roo/DomTemplate.js @@ -71,7 +71,7 @@ Roo.extend(Roo.DomTemplate, Roo.Template, { * x.t:(test,tesT) * */ - re : /(\{|\%7B)([\w-\.]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?(\}|\%7D)/g, + re : /(\{|\%7B)([\w-\.]+)(?:\:([\w\.]*)(?:\(([^)]*?)?\))?)?(\}|\%7D)/g, //re : /\{([\w-\.]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g, iterChild : function (node, method) { @@ -99,10 +99,21 @@ Roo.extend(Roo.DomTemplate, Roo.Template, { var s = this.html; // covert the html into DOM... - var doc = document.implementation.createHTMLDocument(""); + var doc = false; + var div =false; + try { + doc = document.implementation.createHTMLDocument(""); + doc.documentElement.innerHTML = this.html ; + div = doc.documentElement; + } catch (e) { + // old IE... - nasty -- it causes all sorts of issues.. with + // images getting pulled from server.. + div = document.createElement('div'); + div.innerHTML = this.html; + } //doc.documentElement.innerHTML = htmlBody - var div = doc.documentElement; - div.innerHTML = this.html ; + + this.tpls = []; var _t = this; @@ -322,7 +333,7 @@ Roo.extend(Roo.DomTemplate, Roo.Template, { return "'"+ sep + udef_st + format + name + args + "))"+sep+"'"; } - if (args.length) { + if (args && args.length) { // called with xxyx.yuu:(test,test) // change to () return "'"+ sep + udef_st + name + '(' + args + "))"+sep+"'";