Skip to content

Commit b067e36

Browse files
Final tweaks to merge with master
1 parent a43ef3b commit b067e36

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ <h3>Requirements</h3>
124124
<h3>Version</h3>
125125
<p>Version 1.1.0</p>
126126

127-
<p>Last updated on 10/25/2012</p>
127+
<p>Last updated on 11/03/2012</p>
128128
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under both MIT and GPL licenses. This means that you can choose the license that best suits your project, and use it accordingly. </p>
129129
<p><a href="http://trentrichardson.com/Impromptu/GPL-LICENSE.txt" title="GPL License">GPL License</a></p>
130130
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
@@ -554,7 +554,7 @@ <h3 id="timezone_examples">Using Timezones</h3>
554554
</div>
555555
<pre>
556556
$('#timezone_example_2').datetimepicker({
557-
timeFormat: 'hh:mm z',
557+
timeFormat: 'HH:mm z',
558558
showTimezone: true,
559559
timezoneList: [
560560
{ value: '-0500', label: 'Eastern'},
@@ -574,7 +574,7 @@ <h3 id="timezone_examples">Using Timezones</h3>
574574
</div>
575575
<pre>
576576
$('#timezone_example_3').datetimepicker({
577-
timeFormat: 'hh:mm z',
577+
timeFormat: 'HH:mm z',
578578
showTimezone: true,
579579
timezone: 'MT',
580580
timezoneList: [
@@ -614,7 +614,7 @@ <h3 id="slider_examples">Slider Modifications</h3>
614614
<pre>
615615
$('#slider_example_2').datetimepicker({
616616
showSecond: true,
617-
timeFormat: 'hh:mm:ss',
617+
timeFormat: 'HH:mm:ss',
618618
stepHour: 2,
619619
stepMinute: 10,
620620
stepSecond: 10

jquery-ui-timepicker-addon.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* jQuery timepicker addon
33
* By: Trent Richardson [http://trentrichardson.com]
4-
* Version 1.1.0-dev
5-
* Last Modified: 10/25/2012
4+
* Version 1.1.0
5+
* Last Modified: 11/03/2012
66
*
77
* Copyright 2012 Trent Richardson
88
* You may use this project under MIT or GPL licenses.

0 commit comments

Comments
 (0)