Skip to content

Commit fe455ff

Browse files
Fix by alex3d, prevents overwriting _defaults
1 parent 3a7d3d7 commit fe455ff

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

index.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<link rel="stylesheet" media="all" type="text/css" href="http://code.jquery.com/ui/1.8.21/themes/ui-lightness/jquery-ui.css" />
3131
<link rel="stylesheet" media="all" type="text/css" href="jquery-ui-timepicker-addon.css" />
3232

33-
<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
34-
<script type="text/javascript" src="http://code.jquery.com/ui/1.8.21/jquery-ui.min.js"></script>
33+
<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js"></script>
34+
<script type="text/javascript" src="http://code.jquery.com/ui/1.8.23/jquery-ui.min.js"></script>
3535
<script type="text/javascript" src="jquery-ui-timepicker-addon.js"></script>
3636
<script type="text/javascript" src="jquery-ui-sliderAccess.js"></script>
3737
<script type="text/javascript">
@@ -139,6 +139,7 @@ <h2>Some Examples</h2>
139139
<dt>T</dt><dd>A or P for AM/PM</dd>
140140
<dt>tt</dt><dd>am or pm for AM/PM</dd>
141141
<dt>TT</dt><dd>AM or PM for AM/PM</dd>
142+
<dt>z</dt><dd>Timezone</dd>
142143
</dl>
143144
<p>Also related to your timeFormat, but not required, is the separator option</p>
144145
<dl>

jquery-ui-timepicker-addon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ $.datepicker.parseTime = function(timeFormat, timeString, options) {
10761076
//########################################################################
10771077
$.datepicker.formatTime = function(format, time, options) {
10781078
options = options || {};
1079-
options = $.extend($.timepicker._defaults, options);
1079+
options = $.extend({}, $.timepicker._defaults, options);
10801080
time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
10811081

10821082
var tmptime = format;

0 commit comments

Comments
 (0)