Changeset 7542

Timestamp:

03/06/07 20:24:40 (22 months ago)

Author:

ktiedt

Message:

Fixes #1694 Fixes #1692
Finally found and fixed these 2 bugs... Test case updated to remove the "known bug" test case text.

Location:

trunk

Files:

• src/widget/DatePicker.js (modified) (4 diffs)
• src/widget/DropdownDatePicker.js (modified) (2 diffs)
• tests/widget/test_DropdownDatePicker.html (modified) (2 diffs)

trunk/src/widget/DatePicker.js

@@ -1 @@
-dojo.provide("dojo.widget.DatePicker");
+        dojo.provide("dojo.widget.DatePicker");
 dojo.require("dojo.date.common");
 dojo.require("dojo.date.format");
@@ -109 +109 @@
                 fillInTemplate: function(args, frag) {
                         // summary: see dojo.widget.DomWidget
-
                         dojo.widget.DatePicker.superclass.fillInTemplate.apply(this, arguments);
-
                         // Copy style info from input node to output node
                         var source = this.getFragNodeRef(frag);
@@ -155 +153 @@
                 setDate: function(/*Date|String*/dateObj) {
                         //summary: set the current date and update the UI
-                        if(dateObj == ""){
-                                this.value = "";
-                                this._preInitUI(this.curMonth,false,true);
-                        }else if(typeof dateObj=="string"){
-                                this.value = dojo.date.fromRfc3339(dateObj);
+                        var d = dateObj;
+                        if(typeof(d)=="string" && d!=""){
+                                var t = dojo.date.fromRfc3339(d);                       
+                        }else if(typeof(d)=="object"){
+                                var t = new Date(d);
+                        }else{
+                                t = ""
+                        }
+                        if(typeof(t)=="object"){
+                                this.value = new Date(t);
                                 this.value.setHours(0,0,0,0);
                         }else{
-                                this.value = new Date(dateObj);
-                                this.value.setHours(0,0,0,0);
-                        }
+                                this.value = "";
+                        }
+                
                         if(this.selectedNode!=null){
                                 dojo.html.removeClass(this.selectedNode,this.classNames.selectedDate);
                         }
                         if(this.clickedNode!=null){
-                                dojo.debug('adding selectedDate');
                                 dojo.html.addClass(this.clickedNode,this.classNames.selectedDate);
                                 this.selectedNode = this.clickedNode;
                         }else{
                                 //only call this if setDate was called by means other than clicking a date
-                                this._preInitUI(this.value,false,true);
+                                this._preInitUI((this.value=="")?this.curMonth:this.value,false,true);
                         }
                         this.clickedNode=null;
@@ -190 +192 @@
                         //initFirst is to tell _initFirstDay if you want first day of the displayed calendar, or first day of the week for dateObj
                         //initUI tells preInitUI to go ahead and run initUI if set to true
-                        if(typeof(this.startDate) == "string"){
-                                this.startDate = dojo.date.fromRfc3339(this.startDate);
-                        }
-                        if(typeof(this.endDate) == "string"){
-                                this.endDate = dojo.date.fromRfc3339(this.endDate);
-                        }
+                        function checkDate(d , s){
+                                if(typeof(d)=="string"){
+                                        var t = dojo.date.fromRfc3339(d);
+                                        if(t==null && typeof(s)=="string"){
+                                                var t = dojo.date.fromRfc3339(s);
+                                        }
+                                        return t;
+                                }
+                                return d;
+                        }               
+                        this.startDate = checkDate(this.startDate, "1492-10-12");
+                        this.endDate = checkDate(this.endDate, "2941-10-12");
+
                         this.startDate.setHours(0,0,0,0); //adjust startDate to be exactly midnight
                         this.endDate.setHours(24,0,0,-1); //adjusting endDate to be a fraction of a second before  midnight

trunk/src/widget/DropdownDatePicker.js

@@ -102 +102 @@
                         if(typeof(this.value)=='string'&&this.value.toLowerCase()=='today'){
                                 this.value = new Date();
-                        }
-                        if(this.value && isNaN(this.value)){
+                        }else if(this.value && isNaN(this.value)){
                                 var orig = this.value;
                                 this.value = dojo.date.fromRfc3339(this.value);
-                                if(!this.value){this.value = new Date(orig); dojo.deprecated("dojo.widget.DropdownDatePicker", "date attributes must be passed in Rfc3339 format", "0.5");}
-                        }
-                        if(this.value && !isNaN(this.value)){
+                        }else if(this.value && !isNaN(this.value)){
                                 this.value = new Date(this.value);
                         }
@@ -160 +157 @@
                                         {formatLength:this.formatLength, datePattern:this.displayFormat, selector:'dateOnly', locale:this.lang}) :
                                 "";
-
-                        if(this.value < this.datePicker.startDate||this.value>this.datePicker.endDate){
+                        if(this.datePicker.value < this.datePicker.startDate||this.value>this.datePicker.endDate){
                                 this.inputNode.value = "";
                         }

trunk/tests/widget/test_DropdownDatePicker.html

@@ -66 +66 @@
                         <p>With initial date of 1969-04-25 and a custom format dd/MM/yyyy</p>
                                 <input name="dddp5" dojoType="dropdowndatepicker" inputName="mydate1" value="1969-04-25" displayFormat="dd/MM/yyyy" />
-        \               <p>In German:</p>
+                        <p>In German:</p>
                                 <input name="dddp7" dojoType="dropdowndatepicker" value="2006-06-28" lang="de" />
                         <p>In Dutch:</p>
@@ -91 +91 @@
         </div>  
     <br />
-        These are broken tests for trac tickets:<br/>
-        Wipe: with startDate="2006-10-10" (inputNode is not updating when clicking a date ticket #1694)
+        Wipe: with startDate="2006-10-10"
         <input dojoType="dropdowndatepicker" startDate="2006-10-10" containerToggle="wipe" containerToggleDuration="300">
         <br />
-        Explode: testing invalid initial value of "oiwerwerw" (should render as no value provided not NaN/NaN/NaN ticket #1692)
+        Explode: testing invalid initial value of "oiwerwerw"
         <input dojoType="dropdowndatepicker" value="oiwerwerw" containerToggle="explode" containerToggleDuration="500">
         <br /><br />