Changeset 15166

Timestamp:

09/07/08 21:34:31 (3 months ago)

Author:

peller

Message:

Fixes #5226, regression of boolean attribute handling in _Templated. Thanks, ptwobrussell! Refs #4643

Location:

dijit/trunk

Files:

• tests/_Templated.html (modified) (2 diffs)
• _Templated.js (modified) (2 diffs)

dijit/trunk/tests/_Templated.html

@@ -29 +29 @@
                                         id: "test2",
                                         num: 5,
+                                        bool: false,
                                         text: "hello <\"' world",
 
-                                        templateString: "<button><span num=\"${num}\">${text}</span></button>"
+                                        templateString: "<button><span num=\"${num}\" value=\"${bool}\">${text}</span></button>"
                                 });
 
@@ -84 +85 @@
                                                         var wrapper=dojo.byId("variables1Wrapper");
                                                         wrapper.appendChild(widget.domNode);
-                                                        t.is('<button widgetid=\"test2\"><span num="5">hello &lt;"\' world</span></button>', wrapper.innerHTML.toLowerCase());
+                                                        t.is('<button widgetid=\"test2\"><span num="5" value="false">hello &lt;"\' world</span></button>', wrapper.innerHTML.toLowerCase());
                                                 },
 
-                                                function variables2(t){ 
-                                                        var widget = new VariableTemplate({id: "myid", num: -5, text: ""});
+                                                function variables2(t){
+                                                        var widget = new VariableTemplate({id: "myid", num: -5, bool: true, text: ""});
                                                         var wrapper=dojo.byId("variables2Wrapper");
                                                         wrapper.appendChild(widget.domNode);
-                                                        t.is('<button widgetid=\"myid\"><span num="-5"></span></button>', wrapper.innerHTML.toLowerCase());
+                                                        t.is('<button widgetid=\"myid\"><span num="-5" value="true"></span></button>', wrapper.innerHTML.toLowerCase());
                                                 },
                                                 function table(t){

dijit/trunk/_Templated.js

@@ -44 +44 @@
                                 if(key.charAt(0) == '!'){ value = _this[key.substr(1)]; }
                                 if(typeof value == "undefined"){ throw new Error(className+" template:"+key); } // a debugging aide
-                                if(!value){ return ""; }
+                                if(value == null){ return ""; }
 
                                 // Substitution keys beginning with ! will skip the transform step,
@@ -85 +85 @@
 
                         if(this.widgetsInTemplate){
-                                var cw = this._supportingWidgets  = dojo.parser.parse(node);
+                                var cw = (this._supportingWidgets = dojo.parser.parse(node));
                                 this._attachTemplateNodes(cw, function(n,p){
                                         return n[p];