Changeset 4410

Timestamp:

01/11/08 01:50:44 (1 year ago)

Author:

kbwood.au

Message:

Allow defaultDate/minDate/maxDate to be set as relative days/weeks/months/years

Files:

• trunk/ui/current/datepicker/core/ui.datepicker.js (modified) (5 diffs)

trunk/ui/current/datepicker/core/ui.datepicker.js

@@ -1062 +1062 @@
         shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
             new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-        var date = this._getDefaultDate();
+        var date = defaultDate = this._getDefaultDate();
         if (dates.length > 0) {
             var dayNamesShort = this._get('dayNamesShort');
@@ -1070 +1070 @@
             if (dates.length > 1) {
                 date = $.datepicker.parseDate(dateFormat, dates[1], shortYearCutoff,
-                    dayNamesShort, dayNames, monthNamesShort, monthNames) ||
-                    this._getDefaultDate();
+                    dayNamesShort, dayNames, monthNamesShort, monthNames) || defaultDate;
                 this._endDay = date.getDate();
                 this._endMonth = date.getMonth();
@@ -1078 +1077 @@
             try {
                 date = $.datepicker.parseDate(dateFormat, dates[0], shortYearCutoff,
-                    dayNamesShort, dayNames, monthNamesShort, monthNames) ||
-                    this._getDefaultDate();
+                    dayNamesShort, dayNames, monthNamesShort, monthNames) ||defaultDate;
             }
             catch (e) {
                 $.datepicker.log(e);
-                date = this._getDefaultDate();
+                date = defaultDate;
             }
         }
@@ -1094 +1092 @@
     /* Retrieve the default date shown on opening. */
     _getDefaultDate: function() {
-        var offsetDate = function(offset) {
+        return this._determineDate('defaultDate', new Date());
+    },
+
+    /* A date may be specified as an exact value or a relative one. */
+    _determineDate: function(name, defaultDate) {
+        var offsetNumeric = function(offset) {
             var date = new Date();
             date.setDate(date.getDate() + offset);
             return date;
         };
-        var defaultDate = this._get('defaultDate');
-        return (defaultDate == null ? new Date() :
-            (typeof defaultDate == 'number' ? offsetDate(defaultDate) : defaultDate));
+        var offsetString = function(offset, getDaysInMonth) {
+            var date = new Date();
+            var matches = /^([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?$/.exec(offset);
+            if (matches) {
+                var year = date.getFullYear();
+                var month = date.getMonth();
+                var day = date.getDate();
+                switch (matches[2] || 'd') {
+                    case 'd' : case 'D' :
+                        day += (matches[1] - 0); break;
+                    case 'w' : case 'W' :
+                        day += (matches[1] * 7); break;
+                    case 'm' : case 'M' :
+                        month += (matches[1] - 0); 
+                        day = Math.min(day, getDaysInMonth(year, month));
+                        break;
+                    case 'y': case 'Y' :
+                        year += (matches[1] - 0);
+                        day = Math.min(day, getDaysInMonth(year, month));
+                        break;
+                }
+                date = new Date(year, month, day);
+            }
+            return date;
+        };
+        var date = this._get(name);
+        return (date == null ? defaultDate :
+            (typeof date == 'string' ? offsetString(date, this._getDaysInMonth) :
+            (typeof date == 'number' ? offsetNumeric(date) : date)));
     },
 
@@ -1359 +1388 @@
     /* Determine the current maximum date - ensure no time components are set - may be overridden for a range. */
     _getMinMaxDate: function(minMax, checkRange) {
-        var date = this._get(minMax + 'Date');
-        if (typeof date == 'number') {
-            var offset = date;
-            date = new Date();
-            date.setDate(date.getDate() + offset);
-        }
+        var date = this._determineDate(minMax + 'Date', null);
         if (date) {
             date.setHours(0);