Changeset 13989

Timestamp:

06/12/08 19:07:26 (5 months ago)

Author:

bill

Message:

Support required=true/false parameter for FilteringSelect? so that a blank entry in the dropdown list is not necessary. Patch from Mark Hays (IBM, CCLA on file). Fixes #5974 !strict.
Also some cleanup so that onChange() and getValue() return "" for when the input field is blank/invalid. (Before I had thought to return null in those cases but "" seems better.) Refs #5919.

Location:

dijit/trunk

Files:

• form/ComboBox.js (modified) (1 diff)
• form/FilteringSelect.js (modified) (5 diffs)
• tests/form/test_FilteringSelect.html (modified) (2 diffs)

dijit/trunk/form/ComboBox.js

@@ -1064 +1064 @@
                 //              See dojo.data.util.simpleFetch.fetch()
                 if(!args.query){ args.query = {}; }
-                if(!args.query.name){ args.query.name = "*"; }
+                if(!args.query.name){ args.query.name = ""; }
                 if(!args.queryOptions){ args.queryOptions = {}; }
                 var query = "^" + args.query.name

dijit/trunk/form/FilteringSelect.js

@@ -30 +30 @@
                 _isvalid:true,
 
+                required:true,
+
                 _lastDisplayedValue: "",
 
                 isValid:function(){
-                        return this._isvalid;
+                        return this._isvalid || (!this.required && this.getDisplayedValue() == ""); // #5974
                 },
 
@@ -46 +48 @@
                         // so it calls _callbackSetLabel directly,
                         // and so does not pass dataObject
-                        // dataObject==null means do not test the lastQuery, just continue
-                        if(dataObject && dataObject.query[this.searchAttr] != this._lastQuery){
+                        // still need to test against _lastQuery in case it came too late
+                        if((dataObject && dataObject.query[this.searchAttr] != this._lastQuery)||(!dataObject&&this.store.getIdentity(result[0])!= this._lastQuery)){
                                 return;
                         }
@@ -55 +57 @@
                                 //#3285: change CSS to indicate error
                                 if(!this._focused){ this.valueNode.value=""; }
-                                dijit.form.TextBox.superclass.setValue.call(this, undefined, !this._focused);
+                                dijit.form.TextBox.superclass.setValue.call(this, "", !this._focused);
                                 this._isvalid=false;
                                 this.validate(this._focused);
+                                this.item=null;
                         }else{
                                 this._setValueFromItem(result[0], priorityChange);
@@ -95 +98 @@
                         //      Sets the value of the select.
                         //      Also sets the label to the corresponding value by reverse lookup.
+                        this._lastQuery=value;
+
+                        if(!value){
+                                this.setDisplayedValue("",priorityChange);
+                                return;
+                        }
 
                         //#3347: fetchItemByIdentity if no keyAttr specified
@@ -179 +188 @@
                                         onError: function(errText){
                                                 console.error('dijit.form.FilteringSelect: ' + errText);
-                                                dojo.hitch(_this, "_setValue")(undefined, label, false);
+                                                dojo.hitch(_this, "_setValue")("", label, false);
                                         }
                                 });

dijit/trunk/tests/form/test_FilteringSelect.html

@@ -69 +69 @@
 
         <form action="#" method="GET">
-                <p>FilteringSelect #1: inlined data, autoComplete=false:</p>
+                <p>FilteringSelect #1: inlined data, autoComplete=false, required="false":</p>
                 <label for="setvaluetest2">state list 1:</label>
                 <select dojoType="dijit.form.FilteringSelect"
@@ -79 +79 @@
                                 onFocus="console.log('user focus handler')"
                                 onBlur="console.log('user blur handler')"
-                >
-                        <option value="blank"></option>
+                                required="false"
+                >
                         <option value="AL">Alabama</option>
                         <option value="AK">Alaska</option>