Ticket #5974: 5974.3.patch

form/ComboBox.js

@@ -1063 +1063 @@
                 //      summary: 
                 //              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
                                 .replace(/([\\\|\(\)\[\{\^\$\+\?\.\<\>])/g, "\\$1")

form/FilteringSelect.js

@@ -29 +29 @@
                 //
                 _isvalid:true,
 
+                required:true,
+
                 _lastDisplayedValue: "",
 
                 isValid:function(){
-                        return this._isvalid;
+                        return this._isvalid||(!this.required&&this.getDisplayedValue()==""); // #5974
                 },
 
                 _callbackSetLabel: function(    /*Array*/ result, 
@@ -45 +47 @@
                         // setValue does a synchronous lookup,
                         // 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;
                         }
                         if(!result.length){
                                 //#3268: do nothing on bad input
                                 //this._setValue("", "");
                                 //#3285: change CSS to indicate error
-                                if(!this._focused){ this.valueNode.value=""; }
-                                dijit.form.TextBox.superclass.setValue.call(this, undefined, !this._focused);
+                                if(!this._focused){ this.valueNode.value=null; }
+                                dijit.form.TextBox.superclass.setValue.call(this, null, !this._focused);
                                 this._isvalid=false;
                                 this.validate(this._focused);
+                                this.item=null;
                         }else{
                                 this._setValueFromItem(result[0], priorityChange);
                         }
@@ -74 +77 @@
 
                 getValue:function(){
                         // don't get the textbox value but rather the previously set hidden value
-                        return this.valueNode.value;
+                        return this.isValid()?this.valueNode.value:null;
                 },
 
                 _getValueField:function(){
@@ -94 +97 @@
                         // summary
                         //      Sets the value of the select.
                         //      Also sets the label to the corresponding value by reverse lookup.
+                        this._lastQuery=value;
+                        // #5974: setValue(null) should clear input
+                        if(!value){
+                                this.setDisplayedValue("",priorityChange);
+                                return;
+                        }
 
                         //#3347: fetchItemByIdentity if no keyAttr specified
                         var self=this;
@@ -178 +187 @@
                                         },
                                         onError: function(errText){
                                                 console.error('dijit.form.FilteringSelect: ' + errText);
-                                                dojo.hitch(_this, "_setValue")(undefined, label, false);
+                                                dojo.hitch(_this, "_setValue")(null, label, false);
                                         }
                                 });
                         }

tests/form/test_FilteringSelect.html

@@ -68 +68 @@
         <hr>
 
         <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"
                                 id="setvaluetest2"
@@ -78 +78 @@
                                 onChange="dojo.byId('oc1').value=arguments[0]"
                                 onFocus="console.log('user focus handler')"
                                 onBlur="console.log('user blur handler')"
+                                required="false"
                 >
-                        <option value="blank"></option>
                         <option value="AL">Alabama</option>
                         <option value="AK">Alaska</option>
                         <option value="AS">American Samoa</option>