Changed docs/src/Roo_Template.js.htmlexamples/bootstrap/RadioSet.bjsexamples/bootstra...

diff --git a/docs/src/Roo_Template.js.html b/docs/src/Roo_Template.js.html
index 556eda8..916144f 100644 (file)
--- a/docs/src/Roo_Template.js.html
+++ b/docs/src/Roo_Template.js.html
@@ -68,7 +68,7 @@ t.append('some-element', {id: 'myid', cls: 'myclass', name: 'foo', value: 'bar'}
      * @return {String} The HTML fragment
      */
     </span><span class="jsdoc-var">applyTemplate </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">){
-        </span><span class="jsdoc-var">Roo.log</span><span class="jsdoc-syntax">([</span><span class="jsdoc-string">&quot;applyTemplate&quot;</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">]);
+        </span><span class="jsdoc-comment">//Roo.log([&quot;applyTemplate&quot;, values]);
         </span><span class="jsdoc-keyword">try </span><span class="jsdoc-syntax">{
 
             </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.compiled</span><span class="jsdoc-syntax">){

diff --git a/examples/bootstrap/RadioSet.bjs b/examples/bootstrap/RadioSet.bjs
index 4b932bb..a5b5172 100644 (file)
--- a/examples/bootstrap/RadioSet.bjs
+++ b/examples/bootstrap/RadioSet.bjs
@@ -2,20 +2,29 @@
  "name" : "RadioSet",
  "parent" : "",
  "title" : "",
- "path" : "/home/edward/gitlive/roojs1/examples/bootstrap/RadioSet.bjs",
+ "path" : "/home/alan/gitlive/roojs1/examples/bootstrap/RadioSet.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
   "ce8ae9da5b7cd6c3df2929543a9af92d" : "Email",
+  "bafd7322c6e97d25b6299b5d6fe8920b" : "No",
   "7fa3b767c460b54a2be4d49030b349c7" : "no",
   "e3917ff2d3b3a88eab391651215d6445" : "Radio Field Lable Left",
   "9dffbf69ffba8bc38bc4e01abf4b1675" : "Text",
   "8d80ce38760953b68529d7fc9d8d89b6" : "Radio Field Lable",
   "015ae6f41d4b86ad13ac0fde840d2280" : "Text Input",
+  "93cba07454f06a4a960172bbd6e2a435" : "Yes",
   "a6105c0a611b41b08f1209506350279e" : "yes",
   "ad3d06d03d94223fa652babc913de686" : "Validate",
   "b7dc22f0e17f4dfca2940eb0bd0cdc54" : "Radio Set Example"
  },
+ "named_strings" : {
+  "text_name_fieldLabel" : "015ae6f41d4b86ad13ac0fde840d2280",
+  "left_radio_fieldLabel" : "e3917ff2d3b3a88eab391651215d6445",
+  "text_name_placeholder" : "9dffbf69ffba8bc38bc4e01abf4b1675",
+  "email_name_placeholder" : "ce8ae9da5b7cd6c3df2929543a9af92d",
+  "top_radio_fieldLabel" : "8d80ce38760953b68529d7fc9d8d89b6"
+ },
  "items" : [
   {
    "String cls" : "bg-black",
@@ -46,8 +55,8 @@
            "items" : [
             {
              "xtype" : "Header",
-             "$ xns" : "Roo.bootstrap",
              "Number level" : 1,
+             "$ xns" : "Roo.bootstrap",
              "String html" : "Radio Set Example"
             }
            ]
@@ -190,6 +199,24 @@
           }
          ]
         },
+        {
+         "xtype" : "Row",
+         "$ xns" : "Roo.bootstrap",
+         "items" : [
+          {
+           "xtype" : "Column",
+           "Number xs" : 12,
+           "$ xns" : "Roo.bootstrap",
+           "items" : [
+            {
+             "String name" : "test1",
+             "xtype" : "CheckBox",
+             "$ xns" : "Roo.bootstrap"
+            }
+           ]
+          }
+         ]
+        },
         {
          "xtype" : "Row",
          "$ xns" : "Roo.bootstrap",

diff --git a/examples/bootstrap/RadioSet.js b/examples/bootstrap/RadioSet.js
index 290043c..ee0285e 100644 (file)
--- a/examples/bootstrap/RadioSet.js
+++ b/examples/bootstrap/RadioSet.js
@@ -6,15 +6,24 @@ RadioSet = new Roo.XComponent({
 
  _strings : {
   'ce8ae9da5b7cd6c3df2929543a9af92d' :"Email",
+  'bafd7322c6e97d25b6299b5d6fe8920b' :"No",
   '7fa3b767c460b54a2be4d49030b349c7' :"no",
   'e3917ff2d3b3a88eab391651215d6445' :"Radio Field Lable Left",
   '9dffbf69ffba8bc38bc4e01abf4b1675' :"Text",
   '8d80ce38760953b68529d7fc9d8d89b6' :"Radio Field Lable",
   '015ae6f41d4b86ad13ac0fde840d2280' :"Text Input",
+  '93cba07454f06a4a960172bbd6e2a435' :"Yes",
   'a6105c0a611b41b08f1209506350279e' :"yes",
   'ad3d06d03d94223fa652babc913de686' :"Validate",
   'b7dc22f0e17f4dfca2940eb0bd0cdc54' :"Radio Set Example"
  },
+ _named_strings : {
+  'text_name_fieldLabel' : '015ae6f41d4b86ad13ac0fde840d2280' /* Text Input */ ,
+  'left_radio_fieldLabel' : 'e3917ff2d3b3a88eab391651215d6445' /* Radio Field Lable Left */ ,
+  'text_name_placeholder' : '9dffbf69ffba8bc38bc4e01abf4b1675' /* Text */ ,
+  'email_name_placeholder' : 'ce8ae9da5b7cd6c3df2929543a9af92d' /* Email */ ,
+  'top_radio_fieldLabel' : '8d80ce38760953b68529d7fc9d8d89b6' /* Radio Field Lable */ 
+ },
 
   part     :  ["bootstrap", "RadioSet" ],
   order    : '001-RadioSet',
@@ -96,14 +105,14 @@ RadioSet = new Roo.XComponent({
              items  : [
               {
                xtype : 'Radio',
-               boxLabel : 'Yes',
+               boxLabel : _this._strings['93cba07454f06a4a960172bbd6e2a435'] /* Yes */,
                value : _this._strings['a6105c0a611b41b08f1209506350279e'] /* yes */,
                xns : Roo.bootstrap,
                '|xns' : 'Roo.bootstrap'
               },
               {
                xtype : 'Radio',
-               boxLabel : 'No',
+               boxLabel : _this._strings['bafd7322c6e97d25b6299b5d6fe8920b'] /* No */,
                value : _this._strings['7fa3b767c460b54a2be4d49030b349c7'] /* no */,
                xns : Roo.bootstrap,
                '|xns' : 'Roo.bootstrap'
@@ -138,14 +147,14 @@ RadioSet = new Roo.XComponent({
              items  : [
               {
                xtype : 'Radio',
-               boxLabel : 'Yes',
+               boxLabel : _this._strings['93cba07454f06a4a960172bbd6e2a435'] /* Yes */,
                value : _this._strings['a6105c0a611b41b08f1209506350279e'] /* yes */,
                xns : Roo.bootstrap,
                '|xns' : 'Roo.bootstrap'
               },
               {
                xtype : 'Radio',
-               boxLabel : 'No',
+               boxLabel : _this._strings['bafd7322c6e97d25b6299b5d6fe8920b'] /* No */,
                value : _this._strings['7fa3b767c460b54a2be4d49030b349c7'] /* no */,
                xns : Roo.bootstrap,
                '|xns' : 'Roo.bootstrap'
@@ -228,6 +237,27 @@ RadioSet = new Roo.XComponent({
           }
          ]
         },
+        {
+         xtype : 'Row',
+         xns : Roo.bootstrap,
+         '|xns' : 'Roo.bootstrap',
+         items  : [
+          {
+           xtype : 'Column',
+           xs : 12,
+           xns : Roo.bootstrap,
+           '|xns' : 'Roo.bootstrap',
+           items  : [
+            {
+             xtype : 'CheckBox',
+             name : 'test1',
+             xns : Roo.bootstrap,
+             '|xns' : 'Roo.bootstrap'
+            }
+           ]
+          }
+         ]
+        },
         {
          xtype : 'Row',
          xns : Roo.bootstrap,

diff --git a/roojs-all.js b/roojs-all.js
index cf62bf7..0566ac7 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -212,11 +212,11 @@ return el.nextSibling;}throw 'Illegal insertion point -> "'+M+'"';},insertBefore
 el.appendChild(N);}else{var O=E(o);N=this.insertHtml("beforeEnd",el,O);}return M?Roo.get(N,true):N;},overwrite:function(el,o,M){el=Roo.getDom(el);if(o.ns){while(el.childNodes.length){el.removeChild(el.firstChild);}F(o,el);}else{el.innerHTML=E(o);}return M?Roo.get(el.firstChild,true):el.firstChild;
 },createTemplate:function(o){var M=E(o);return new Roo.Template(M);}};}();
 // Roo/Template.js
-Roo.Template=function(A){if(A instanceof Array){A=A.join("");}else if(arguments.length>1){A=Array.prototype.join.call(arguments,"");}if(typeof(A)=='object'){Roo.apply(this,A)}else{this.html=A;}if(this.url){this.load();}};Roo.Template.prototype={url:false,html:'',applyTemplate:function(A){Roo.log(["applyTemplate",A]);
-try{if(this.compiled){return this.compiled(A);}var B=this.disableFormats!==true;var fm=Roo.util.Format,C=this;var fn=function(m,D,E,F){if(E&&B){if(E.substr(0,5)=="this."){return C.call(E.substr(5),A[D],A);}else{if(F){var re=/^\s*['"](.*)["']\s*$/;F=F.split(',');
-for(var i=0,G=F.length;i<G;i++){F[i]=F[i].replace(re,"$1");}F=[A[D]].concat(F);}else{F=[A[D]];}return fm[E].apply(fm,F);}}else{return A[D]!==undefined?A[D]:"";}};return this.html.replace(this.re,fn);}catch(e){Roo.log(e);throw e;}},loading:false,load:function(){if(this.loading){return;
-}var _t=this;this.loading=true;this.compiled=false;var cx=new Roo.data.Connection();cx.request({url:this.url,method:'GET',success:function(A){_t.loading=false;_t.html=A.responseText;_t.url=false;_t.compile();},failure:function(A){Roo.log("Template failed to load from "+_t.url);
-_t.loading=false;}});},set:function(A,B){this.html=A;this.compiled=null;if(B){this.compile();}return this;},disableFormats:false,re:/\{([\w-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,compile:function(){var fm=Roo.util.Format;var A=this.disableFormats!==true;var B=Roo.isGecko?"+":",";
+Roo.Template=function(A){if(A instanceof Array){A=A.join("");}else if(arguments.length>1){A=Array.prototype.join.call(arguments,"");}if(typeof(A)=='object'){Roo.apply(this,A)}else{this.html=A;}if(this.url){this.load();}};Roo.Template.prototype={url:false,html:'',applyTemplate:function(A){try{if(this.compiled){return this.compiled(A);
+}var B=this.disableFormats!==true;var fm=Roo.util.Format,C=this;var fn=function(m,D,E,F){if(E&&B){if(E.substr(0,5)=="this."){return C.call(E.substr(5),A[D],A);}else{if(F){var re=/^\s*['"](.*)["']\s*$/;F=F.split(',');for(var i=0,G=F.length;i<G;i++){F[i]=F[i].replace(re,"$1");
+}F=[A[D]].concat(F);}else{F=[A[D]];}return fm[E].apply(fm,F);}}else{return A[D]!==undefined?A[D]:"";}};return this.html.replace(this.re,fn);}catch(e){Roo.log(e);throw e;}},loading:false,load:function(){if(this.loading){return;}var _t=this;this.loading=true;
+this.compiled=false;var cx=new Roo.data.Connection();cx.request({url:this.url,method:'GET',success:function(A){_t.loading=false;_t.html=A.responseText;_t.url=false;_t.compile();},failure:function(A){Roo.log("Template failed to load from "+_t.url);_t.loading=false;
+}});},set:function(A,B){this.html=A;this.compiled=null;if(B){this.compile();}return this;},disableFormats:false,re:/\{([\w-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,compile:function(){var fm=Roo.util.Format;var A=this.disableFormats!==true;var B=Roo.isGecko?"+":",";
 var fn=function(m,D,E,F){if(E&&A){F=F?','+F:"";if(E.substr(0,5)!="this."){E="fm."+E+'(';}else{E='this.call("'+E.substr(5)+'", ';F=", values";}}else{F='';E="(values['"+D+"'] == undefined ? '' : ";}return "'"+B+E+"values['"+D+"']"+F+")"+B+"'";};var C;if(Roo.isGecko){C="this.compiled = function(values){ return '"+this.html.replace(/\\/g,'\\\\').replace(/(\r\n|\n)/g,'\\n').replace(/'/g,"\\'").replace(this.re,fn)+"';};";
 }else{C=["this.compiled = function(values){ return ['"];C.push(this.html.replace(/\\/g,'\\\\').replace(/(\r\n|\n)/g,'\\n').replace(/'/g,"\\'").replace(this.re,fn));C.push("'].join('');};");C=C.join('');}eval(C);return this;},call:function(A,B,C){return this[A](B,C);
 },insertFirst:function(el,A,B){return this.doInsert('afterBegin',el,A,B);},insertBefore:function(el,A,B){return this.doInsert('beforeBegin',el,A,B);},insertAfter:function(el,A,B){return this.doInsert('afterEnd',el,A,B);},append:function(el,A,B){return this.doInsert('beforeEnd',el,A,B);

diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index 9fe5f96..6964553 100644 (file)
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -4667,7 +4667,7 @@ Roo.Template.prototype = {
      * @return {String} The HTML fragment
      */
     applyTemplate : function(values){
-        Roo.log(["applyTemplate", values]);
+        //Roo.log(["applyTemplate", values]);
         try {
            
             if(this.compiled){

diff --git a/roojs-core.js b/roojs-core.js
index 512642a..94448a8 100644 (file)
--- a/roojs-core.js
+++ b/roojs-core.js
@@ -212,11 +212,11 @@ return el.nextSibling;}throw 'Illegal insertion point -> "'+M+'"';},insertBefore
 el.appendChild(N);}else{var O=E(o);N=this.insertHtml("beforeEnd",el,O);}return M?Roo.get(N,true):N;},overwrite:function(el,o,M){el=Roo.getDom(el);if(o.ns){while(el.childNodes.length){el.removeChild(el.firstChild);}F(o,el);}else{el.innerHTML=E(o);}return M?Roo.get(el.firstChild,true):el.firstChild;
 },createTemplate:function(o){var M=E(o);return new Roo.Template(M);}};}();
 // Roo/Template.js
-Roo.Template=function(A){if(A instanceof Array){A=A.join("");}else if(arguments.length>1){A=Array.prototype.join.call(arguments,"");}if(typeof(A)=='object'){Roo.apply(this,A)}else{this.html=A;}if(this.url){this.load();}};Roo.Template.prototype={url:false,html:'',applyTemplate:function(A){Roo.log(["applyTemplate",A]);
-try{if(this.compiled){return this.compiled(A);}var B=this.disableFormats!==true;var fm=Roo.util.Format,C=this;var fn=function(m,D,E,F){if(E&&B){if(E.substr(0,5)=="this."){return C.call(E.substr(5),A[D],A);}else{if(F){var re=/^\s*['"](.*)["']\s*$/;F=F.split(',');
-for(var i=0,G=F.length;i<G;i++){F[i]=F[i].replace(re,"$1");}F=[A[D]].concat(F);}else{F=[A[D]];}return fm[E].apply(fm,F);}}else{return A[D]!==undefined?A[D]:"";}};return this.html.replace(this.re,fn);}catch(e){Roo.log(e);throw e;}},loading:false,load:function(){if(this.loading){return;
-}var _t=this;this.loading=true;this.compiled=false;var cx=new Roo.data.Connection();cx.request({url:this.url,method:'GET',success:function(A){_t.loading=false;_t.html=A.responseText;_t.url=false;_t.compile();},failure:function(A){Roo.log("Template failed to load from "+_t.url);
-_t.loading=false;}});},set:function(A,B){this.html=A;this.compiled=null;if(B){this.compile();}return this;},disableFormats:false,re:/\{([\w-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,compile:function(){var fm=Roo.util.Format;var A=this.disableFormats!==true;var B=Roo.isGecko?"+":",";
+Roo.Template=function(A){if(A instanceof Array){A=A.join("");}else if(arguments.length>1){A=Array.prototype.join.call(arguments,"");}if(typeof(A)=='object'){Roo.apply(this,A)}else{this.html=A;}if(this.url){this.load();}};Roo.Template.prototype={url:false,html:'',applyTemplate:function(A){try{if(this.compiled){return this.compiled(A);
+}var B=this.disableFormats!==true;var fm=Roo.util.Format,C=this;var fn=function(m,D,E,F){if(E&&B){if(E.substr(0,5)=="this."){return C.call(E.substr(5),A[D],A);}else{if(F){var re=/^\s*['"](.*)["']\s*$/;F=F.split(',');for(var i=0,G=F.length;i<G;i++){F[i]=F[i].replace(re,"$1");
+}F=[A[D]].concat(F);}else{F=[A[D]];}return fm[E].apply(fm,F);}}else{return A[D]!==undefined?A[D]:"";}};return this.html.replace(this.re,fn);}catch(e){Roo.log(e);throw e;}},loading:false,load:function(){if(this.loading){return;}var _t=this;this.loading=true;
+this.compiled=false;var cx=new Roo.data.Connection();cx.request({url:this.url,method:'GET',success:function(A){_t.loading=false;_t.html=A.responseText;_t.url=false;_t.compile();},failure:function(A){Roo.log("Template failed to load from "+_t.url);_t.loading=false;
+}});},set:function(A,B){this.html=A;this.compiled=null;if(B){this.compile();}return this;},disableFormats:false,re:/\{([\w-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,compile:function(){var fm=Roo.util.Format;var A=this.disableFormats!==true;var B=Roo.isGecko?"+":",";
 var fn=function(m,D,E,F){if(E&&A){F=F?','+F:"";if(E.substr(0,5)!="this."){E="fm."+E+'(';}else{E='this.call("'+E.substr(5)+'", ';F=", values";}}else{F='';E="(values['"+D+"'] == undefined ? '' : ";}return "'"+B+E+"values['"+D+"']"+F+")"+B+"'";};var C;if(Roo.isGecko){C="this.compiled = function(values){ return '"+this.html.replace(/\\/g,'\\\\').replace(/(\r\n|\n)/g,'\\n').replace(/'/g,"\\'").replace(this.re,fn)+"';};";
 }else{C=["this.compiled = function(values){ return ['"];C.push(this.html.replace(/\\/g,'\\\\').replace(/(\r\n|\n)/g,'\\n').replace(/'/g,"\\'").replace(this.re,fn));C.push("'].join('');};");C=C.join('');}eval(C);return this;},call:function(A,B,C){return this[A](B,C);
 },insertFirst:function(el,A,B){return this.doInsert('afterBegin',el,A,B);},insertBefore:function(el,A,B){return this.doInsert('beforeBegin',el,A,B);},insertAfter:function(el,A,B){return this.doInsert('afterEnd',el,A,B);},append:function(el,A,B){return this.doInsert('beforeEnd',el,A,B);

diff --git a/roojs-debug.js b/roojs-debug.js
index adcff90..5602bf3 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -4667,7 +4667,7 @@ Roo.Template.prototype = {
      * @return {String} The HTML fragment
      */
     applyTemplate : function(values){
-        Roo.log(["applyTemplate", values]);
+        //Roo.log(["applyTemplate", values]);
         try {
            
             if(this.compiled){