Roo/XTemplate.js
authorAlan Knowles <alan@akbkhome.com>
Fri, 6 Apr 2012 15:59:20 +0000 (23:59 +0800)
committerAlan Knowles <alan@akbkhome.com>
Fri, 6 Apr 2012 15:59:20 +0000 (23:59 +0800)
Roo/XTemplate.js

index ee105c0..354da31 100644 (file)
@@ -98,11 +98,17 @@ Roo.extend(Roo.XTemplate, Roo.Template, {
         return t.compiled.call(this, vs, parent);
     },
 
-    compileTpl : function(tpl){
+    compileTpl : function(tpl)
+    {
         var fm = Roo.util.Format;
         var useF = this.disableFormats !== true;
         var sep = Roo.isGecko ? "+" : ",";
         var fn = function(m, name, format, args){
+            
+            if (!format.length) {
+                format= 'htmlEncode';
+            }
+            
             if(name.substr(0, 4) == 'xtpl'){
                 return "'"+ sep +'this.applySubTemplate('+name.substr(4)+', values, parent)'+sep+"'";
             }
@@ -121,7 +127,8 @@ Roo.extend(Roo.XTemplate, Roo.Template, {
                     args = ", values";
                 }
             }else{
-                args= ''; format = "("+v+" === undefined ? '' : ";
+                args= '';
+                format = "("+v+" === undefined ? '' : ";
             }
             return "'"+ sep + format + v + args + ")"+sep+"'";
         };