Changeset 9697

Timestamp:

07/18/07 00:43:21 (18 months ago)

Author:

bill

Message:

Added a graphical _TimePicker based on the Calendar API.
Added TimeTextbox?, a slightly more general DateTextbox? with the _TimePicker as a popup widget.
DateTextbox? extends TimeTextbox?, uses a Calendar instead of a _TimePicker.
DateTextbox? uses the correct toISOString arguments to only submit the date.
Fixes #3782. Refs #599.

Code from Mark Hays (IBM, CCLA on file)

Location:

dijit/trunk

Files:

• form/DateTextbox.js (modified) (1 diff)
• form/templates/TimePicker.html (added)
• form/TimeTextbox.js (added)
• form/_TimePicker.js (added)
• tests/form/test_validate.html (modified) (3 diffs)

dijit/trunk/form/DateTextbox.js

@@ -2 +2 @@
 
 dojo.require("dijit._Calendar");
-dojo.require("dijit.util.popup");
-dojo.require("dojo.date");
-dojo.require("dojo.date.locale");
-dojo.require("dojo.date.stamp");
-dojo.require("dijit.form.ValidationTextbox");
+dojo.require("dijit.form.TimeTextbox");
 
 dojo.declare(
         "dijit.form.DateTextbox",
-        dijit.form.RangeBoundTextbox,
+        dijit.form.TimeTextbox,
         {
                 // summary:
                 //              A validating, serializable, range-bound date text box.
-
-                // constraints object: min, max
-                regExpGen: dojo.date.locale.regexp,
-                compare: dojo.date.compare,
-                format: dojo.date.locale.format,
-                parse: dojo.date.locale.parse,
-                value: new Date(),
-
+                
+                _popupClass: "dijit._Calendar",
+                
                 postMixInProperties: function(){
-                        dijit.form.RangeBoundTextbox.prototype.postMixInProperties.apply(this, arguments);
+                        this.inherited('postMixInProperties', arguments);
 
                         // #3407: only change constraints after postMixInProperties or ValidationTextbox will clear the change
                         this.constraints.selector = 'date';
-        
-                        // #2999
-                        if(typeof this.constraints.min == "string"){ this.constraints.min = dojo.date.stamp.fromISOString(this.constraints.min); }
-                        if(typeof this.constraints.max == "string"){ this.constraints.max = dojo.date.stamp.fromISOString(this.constraints.max); }
-                },
-
-                onfocus: function(/*Event*/ evt){
-                        // open the calendar
-                        this._open();
-                        dijit.form.RangeBoundTextbox.prototype.onfocus.apply(this, arguments);
-                },
-
-                serialize: function(/*Date*/date){
-                        return dojo.date.stamp.toISOString(date, 'date'); // String
-                },
-
-                setValue: function(/*Date*/date, /*Boolean, optional*/ priorityChange){
-                        // summary:
-                        //      Sets the date on this textbox
-                        this.inherited('setValue', arguments);
-                        if(this._calendar){
-                                this._calendar.setValue(date);
-                        }
-                },
-
-                _open: function(){
-                        // summary:
-                        //      opens the Calendar, and sets the onValueSelected for the Calendar
-                        var self = this;
-
-                        if(!this._calendar){
-                                this._calendar = new dijit._Calendar({
-                                        onValueSelected: function(value){
-
-                                                self.focus(); // focus the textbox before the popup closes to avoid reopening the popup
-                                                setTimeout(dijit.util.popup.close, 1); // allow focus time to take
-
-                                                // this will cause InlineEditBox and other handlers to do stuff so make sure it's last
-                                                dijit.form.DateTextbox.superclass.setValue.call(self, value, true);
-                                        },
-                                        lang: this.lang,
-                                        isDisabledDate: function(/*Date*/ date){
-                                                // summary:
-                                                //      disables dates outside of the min/max of the DateTextbox
-                                                return self.constraints && (dojo.date.compare(self.constraints.min,date) > 0 || dojo.date.compare(self.constraints.max,date) < 0);
-                                        }
-                                });
-                                this._calendar.setValue(this.getValue() || new Date());
-                        }
-                        if(!this._opened){
-                                dijit.util.popup.open({
-                                        host: this,
-                                        popup: this._calendar,
-                                        around: this.domNode,
-                                        onClose: function(){ self._opened=false; }
-                                });
-                                this._opened=true;
-                        }
-                },
-
-                _onBlur: function(){
-                        // summary: called magically when focus has shifted away from this widget and it's dropdown
-                        dijit.util.popup.closeAll();
-                        this.inherited('_onBlur', arguments);
-                        // don't focus on <input>.  the user has explicitly focused on something else.
-                },
-
-                postCreate: function(){
-                        this.inherited('postCreate', arguments);
-                        this.connect(this.domNode, "onclick", this._open);
-                },
-
-                getDisplayedValue:function(){
-                        return this.textbox.value;
-                },
-
-                setDisplayedValue:function(/*String*/ value){
-                        this.textbox.value=value;
                 }
         }

dijit/trunk/tests/form/test_validate.html

@@ -15 +15 @@
                         dojo.require("dijit.form.CurrencyTextbox");
                         dojo.require("dijit.form.DateTextbox");
+                        dojo.require("dijit.form.TimeTextbox");
 //                      dojo.require("dojo.validate.common");
 //                      dojo.require("dojo.validate.us");
@@ -407 +408 @@
         </div>
         <div class="testExample">
-                <input id="q16" type="text" name="time1" class="medium" value="5:45:00 pm"
-                        dojoType="dijit.form.ValidationTextbox"
-                        validator="dojo.date.locale.parse"
+                <input id="q16" type="text" name="time1" class="medium" value="T17:45:00"
+                        dojoType="dijit.form.TimeTextbox"
                         constraints={formatLength:'medium',selector:'time'}
-                        trim="true"
                         required="true"
                         invalidMessage="Invalid time." />
@@ -422 +421 @@
         </div>
         <div class="testExample">
-                <input id="q17" type="text" name="time2" class="medium" value="17:45:00"
-                        dojoType="dijit.form.ValidationTextbox"
-                        validator="dojo.date.locale.parse"
+                <input id="q17" type="text" name="time2" class="medium" value="T17:45:00"
+                        dojoType="dijit.form.TimeTextbox"
                         constraints={formatLength:'short',selector:'time',timePattern:'HH:mm:ss'}
-                        trim="true"
                         required="true"
                         invalidMessage="Invalid time. Use HH:mm:ss where HH is 00 - 23 hours.">