Changeset 8671

Timestamp:

05/21/07 07:17:18 (20 months ago)

Author:

doughays

Message:

Fixes #3039. Change _setDisabled to use the newly created this.focusNode and remove associated function overrides. Fixes some minor code-styling issues.

Location:

dijit/trunk

Files:

• base/FormElement.js (modified) (1 diff)
• form/Button.js (modified) (3 diffs)
• form/Checkbox.js (modified) (4 diffs)
• form/_DropDownTextBox.js (modified) (3 diffs)

dijit/trunk/base/FormElement.js

@@ -88 +88 @@
                 }
                 this.domNode.disabled = this.disabled = disabled;
+                if(this.focusNode){
+                        this.focusNode.disabled = disabled;
+                }
                 dijit.util.wai.setAttr(this.focusNode || this.domNode, "waiState", "disabled", disabled);
         },

dijit/trunk/form/Button.js

@@ -48 +48 @@
                         // summary: reset the caption (text) of the button; takes an HTML string
                         this.containerNode.innerHTML = this.caption = content;
-                        if (dojo.isMozilla){ // Firefox has re-render issues with tables
+                        if(dojo.isMozilla){ // Firefox has re-render issues with tables
                                 var oldDisplay = dojo.getComputedStyle(this.domNode).display;
                                 this.domNode.style.display="none";
@@ -54 +54 @@
                                 setTimeout(function(){_this.domNode.style.display=oldDisplay;},1);
                         }
-                },
-
-                _setDisabled: function(/*Boolean*/ disable){
-                        dojo.forEach(this.domNode.getElementsByTagName('BUTTON'),
-                                function(button){
-                                        button.disabled = (disable != false);
-                                }
-                        );
-                        dijit.form.Button.superclass._setDisabled.apply(this, arguments);
                 }
         });
@@ -104 +95 @@
                         if(this.disabled){ return; }
                         if(e.keyCode == dojo.keys.DOWN_ARROW || (e.currentTarget == this.popupStateNode && (e.keyCode == dojo.keys.SPACE || e.keyCode == dojo.keys.ENTER))){
-                                if (!this._menu || this._menu.domNode.style.display=="none"){
+                                if(!this._menu || this._menu.domNode.style.display=="none"){
                                         this.arrowClick(e);
                                 }

dijit/trunk/form/Checkbox.js

@@ -110 +110 @@
                         
                         // carve some space in the flow for this dom node
-                        if (dojo.isSafari) {
+                        if(dojo.isSafari){
                                 // use this hack sparingly (see ticket:2942)
                                 domNodeStyle.fontFamily = "monospace";
                                 var spacer = document.createTextNode("\u00a0\u00a0");
                                 this.domNode.appendChild(spacer);
-                        }
-                        else {
+                        }else{
                                 domNodeStyle.paddingRight = this.width + "px";
                         }
@@ -139 +138 @@
                 _setDisabled: function(/*Boolean*/ disabled){
                         // summary: set disabled state of widget.
-                        this.domNode.disabled = this.inputNode.disabled = this.disabled = disabled;
+                        dijit.form.Checkbox.superclass._setDisabled.apply(this,arguments);
                         this._updateView();
                 },
@@ -161 +160 @@
 
                 setValue: function(value){
-                        if (value == null){ value = ""; }
+                        if(value == null){ value = ""; }
                         this.inputNode.value = value;
                         dijit.form.Checkbox.superclass.setValue.call(this,value);
@@ -194 +193 @@
                         var w = awidget || this;
 
-                        if (w.checked != w.inputNode.checked) {
+                        if(w.checked != w.inputNode.checked){
                                 w.checked = w.inputNode.checked;
                                 w.onChecked(w.checked);

dijit/trunk/form/_DropDownTextBox.js

@@ -36 +36 @@
                 },
                 
-                enable:function(){
-                        this.parentClass.enable.apply(this, arguments);
-                        // not enabled by FormElement
-                        this.textbox.removeAttribute("disabled");
-                },
-        
-                disable: function(){
-                        this.parentClass.disable.apply(this, arguments);
-                        // not disabled by FormElement
-                        this.textbox.setAttribute("disabled",true);
-                },
-        
                 arrowClicked: function(){
                         // summary: callback when arrow is clicked
@@ -143 +131 @@
                         if(this.id && this.id != ""){
                                 var labels = document.getElementsByTagName("label");
-                                if (labels != null && labels.length > 0){
+                                if(labels != null && labels.length > 0){
                                         for(var i=0; i<labels.length; i++){
-                                                if (labels[i].htmlFor == this.id){
-                                                        if (!this.textbox.id){
+                                                if(labels[i].htmlFor == this.id){
+                                                        if(!this.textbox.id){
                                                                 this.textbox.id = (this.id + "input");
                                                         }
@@ -188 +176 @@
                         this.isShowingNow=true;
                         document.body.appendChild(this.domNode);
-                        setTimeout( dojo.hitch(this, function(){dijit.util.PopupManager.openAround(widget.textbox, this,{'BL':'TL', 'TL':'BL'}, [0,0]);}), 1);
+                        setTimeout(dojo.hitch(this, function(){dijit.util.PopupManager.openAround(widget.textbox, this,{'BL':'TL', 'TL':'BL'}, [0,0]);}), 1);
                 },