Skip to content

Commit dc3d12a

Browse files
trentrichardson#843 and trentrichardson#845 - fix for clicking Now - removes any partial support for alpha timezones.
1 parent bdafae6 commit dc3d12a

5 files changed

+3
-53
lines changed

dist/index.html

-21
Original file line numberDiff line numberDiff line change
@@ -609,27 +609,6 @@ <h3 id="timezone_examples">Using Timezones</h3>
609609
{ value: -480, label: 'Pacific' }
610610
]
611611
});
612-
</pre>
613-
</div>
614-
615-
<!-- ============= example -->
616-
<div class="example-container">
617-
<p>You may also use timezone string abbreviations for values. This should be used with caution. Computing accurate javascript Date objects may not be possible when trying to retrieve or set the date from timepicker (see setDate and getDate examples below). For simple input values however this should work.</p>
618-
<div>
619-
<input type="text" name="timezone_example_3" id="timezone_example_3" value="" />
620-
</div>
621-
<pre>
622-
$('#timezone_example_3').datetimepicker({
623-
timeFormat: 'HH:mm z',
624-
timezone: 'MT',
625-
timezoneList: [
626-
{ value: 'ET', label: 'Eastern'},
627-
{ value: 'CT', label: 'Central' },
628-
{ value: 'MT', label: 'Mountain' },
629-
{ value: 'PT', label: 'Pacific' }
630-
]
631-
});
632-
633612
</pre>
634613
</div>
635614

dist/jquery-ui-timepicker-addon.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -2059,11 +2059,7 @@
20592059
return 0;
20602060
}
20612061

2062-
if(/^[a-zA-Z -]+$/.test(normalized)){ // possibly a user defined tz, so just give it back
2063-
return tzString;
2064-
}
2065-
2066-
if (!/^(\-|\+)\d{4}$/.test(normalized)) {
2062+
if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
20672063
return parseInt(tzString, 10);
20682064
}
20692065

dist/jquery-ui-timepicker-addon.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/docs/examples.html

-21
Original file line numberDiff line numberDiff line change
@@ -98,27 +98,6 @@ <h3 id="timezone_examples">Using Timezones</h3>
9898
{ value: -480, label: 'Pacific' }
9999
]
100100
});
101-
</pre>
102-
</div>
103-
104-
<!-- ============= example -->
105-
<div class="example-container">
106-
<p>You may also use timezone string abbreviations for values. This should be used with caution. Computing accurate javascript Date objects may not be possible when trying to retrieve or set the date from timepicker (see setDate and getDate examples below). For simple input values however this should work.</p>
107-
<div>
108-
<input type="text" name="timezone_example_3" id="timezone_example_3" value="" />
109-
</div>
110-
<pre>
111-
$('#timezone_example_3').datetimepicker({
112-
timeFormat: 'HH:mm z',
113-
timezone: 'MT',
114-
timezoneList: [
115-
{ value: 'ET', label: 'Eastern'},
116-
{ value: 'CT', label: 'Central' },
117-
{ value: 'MT', label: 'Mountain' },
118-
{ value: 'PT', label: 'Pacific' }
119-
]
120-
});
121-
122101
</pre>
123102
</div>
124103

src/jquery-ui-timepicker-addon.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -2065,11 +2065,7 @@
20652065
return 0;
20662066
}
20672067

2068-
if(/^[a-zA-Z -]+$/.test(normalized)){ // possibly a user defined tz, so just give it back
2069-
return tzString;
2070-
}
2071-
2072-
if (!/^(\-|\+)\d{4}$/.test(normalized)) {
2068+
if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
20732069
return parseInt(tzString, 10);
20742070
}
20752071

0 commit comments

Comments
 (0)