Ticket #5917: 5917.patch

form/_FormWidget.js

@@ -316 +316 @@
                 this.setValue(this._lastValueReported, false);
         },
 
+        _valueChanged: function(){
+                var v = this.getValue();
+                var lv = this._lastValueReported;
+                // Equality comparison of objects such as dates are done by reference so
+                // two distinct objects are != even if they have the same data. So use
+                // toStrings in case the values are objects.
+                return ((v !== null && (v !== undefined) && v.toString)?v.toString():null) !== ((lv !== null && (lv !== undefined) && lv.toString)?lv.toString():null);
+        },
+
         _onKeyPress: function(e){
                 if(e.keyCode == dojo.keys.ESCAPE && !e.shiftKey && !e.ctrlKey && !e.altKey){
-                        var v = this.getValue();
-                        var lv = this._lastValueReported;
-                        // Equality comparison of objects such as dates are done by reference so
-                        // two distinct objects are != even if they have the same data. So use
-                        // toStrings in case the values are objects.
-                        if(((v !== null && (v !== undefined) && v.toString)?v.toString():null) !== ((lv !== null && (lv !== undefined) && lv.toString)?lv.toString():null)){
+                        if(this._valueChanged()){
                                 this.undo();
                                 dojo.stopEvent(e);
                                 return false;

form/ComboBox.js

@@ -76 +76 @@
 
                 baseClass:"dijitComboBox",
 
-                _lastDisplayedValue: "",
-
-                setDisplayedValue:function(/*String*/ value){
-                        this._lastDisplayedValue = value;
-                        this.setValue(value, true);
-                },
-
                 _getCaretPos: function(/*DomNode*/ element){
                         // khtml 3.5.2 has selection* methods as does webkit nightlies from 2005-06-22
                         var pos = 0;
@@ -258 +251 @@
                                         this._prev_key_backspace = false;
                                         this._prev_key_esc = true;
                                         this._hideResultList();
-                                        if(this._lastDisplayedValue != this.getDisplayedValue()){
-                                                this.setDisplayedValue(this._lastDisplayedValue);
-                                                dojo.stopEvent(evt);
-                                        }else{
-                                                this.setValue(this.getValue(), false);
-                                        }
+                                        this.inherited(arguments);
                                         break;
 
                                 case dk.DELETE:

form/FilteringSelect.js

@@ -38 +38 @@
 
                 _isvalid:true,
 
+                _lastDisplayedValue: "",
+
                 isValid:function(){
                         return this._isvalid;
                 },
@@ -217 +219 @@
                 setAttribute: function(/*String*/ attr, /*anything*/ value){
                         dijit.form.MappedTextBox.prototype.setAttribute.apply(this, arguments);
                         dijit.form.ComboBoxMixin.prototype._setAttribute.apply(this, arguments);
+                },
+
+                undo: function(){
+                        this.setDisplayedValue(this._lastDisplayedValue);
+                },
+
+                _valueChanged: function(){
+                        return this.getDisplayedValue()!=this._lastDisplayedValue;
                 }
         }
 );