Changeset 12387

Timestamp:

02/11/08 20:17:52 (5 months ago)

Author:

doughays

Message:

Fixes #5831. Added getValue/setValue to CheckBox?. Fixed Form.html unit test.

Location:

dijit/trunk

Files:

• form/CheckBox.js (modified) (1 diff)
• form/Form.js (modified) (3 diffs)
• form/SimpleTextarea.js (modified) (1 diff)
• form/Textarea.js (modified) (1 diff)
• form/_FormWidget.js (modified) (1 diff)
• tests/form/Form.html (modified) (2 diffs)

dijit/trunk/form/CheckBox.js

@@ -33 +33 @@
                 //      equivalent to value field on normal checkbox (if checked, the value is passed as
                 //      the value when form is submitted)
-                value: "on"
+                value: "on",
+
+                setValue: function(/*String or Boolean*/ newValue){
+                        // summary: set the value of the widget.
+                        if(typeof newValue == "string"){
+                                this.setAttribute('value', newValue);
+                                newValue = true;
+                        }
+                        this.setAttribute('checked', newValue);
+                },
+
+                _getValueDeprecated: false, // remove when _FormWidget:getValue is removed
+                getValue: function(){
+                        // summary: get the value of the widget.
+                        return (this.checked ? this.value : false);
+                }
         }
 );

dijit/trunk/form/Form.js

@@ -47 +47 @@
                                         // for checkbox/radio, values is a list of which widgets should be checked
                                         dojo.forEach(widgets, function(w, i){
-                                                w.setAttribute('checked', (dojo.indexOf(values, w.value) != -1));
+                                                w.setValue(dojo.indexOf(values, w.value) != -1);
                                         });
                                 }else if(widgets[0].setValues){
@@ -152 +152 @@
                                                 if(/Radio/.test(widget.declaredClass)){
                                                         // radio button
-                                                        if(widget.checked){
+                                                        if(value !== false){
                                                                 dojo.setObject(name, value, obj);
                                                         }
@@ -162 +162 @@
                                                                 dojo.setObject(name, ary, obj);
                                                         }
-                                                        if(widget.checked){
+                                                        if(value !== false){
                                                                 ary.push(value);
                                                         }

dijit/trunk/form/SimpleTextarea.js

@@ -35 +35 @@
 
         setValue: function(/*String*/ val){
-                this.domNode.value = this.value = val;
+                this.domNode.value = val;
                 this.inherited(arguments);
         },
 
         getValue: function(){
-                return this.domNode.value;
+                return this.domNode.value.replace(/\r/g,"");
         }
 });

dijit/trunk/form/Textarea.js

@@ -108 +108 @@
 
         getValue: function(){
-                return this.formValueNode.value.replace(/\r/g,"");
+                return this.value.replace(/\r/g,"");
         },
 

dijit/trunk/form/_FormWidget.js

@@ -295 +295 @@
         setValue: function(/*anything*/ newValue, /*Boolean, optional*/ priorityChange){
                 // summary: set the value of the widget.
+                this.value = newValue;
                 this._handleOnChange(newValue, priorityChange);
         },

dijit/trunk/tests/form/Form.html

@@ -58 +58 @@
                                                         t1: "line 1\nline 2",
                                                         st1: "simple line 1\nsimple line 2",
-                                                        richtext: "<h1>original</h1><p>This is the default content</p>"
+                                                        richtext: "<h1>original</h1><p>This is the default content</p>",
+                                                        filename: ""
                                                 };
 
@@ -72 +73 @@
                                                         t1: "new line 1\nnew line 2",
                                                         st1: "new simple line 1\nnew simple line 2",
-                                                        richtext: "<h1>changed</h1><p>This is the changed content set by setValues</p>"
+                                                        richtext: "<h1>changed</h1><p>This is the changed content set by setValues</p>",
+                                                        filename: ""
                                                 };