@@ -1315,16 +1315,16 @@ $.extend(Datepicker.prototype, {
1315
1315
}
1316
1316
return new Date ( year , month , day ) ;
1317
1317
} ;
1318
- date = ( date == null ? defaultDate : ( typeof date == 'string' ? offsetString ( date ) :
1319
- ( typeof date == 'number' ? ( isNaN ( date ) ? defaultDate : offsetNumeric ( date ) ) : date ) ) ) ;
1320
- date = ( date && date . toString ( ) == 'Invalid Date' ? defaultDate : date ) ;
1321
- if ( date ) {
1322
- date . setHours ( 0 ) ;
1323
- date . setMinutes ( 0 ) ;
1324
- date . setSeconds ( 0 ) ;
1325
- date . setMilliseconds ( 0 ) ;
1318
+ var newDate = ( date == null ? defaultDate : ( typeof date == 'string' ? offsetString ( date ) :
1319
+ ( typeof date == 'number' ? ( isNaN ( date ) ? defaultDate : offsetNumeric ( date ) ) : new Date ( date . getTime ( ) ) ) ) ) ;
1320
+ newDate = ( newDate && newDate . toString ( ) == 'Invalid Date' ? defaultDate : newDate ) ;
1321
+ if ( newDate ) {
1322
+ newDate . setHours ( 0 ) ;
1323
+ newDate . setMinutes ( 0 ) ;
1324
+ newDate . setSeconds ( 0 ) ;
1325
+ newDate . setMilliseconds ( 0 ) ;
1326
1326
}
1327
- return this . _daylightSavingAdjust ( date ) ;
1327
+ return this . _daylightSavingAdjust ( newDate ) ;
1328
1328
} ,
1329
1329
1330
1330
/* Handle switch to/from daylight saving.
@@ -1344,10 +1344,10 @@ $.extend(Datepicker.prototype, {
1344
1344
var clear = ! ( date ) ;
1345
1345
var origMonth = inst . selectedMonth ;
1346
1346
var origYear = inst . selectedYear ;
1347
- date = this . _restrictMinMax ( inst , this . _determineDate ( inst , date , new Date ( ) ) ) ;
1348
- inst . selectedDay = inst . currentDay = date . getDate ( ) ;
1349
- inst . drawMonth = inst . selectedMonth = inst . currentMonth = date . getMonth ( ) ;
1350
- inst . drawYear = inst . selectedYear = inst . currentYear = date . getFullYear ( ) ;
1347
+ var newDate = this . _restrictMinMax ( inst , this . _determineDate ( inst , date , new Date ( ) ) ) ;
1348
+ inst . selectedDay = inst . currentDay = newDate . getDate ( ) ;
1349
+ inst . drawMonth = inst . selectedMonth = inst . currentMonth = newDate . getMonth ( ) ;
1350
+ inst . drawYear = inst . selectedYear = inst . currentYear = newDate . getFullYear ( ) ;
1351
1351
if ( ( origMonth != inst . selectedMonth || origYear != inst . selectedYear ) && ! noChange )
1352
1352
this . _notifyChange ( inst ) ;
1353
1353
this . _adjustInstDate ( inst ) ;
@@ -1625,9 +1625,9 @@ $.extend(Datepicker.prototype, {
1625
1625
_restrictMinMax : function ( inst , date ) {
1626
1626
var minDate = this . _getMinMaxDate ( inst , 'min' ) ;
1627
1627
var maxDate = this . _getMinMaxDate ( inst , 'max' ) ;
1628
- date = ( minDate && date < minDate ? minDate : date ) ;
1629
- date = ( maxDate && date > maxDate ? maxDate : date ) ;
1630
- return date ;
1628
+ var newDate = ( minDate && date < minDate ? minDate : date ) ;
1629
+ newDate = ( maxDate && newDate > maxDate ? maxDate : newDate ) ;
1630
+ return newDate ;
1631
1631
} ,
1632
1632
1633
1633
/* Notify change of month/year. */
0 commit comments