diff options
| author | Bruno Harbulot <bruno@distributedmatter.net> | 2011-02-28 14:00:20 +0000 |
|---|---|---|
| committer | Bruno Harbulot <bruno@distributedmatter.net> | 2011-02-28 14:00:20 +0000 |
| commit | 33ca84c9825f6bf4d74d6976588932504876d092 (patch) | |
| tree | f9ef1ff3d37c921fe9e0c3c5afedc3cc8b24d36f | |
| parent | da54680397156b375f9629d056571747f2dd0bbd (diff) | |
| download | jQuery-Timepicker-Addon-33ca84c9825f6bf4d74d6976588932504876d092.zip jQuery-Timepicker-Addon-33ca84c9825f6bf4d74d6976588932504876d092.tar.gz jQuery-Timepicker-Addon-33ca84c9825f6bf4d74d6976588932504876d092.tar.bz2 | |
Fix for default timezone if missing.
| -rw-r--r-- | example-timezone.html | 2 | ||||
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/example-timezone.html b/example-timezone.html index 1e2c59f..854b89d 100644 --- a/example-timezone.html +++ b/example-timezone.html @@ -22,7 +22,7 @@ input { width: 200px; } <script type="text/javascript"> $(document).ready(function(){ $(".timepicktest0").datetimepicker({ dateFormat: $.datepicker.RFC_2822, timeFormat: 'hh:mm' }); - $(".timepicktest1").datetimepicker({ dateFormat: $.datepicker.RFC_2822, timeFormat: 'hh:mm z', showTimezone: true }); + $(".timepicktest1").datetimepicker({ dateFormat: $.datepicker.RFC_2822, timeFormat: 'hh:mm z', showTimezone: true, timezone: "+0100" }); $(".timepicktest2").datetimepicker({ dateFormat: $.datepicker.RFC_2822, timeFormat: 'hh:mm z', showTimezone: true, timezoneList: [{"value": "+0000", "label": "British Winter Time"}, {"value": "+0100", "label": "British Summer Time"}] }); }); diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 19c1b7b..38dcd74 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -54,6 +54,7 @@ function Timepicker() { hour: 0, minute: 0, second: 0, + timezone: '+0000', hourMin: 0, minuteMin: 0, secondMin: 0, @@ -409,7 +410,7 @@ $.extend(Timepicker.prototype, { .text(typeof val == "object" ? val.label : val); }) ); - this.timezone_select.val(this.timezone); + this.timezone_select.val((typeof this.timezone != "undefined" && this.timezone != null && this.timezone != "") ? this.timezone : o.timezone); this.timezone_select.change(function() { tp_inst._onTimeChange(); }); |