File tree 1 file changed +5
-1
lines changed 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change 1591
1591
// If a timezone is different in tp, keep the timezone as is
1592
1592
if ( tp_inst ) {
1593
1593
// look out for DST if tz wasn't specified
1594
- if ( tp_inst . _defaults . timezone === null ) {
1594
+ if ( ! tp_inst . support . timezone && tp_inst . _defaults . timezone === null ) {
1595
1595
tp_inst . timezone = tp_date . getTimezoneOffset ( ) * - 1 ;
1596
1596
}
1597
1597
date = $ . timepicker . timezoneAdjust ( date , tp_inst . timezone ) ;
1630
1630
// object will only return the timezone offset for the current locale, so we
1631
1631
// adjust it accordingly. If not using timezone option this won't matter..
1632
1632
if ( tp_inst . timezone != null ) {
1633
+ // look out for DST if tz wasn't specified
1634
+ if ( ! tp_inst . support . timezone && tp_inst . _defaults . timezone === null ) {
1635
+ tp_inst . timezone = date . getTimezoneOffset ( ) * - 1 ;
1636
+ }
1633
1637
date = $ . timepicker . timezoneAdjust ( date , tp_inst . timezone ) ;
1634
1638
}
1635
1639
}
You can’t perform that action at this time.
0 commit comments