@@ -110,7 +110,6 @@ $.extend(Timepicker.prototype, {
110
110
minute : 0 ,
111
111
second : 0 ,
112
112
millisec : 0 ,
113
- timezone : '+0000' ,
114
113
hourMinOriginal : null ,
115
114
minuteMinOriginal : null ,
116
115
secondMinOriginal : null ,
@@ -444,7 +443,11 @@ $.extend(Timepicker.prototype, {
444
443
. text ( typeof val == "object" ? val . label : val ) ;
445
444
} )
446
445
) ;
447
- this . timezone_select . val ( ( typeof this . timezone != "undefined" && this . timezone != null && this . timezone != "" ) ? this . timezone : o . timezone ) ;
446
+ if ( typeof this . timezone != "undefined" && this . timezone != null && this . timezone != "" ) {
447
+ this . timezone_select . val ( this . timezone ) ;
448
+ } else {
449
+ selectLocalTimeZone ( tp_inst ) ;
450
+ }
448
451
this . timezone_select . change ( function ( ) {
449
452
tp_inst . _onTimeChange ( ) ;
450
453
} ) ;
@@ -1125,18 +1128,9 @@ $.datepicker._gotoToday = function(id) {
1125
1128
var inst = this . _getInst ( $ ( id ) [ 0 ] ) ,
1126
1129
$dp = inst . dpDiv ;
1127
1130
this . _base_gotoToday ( id ) ;
1128
- var now = new Date ( ) ;
1129
1131
var tp_inst = this . _get ( inst , 'timepicker' ) ;
1130
- if ( tp_inst && tp_inst . _defaults . showTimezone && tp_inst . timezone_select ) {
1131
- var tzoffset = now . getTimezoneOffset ( ) ; // If +0100, returns -60
1132
- var tzsign = tzoffset > 0 ? '-' : '+' ;
1133
- tzoffset = Math . abs ( tzoffset ) ;
1134
- var tzmin = tzoffset % 60 ;
1135
- tzoffset = tzsign + ( '0' + ( tzoffset - tzmin ) / 60 ) . slice ( - 2 ) + ( '0' + tzmin ) . slice ( - 2 ) ;
1136
- if ( tp_inst . _defaults . timezoneIso8601 )
1137
- tzoffset = tzoffset . substring ( 0 , 3 ) + ':' + tzoffset . substring ( 3 ) ;
1138
- tp_inst . timezone_select . val ( tzoffset ) ;
1139
- }
1132
+ selectLocalTimeZone ( tp_inst ) ;
1133
+ var now = new Date ( ) ;
1140
1134
this . _setTime ( inst , now ) ;
1141
1135
$ ( '.ui-datepicker-today' , $dp ) . click ( ) ;
1142
1136
} ;
@@ -1403,6 +1397,24 @@ var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dat
1403
1397
return { date : date } ;
1404
1398
}
1405
1399
1400
+ //#######################################################################################
1401
+ // Internal function to set timezone_select to the local timezone
1402
+ //#######################################################################################
1403
+ var selectLocalTimeZone = function ( tp_inst )
1404
+ {
1405
+ if ( tp_inst && tp_inst . _defaults . showTimezone && tp_inst . timezone_select ) {
1406
+ var now = new Date ( ) ;
1407
+ var tzoffset = now . getTimezoneOffset ( ) ; // If +0100, returns -60
1408
+ var tzsign = tzoffset > 0 ? '-' : '+' ;
1409
+ tzoffset = Math . abs ( tzoffset ) ;
1410
+ var tzmin = tzoffset % 60 ;
1411
+ tzoffset = tzsign + ( '0' + ( tzoffset - tzmin ) / 60 ) . slice ( - 2 ) + ( '0' + tzmin ) . slice ( - 2 ) ;
1412
+ if ( tp_inst . _defaults . timezoneIso8601 )
1413
+ tzoffset = tzoffset . substring ( 0 , 3 ) + ':' + tzoffset . substring ( 3 ) ;
1414
+ tp_inst . timezone_select . val ( tzoffset ) ;
1415
+ }
1416
+ }
1417
+
1406
1418
$ . timepicker = new Timepicker ( ) ; // singleton instance
1407
1419
$ . timepicker . version = "1.0.1" ;
1408
1420
0 commit comments