Changeset 5637

Timestamp:

09/11/06 21:09:00 (2 years ago)

Author:

peller

Message:

DropdownDatePicker? handling of locale-based formatting and parsing of dates (fixes #1008, fixes #821)
Use locale-independent serialization for dddp in a form (fixes #721)
Removed experimental from dojo.date.parse (fixes #835)

Location:

trunk

Files:

• src/date/format.js (modified) (6 diffs)
• src/widget/DropdownContainer.js (modified) (1 diff)
• src/widget/DropdownDatePicker.js (modified) (3 diffs)
• tests/widget/test_DropdownDatePicker_localize.html (added)

trunk/src/date/format.js

@@ -1 +1 @@
 dojo.provide("dojo.date.format");
-
-dojo.require("dojo.experimental");
 
 dojo.require("dojo.date.common");
@@ -202 +200 @@
                                         break;
                                 default:
-                                        dojo.raise("invalid format: "+pattern);
+                                        dojo.raise("dojo.date.parse: invalid format: "+pattern);
                         }
                         if(pad){ s = dojo.string.pad(s, l); }
@@ -245 +243 @@
 //
 // value:
-//              The int string to be convertted
+//              The int string to be converted
 //
 // options: object {selector: string, formatLength: string, datePattern: string, timePattern: string, locale: string}
@@ -253 +251 @@
 //              locale- override the locale used to determine formatting rules
 //
-        dojo.experimental("dojo.date.parse");
+
         //TODO: this is still quite rough - it only implements a small portion of the parsing algorithm needed,
         // and doesn't provide much flexibility in matching.
@@ -269 +267 @@
 
         var match = dateRE.exec(value);
+        if(!match){return null;} /* null */
+
         var result = new Date();
         result.setHours(0,0,0,0);
@@ -304 +304 @@
         var literal = false;
         for(var i=0; i<chunks.length; i++){
-                if(!chunks[i]){chunks[i]='\'';}
+                if(!chunks[i]){chunks[i]='\'';} //FIXME
                 else{
                         chunks[i]=(literal ? applyLiteral : applyPattern)(chunks[i]);

trunk/src/widget/DropdownContainer.js

@@ -27 +27 @@
                 containerAnimInProgress: false,
 
-                templateString: '<span style="white-space:nowrap"><input type="text" value="" style="vertical-align:middle;" dojoAttachPoint="inputNode" autocomplete="off" /> <img src="${this.iconURL}" alt="${this.iconAlt}" dojoAttachEvent="onclick: onIconClick;" dojoAttachPoint="buttonNode" style="vertical-align:middle; cursor:pointer; cursor:hand;" /></span>',
+                templateString: '<span style="white-space:nowrap"><input type="hidden" name="" value="" dojoAttachPoint="valueNode" /><input name="" type="text" value="" style="vertical-align:middle;" dojoAttachPoint="inputNode" autocomplete="off" /> <img src="${this.iconURL}" alt="${this.iconAlt}" dojoAttachEvent="onclick: onIconClick" dojoAttachPoint="buttonNode" style="vertical-align:middle; cursor:pointer; cursor:hand" /></span>',
                 templateCssPath: "",
 

trunk/src/widget/DropdownDatePicker.js

@@ -6 +6 @@
 dojo.require("dojo.event.*");
 dojo.require("dojo.html.*");
+dojo.require("dojo.date.format");
+dojo.require("dojo.date.serialize");
 
 dojo.require("dojo.i18n.common");
@@ -16 +18 @@
                 iconURL: dojo.uri.dojoUri("src/widget/templates/images/dateIcon.gif"),
                 zIndex: "10",
-                datePicker: null,
-                
-                dateFormat: "%m/%d/%Y",
-                date: null,
+
+                // pattern used in display of formatted date.  See dojo.date.format.
+                displayFormat: "",
+                dateFormat: "", // deprecated in 0.5
+                // formatting used when submitting form.  A pattern string like display format or one of the following:
+                // rfc|iso|posix|unix  By default, uses rfc3339 style date formatting.
+                saveFormat: "",
+                // type of format appropriate to locale.  see dojo.date.format
+                formatLength: "short", // only parsing of short is supported at this time
+                date: "",
+                // name of the form element
+                name: "",
 
                 postMixInProperties: function(localProperties, frag) {
@@ -25 +35 @@
                         var messages = dojo.i18n.getLocalization("dojo.widget", "DropdownDatePicker", this.lang);
                         this.iconAlt = messages.selectDate;
+
+                        if(this.date && isNaN(this.date)){
+                                var orig = this.date;
+                                this.date = dojo.date.fromRfc3339(this.date);
+                                if(!this.date){this.date = new Date(orig); dojo.deprecated("dojo.widget.DropdownDatePicker", "date attributes must be passed in Rfc3339 format", "0.5");}
+                        }
+                        if(this.date && !isNaN(this.date)){
+                                this.date = new Date(this.date);
+                        }
                 },
 
                 fillInTemplate: function(args, frag){
                         dojo.widget.DropdownDatePicker.superclass.fillInTemplate.call(this, args, frag);
-                        var source = this.getFragNodeRef(frag);
-                        
-                        if(args.date){ this.date = new Date(args.date); }
-                        
+
                         var dpNode = document.createElement("div");
                         this.containerNode.appendChild(dpNode);
-                        
+
                         var dateProps = { widgetContainerId: this.widgetId };
                         if(this.date){
-                                dateProps["date"] = this.date;
-                                dateProps["selectedDate"] = dojo.date.toRfc3339(this.date);
-                                this.inputNode.value = dojo.date.strftime(this.date, this.dateFormat);
+                                dateProps.selectedDate = dojo.date.toRfc3339(this.date, 'dateOnly');
                         }
                         this.datePicker = dojo.widget.createWidget("DatePicker", dateProps, dpNode);
                         dojo.event.connect(this.datePicker, "onSetDate", this, "onSetDate");
+                        if(this.date){
+                                this.onSetDate();
+                        }
                         this.containerNode.style.zIndex = this.zIndex;
                         this.containerNode.style.backgroundColor = "transparent";
+                        this.valueNode.name=this.name;
                 },
-                
+
                 onSetDate: function(){
-                        this.inputNode.value = dojo.date.format(this.datePicker.date, this.dateFormat);
+                        if(this.dateFormat){
+                                dojo.deprecated("dojo.widget.DropdownDatePicker",
+                                "Must use displayFormat attribute instead of dateFormat.  See dojo.date.format for specification.", "0.5");
+                                this.inputNode.value = dojo.date.strftime(this.datePicker.date, this.dateFormat, this.lang);
+                        }else{
+                                this.inputNode.value = dojo.date.format(this.datePicker.date,
+                                        {formatLength:this.formatLength, datePattern:this.displayFormat, selector:'dateOnly', locale:this.lang});
+                        }
+                        this._synchValueNode();
                         this.hideContainer();
                 },
-                
+
                 onInputChange: function(){
-                        this.datePicker.date = new Date(this.inputNode.value);
-                        this.datePicker.setDate(this.datePicker.date);
+                        if(this.dateFormat){
+                                dojo.deprecated("dojo.widget.DropdownDatePicker",
+                                "Cannot parse user input.  Must use displayFormat attribute instead of dateFormat.  See dojo.date.format for specification.", "0.5");
+                        }else{
+                                var inputDate = dojo.date.parse(this.inputNode.value,
+                                                {formatLength:this.formatLength, datePattern:this.displayFormat, selector:'dateOnly', locale:this.lang});                       
+                                if(inputDate){
+                                        this.datePicker.setDate(inputDate);
+                                        this._synchValueNode();
+                                }
+                        }
+                        // If the date entered didn't parse, reset to the old date.  KISS, for now.
+                        //TODO: usability?  should we provide more feedback somehow? an error notice?
+                        // seems redundant to do this if the parse failed, but at least until we have validation,
+                        // this will fix up the display of entries like 01/32/2006
+                        this.onSetDate();
+                },
+
+                _synchValueNode: function(){
+                        var date = this.datePicker.date;
+                        var value;
+                        switch(this.saveFormat.toLowerCase()){
+                                case "rfc": case "iso": case "":
+                                        value = dojo.date.toRfc3339(date, 'dateOnly');
+                                        break;
+                                case "posix": case "unix":
+                                        value = Number(date);
+                                        break;
+                                default:
+                                        value = dojo.date.format(date, {datePattern:this.saveFormat, selector:'dateOnly', locale:this.lang});
+                        }
+                        this.valueNode.value = value;
                 },