Changeset 12183

Timestamp:

01/28/08 01:01:39 (7 months ago)

Author:

bill

Message:

Update dijit.form.Form to handle MultiSelect?. Refs #5359.

Files:

• dijit/trunk/form/Form.js (modified) (2 diffs)
• dojox/trunk/widget/tests/test_FormWidgets.html (modified) (2 diffs)

dijit/trunk/form/Form.js

@@ -49 +49 @@
                                                 w.setAttribute('checked', (dojo.indexOf(values, w.value) != -1));
                                         });
+                                }else if(widgets[0].setValues){
+                                        // it's a multi-select
+                                        widgets[0].setValues(values);
                                 }else{
                                         // otherwise, values is a list of values to be assigned sequentially to each widget
@@ -135 +138 @@
                         var obj = { };
                         dojo.forEach(this.getDescendants(), function(widget){
-                                var value = (widget.getValue && !widget._getValueDeprecated) ? widget.getValue() : widget.value;
                                 var name = widget.name;
                                 if(!name){ return; }
 
-                                // Store widget's value(s) as a scalar, except for checkboxes which are automatically arrays
-                                if(typeof widget.checked == 'boolean'){
-                                        if(/Radio/.test(widget.declaredClass)){
-                                                // radio button
-                                                if(widget.checked){
-                                                        dojo.setObject(name, value, obj);
+                                if(widget.getValues){
+                                        // A multi-value widget (ex: MultiSelect)
+                                        dojo.setObject(name, widget.getValues(), obj);
+                                }else{
+                                        // Single value widget (checkbox, radio, or plain <input> type widget
+                                        var value = (widget.getValue && !widget._getValueDeprecated) ? widget.getValue() : widget.value;
+
+                                        // Store widget's value(s) as a scalar, except for checkboxes which are automatically arrays
+                                        if(typeof widget.checked == 'boolean'){
+                                                if(/Radio/.test(widget.declaredClass)){
+                                                        // radio button
+                                                        if(widget.checked){
+                                                                dojo.setObject(name, value, obj);
+                                                        }
+                                                }else{
+                                                        // checkbox/toggle button
+                                                        var ary=dojo.getObject(name, false, obj);
+                                                        if(!ary){
+                                                                ary=[];
+                                                                dojo.setObject(name, ary, obj);
+                                                        }
+                                                        if(widget.checked){
+                                                                ary.push(value);
+                                                        }
                                                 }
                                         }else{
-                                                // checkbox/toggle button
-                                                var ary=dojo.getObject(name, false, obj);
-                                                if(!ary){
-                                                        ary=[];
-                                                        dojo.setObject(name, ary, obj);
-                                                }
-                                                if(widget.checked){
-                                                        ary.push(value);
-                                                }
-                                        }
-                                }else{
-                                        // plain input
-                                        dojo.setObject(name, value, obj);
+                                                // plain input
+                                                dojo.setObject(name, value, obj);
+                                        }
                                 }
                         });

dojox/trunk/widget/tests/test_FormWidgets.html

@@ -3 +3 @@
 <html>
 <head>
-        <title>Testing degradable form widgets | The Dojo Toolkit</title>
+        <title>Testing degradeable form widgets | The Dojo Toolkit</title>
 
         <link rel="stylesheet" type="text/css" media="screen"
@@ -232 +232 @@
                                 console.log('getting values from split:');
                                 dojo.query("#splitC > select").forEach(function(n){
-                                        // dumpt the select's name attrib, and the value(s) selected:
+                                        // dump the select's name attrib, and the value(s) selected:
                                         console.log(n.name,dijit.byNode(n).getValue());
                                 });