Changeset 15163

Timestamp:

09/07/08 19:33:21 (3 months ago)

Author:

bill

Message:

Fixes #7611: BorderContainer?: does not layout form widgets.

Refactor _setStateClass() to be resilient when classes are added to domNode after the widget has been initialized. This is safer but slower than the old version, which saved the node's original class.

For fear of performance issues it's only writing into domNode.className once; code would have been shorter but possibly slower if it made many calls to addClass() and removeClass().

!strict

Location:

dijit/trunk

Files:

• form/_FormWidget.js (modified) (2 diffs)
• layout/BorderContainer.js (modified) (1 diff)

dijit/trunk/form/_FormWidget.js

@@ -181 +181 @@
                 //              Hover           - if the mouse is over the widget
 
-                // Get original (non state related, non baseClass related) class specified in template
-                if(!("staticClass" in this)){
-                        this.staticClass = (this.stateNode||this.domNode).className;
-                }
-
                 // Compute new set of classes
-                var classes = this.baseClass.split(" ");
+                var newStateClasses = this.baseClass.split(" ");
 
                 function multiply(modifier){
-                        classes=classes.concat(dojo.map(classes, function(c){ return c+modifier; }), "dijit"+modifier);
+                        newStateClasses = newStateClasses.concat(dojo.map(newStateClasses, function(c){ return c+modifier; }), "dijit"+modifier);
                 }
 
@@ -218 +213 @@
                 }
 
-                (this.stateNode || this.domNode).className = this.staticClass + " " + classes.join(" ");
+                // Remove old state classes and add new ones.
+                // For performance concerns we only write into domNode.className once.
+                var tn = this.stateNode || this.domNode,
+                        classHash = {}; // set of all classes (state and otherwise) for node
+
+                dojo.forEach(tn.className.split(" "), function(c){ classHash[c] = true; });
+
+                if("_stateClasses" in this){
+                        dojo.forEach(this._stateClasses, function(c){ delete classHash[c]; });
+                }
+
+                dojo.forEach(newStateClasses, function(c){ classHash[c] = true; });
+
+                var newClasses = [];
+                for(var c in classHash){
+                        newClasses.push(c);
+                }
+                tn.className = newClasses.join(" ");
+
+                this._stateClasses = newStateClasses;
         },
 

dijit/trunk/layout/BorderContainer.js

@@ -309 +309 @@
                 // Nodes in IE don't respond to t/l/b/r, and TEXTAREA doesn't respond in any browser
                 var janky = dojo.isIE || dojo.some(this.getChildren(), function(child){
-                        return child.domNode.tagName == "TEXTAREA";
+                        return child.domNode.tagName == "TEXTAREA" || child.domNode.tagName == "INPUT";
                 });
                 if(janky){