Skip to content

Commit b523fe1

Browse files
trentrichardsontrentrichardson
committed
Merge branch 'dev'
2 parents 8c597e8 + 211a104 commit b523fe1

10 files changed

+24
-48
lines changed

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jqueryui-timepicker-addon",
3-
"version": "1.5.2",
3+
"version": "1.5.3",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"

‎dist/i18n/jquery-ui-timepicker-addon-i18n.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Timepicker Addon - v1.5.2 - 2015-03-15
1+
/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44

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

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

‎dist/index.html

+4-17
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,9 @@ <h4>Subscribe to Blog and Twitter</h4>
9696
<br />
9797

9898
<h3>Download</h3>
99-
<p><a href="jquery-ui-timepicker-addon.js" title="Download Timepicker Addon">Download Timepicker Addon</a></p>
99+
<p><a href="jquery-ui-timepicker-addon.js" title="Download Timepicker Addon">Download Timepicker Addon</a> and the <a href="jquery-ui-timepicker-addon.css" title="Download CSS">required CSS</a>.</p>
100+
100101
<p><a href="http://github.com/trentrichardson/jQuery-Timepicker-Addon" title="Check out Timepicker on GitHub">Download/Contribute on GitHub</a> (Need the entire repo? Find a bug? See if its fixed here)</p>
101-
<p>There is a small bit of required CSS (<a href="jquery-ui-timepicker-addon.css" title="Download CSS">Download</a>):</p>
102-
<pre>/* css for timepicker */
103-
.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
104-
.ui-timepicker-div dl { text-align: left; }
105-
.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
106-
.ui-timepicker-div dl dd { margin: 0 10px 10px 45%; }
107-
.ui-timepicker-div td { font-size: 90%; }
108-
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
109-
110-
.ui-timepicker-rtl{ direction: rtl; }
111-
.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
112-
.ui-timepicker-rtl dl dt{ float: right; clear: right; }
113-
.ui-timepicker-rtl dl dd { margin: 0 45% 10px 10px; }
114-
</pre>
115102

116103
<p>If you prefer a hosted CDN there are a couple available: <a href="http://cdnjs.com/libraries/jquery-ui-timepicker-addon" title="Timepicker on CDNJS">CDNJS</a>, <a href="http://www.jsdelivr.com/#!jquery.ui.timepicker.addon" title="Timepicker on jsDelivr">jsDelivr</a>.</p>
117104
<br />
@@ -126,9 +113,9 @@ <h3>Requirements</h3>
126113

127114
<br />
128115
<h3>Version</h3>
129-
<p>Version 1.5.2</p>
116+
<p>Version 1.5.3</p>
130117

131-
<p>Last updated on 2015-03-15</p>
118+
<p>Last updated on 2015-04-19</p>
132119
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
133120
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
134121

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Timepicker Addon - v1.5.2 - 2015-03-15
1+
/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44
(function (factory) {
@@ -22,7 +22,7 @@
2222
*/
2323
$.extend($.ui, {
2424
timepicker: {
25-
version: "1.5.2"
25+
version: "1.5.3"
2626
}
2727
});
2828

@@ -1548,12 +1548,12 @@
15481548
$.datepicker._gotoToday = function (id) {
15491549
var inst = this._getInst($(id)[0]),
15501550
$dp = inst.dpDiv;
1551-
this._base_gotoToday(id);
15521551
var tp_inst = this._get(inst, 'timepicker');
15531552
selectLocalTimezone(tp_inst);
15541553
var now = new Date();
15551554
this._setTime(inst, now);
15561555
this._setDate(inst, now);
1556+
this._base_gotoToday(id);
15571557
};
15581558

15591559
/*
@@ -1711,7 +1711,8 @@
17111711
}
17121712

17131713
var date = this._getDate(inst);
1714-
if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
1714+
var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());
1715+
if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {
17151716
date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
17161717
date.setMicroseconds(tp_inst.microsec);
17171718

@@ -2239,6 +2240,6 @@
22392240
/*
22402241
* Keep up with the version
22412242
*/
2242-
$.timepicker.version = "1.5.2";
2243+
$.timepicker.version = "1.5.3";
22432244

22442245
}));

‎dist/jquery-ui-timepicker-addon.min.css

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

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

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

‎jquery-ui-timepicker-addon.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "jquery-ui-timepicker-addon",
33
"title": "jQuery Timepicker Addon",
44
"description": "A timepicker addon for jQueryUI datepicker.",
5-
"version": "1.5.2",
6-
"modified": "2015-03-15",
5+
"version": "1.5.3",
6+
"modified": "2015-04-19",
77
"homepage": "http://trentrichardson.com/examples/timepicker",
88
"author": {
99
"name": "Trent Richardson",

0 commit comments

Comments
 (0)