Skip to content

Commit 72850b3

Browse files
Merge branch 'dev'
2 parents 84e39e8 + decb0d9 commit 72850b3

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-timepicker-addon",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"

index.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@ <h2>Donation</h2>
9393
<h2>Getting Started</h2>
9494

9595
<h3>Highly Recommended</h3>
96+
<a href="http://trentrichardson.com/ebooks/handling-time/" title="Handling Time eBook"><img src="http://trentrichardson.com/wp-content/uploads/2013/04/time-book-titlepage.jpg" alt="Handling Time eBook" style="float:left;width:100px;margin:0 15px 15px 0;" /></a>
97+
<h4>Handling Time eBook</h4>
98+
<p>Check out the <a href="http://trentrichardson.com/ebooks/handling-time/" title="Handling Time eBook">Handling Time eBook</a> to learn from the basic setup to advanced i18n usage, and from client's javascript to the server's database.</p>
99+
<h4>Subscribe to Blog and Twitter</h4>
96100
<p><a href="http://trentrichardson.com" title="Subscribe to TrentRichardson.com via email">Subscribe to my blog via email</a> and follow <a href="http://twitter.com/practicalweb" title="Follow Me on Twitter">@PracticalWeb</a> on Twitter. I post for nearly every new version, so you know about updates.</p>
101+
<div class="clear"></div>
97102

98103
<h3>Download</h3>
99104
<p><a href="jquery-ui-timepicker-addon.js" title="Download Timepicker Addon">Download Timepicker Addon</a></p>
@@ -122,7 +127,7 @@ <h3>Requirements</h3>
122127

123128

124129
<h3>Version</h3>
125-
<p>Version 1.2.1</p>
130+
<p>Version 1.2.2</p>
126131

127132
<p>Last updated on 04/06/2013</p>
128133
<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>
@@ -343,7 +348,7 @@ <h3>Other Options</h3>
343348
<dd><em>Default: true</em> - Whether to show the timepicker within the datepicker.</dd>
344349

345350
<dt>addSliderAccess</dt>
346-
<dd><em>Default: false</em> - Adds the <a href="http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/" title="jQueryUI Slider Access Plugin">sliderAccess plugin</a> to sliders within timepicker</dd>
351+
<dd><em>Default: false</em> - Adds the <a href="http://trentrichardson.com/examples/jQuery-SliderAccess/" title="jQueryUI Slider Access Plugin">sliderAccess plugin</a> to sliders within timepicker</dd>
347352

348353
<dt>sliderAccessArgs</dt>
349354
<dd><em>Default: null</em> - Object to pass to sliderAccess when used.</dd>

jquery-ui-timepicker-addon.js

Lines changed: 4 additions & 4 deletions
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.2.1
5-
* Last Modified: 04/06/2013
4+
* Version 1.2.2
5+
* Last Modified: 04/13/2013
66
*
77
* Copyright 2013 Trent Richardson
88
* You may use this project under MIT or GPL licenses.
@@ -27,7 +27,7 @@
2727
*/
2828
$.extend($.ui, {
2929
timepicker: {
30-
version: "1.2.1"
30+
version: "1.2.2"
3131
}
3232
});
3333

@@ -1944,6 +1944,6 @@
19441944
/*
19451945
* Keep up with the version
19461946
*/
1947-
$.timepicker.version = "1.2.1";
1947+
$.timepicker.version = "1.2.2";
19481948

19491949
})(jQuery);

0 commit comments

Comments
 (0)