Changeset 11779

Timestamp:

12/10/07 14:46:26 (9 months ago)

Author:

doughays

Message:

Fixes #5329. Check for value === null in textbox:setValue and make sure parse and format do not return null.

Location:

dijit/trunk/form

Files:

• TextBox.js (modified) (1 diff)
• TimeTextBox.js (modified) (1 diff)

dijit/trunk/form/TextBox.js

@@ -47 +47 @@
                 setValue: function(value, /*Boolean, optional*/ priorityChange, /*String, optional*/ formattedValue){
                         var filteredValue = this.filter(value);
-                        if((typeof filteredValue == typeof value) && (formattedValue == null || formattedValue == undefined)){
+                        if(((typeof filteredValue == typeof value) || (value === null/*#5329*/)) && (formattedValue == null || formattedValue == undefined)){
                                 formattedValue = this.format(filteredValue, this.constraints);
                         }

dijit/trunk/form/TimeTextBox.js

@@ -18 +18 @@
                 compare: dojo.date.compare,
                 format: function(/*Date*/ value, /*Object*/ constraints){
-                        if(!value || value.toString() == this._invalid){ return null; }
+                        if(!value || value.toString() == this._invalid){ return ''; }
                         return dojo.date.locale.format(value, constraints);
                 },
-                parse: dojo.date.locale.parse,
+                parse: function(/*String*/ value, /*Object*/ constraints){
+                        return dojo.date.locale.parse(value, constraints) || undefined; /* can't return null to getValue since that's special */
+                },
+
                 serialize: dojo.date.stamp.toISOString,