Changeset 10979

Timestamp:

10/19/07 04:24:42 (9 months ago)

Author:

alex

Message:

ensure that Declarations always use a string template for construction instead of the potential node-cached variant. Fixes #4643

Location:

dijit/trunk

Files:

• Declaration.js (modified) (1 diff)
• _Templated.js (modified) (5 diffs)

dijit/trunk/Declaration.js

@@ -36 +36 @@
                         }
                         propList.widgetsInTemplate = true;
+                        propList._skipNodeCache = true;
                         propList.templateString = "<"+srcType+" class='"+src.className+"' dojoAttachPoint='"+(src.getAttribute("dojoAttachPoint")||'')+"' dojoAttachEvent='"+(src.getAttribute("dojoAttachEvent")||'')+"' >"+src.innerHTML.replace(/\%7B/g,"{").replace(/\%7D/g,"}")+"</"+srcType+">";
                         // console.debug(propList.templateString);

dijit/trunk/_Templated.js

@@ -38 +38 @@
                 containerNode: null,
 
+                // skipNodeCache Boolean:
+                //              if using a cached widget template node poses issues for a
+                //              particular widget class, it can set this property to ensure
+                //              that its template is always re-built from a string
+                _skipNodeCache: false,
+
                 // method over-ride
                 buildRendering: function(){
@@ -46 +52 @@
                         // isn't there already.  Returns either a DomNode or a string, depending on
                         // whether or not the template contains ${foo} replacement parameters.
-                        var cached = dijit._Templated.getCachedTemplate(this.templatePath, this.templateString);
+                        var cached = dijit._Templated.getCachedTemplate(this.templatePath, this.templateString, this._skipNodeCache);
 
                         var node;
@@ -56 +62 @@
                                         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 ""; }
 
                                         // Substitution keys beginning with ! will skip the transform step,
@@ -189 +196 @@
 dijit._Templated._templateCache = {};
 
-dijit._Templated.getCachedTemplate = function(templatePath, templateString){
+dijit._Templated.getCachedTemplate = function(templatePath, templateString, alwaysUseString){
         // summary:
         //              static method to get a template based on the templatePath or
@@ -216 +223 @@
         templateString = dojo.string.trim(templateString);
 
-        if(templateString.match(/\$\{([^\}]+)\}/g)){
+        if(templateString.match(/\$\{([^\}]+)\}/g) || alwaysUseString){
                 // there are variables in the template so all we can do is cache the string
                 return (tmplts[key] = templateString); //String