Merge branch 'dev'

Author: trentrichardson

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "jqueryui-timepicker-addon",
-	"version": "1.5.2",
+	"version": "1.5.3",
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"

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

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

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

@@ -96,22 +96,9 @@ <h4>Subscribe to Blog and Twitter</h4>
 	<br />
 
 	<h3>Download</h3>
-	<p><a href="jquery-ui-timepicker-addon.js" title="Download Timepicker Addon">Download Timepicker Addon</a></p>
+	<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>
+	
 	<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>
-	<p>There is a small bit of required CSS (<a href="jquery-ui-timepicker-addon.css" title="Download CSS">Download</a>):</p>
-<pre>/* css for timepicker */
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 45%; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-
-.ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
-.ui-timepicker-rtl dl dt{ float: right; clear: right; }
-.ui-timepicker-rtl dl dd { margin: 0 45% 10px 10px; }
-</pre>
 
 	<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>
 	<br />
@@ -126,9 +113,9 @@ <h3>Requirements</h3>
 
 	<br />
 	<h3>Version</h3>
-	<p>Version 1.5.2</p>
+	<p>Version 1.5.3</p>
 
-	<p>Last updated on 2015-03-15</p>
+	<p>Last updated on 2015-04-19</p>
 	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
 	<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
 

dist/index.html

@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.5.2 - 2015-03-15
+/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 (function (factory) {
@@ -22,7 +22,7 @@
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.5.2"
+			version: "1.5.3"
 		}
 	});
 
@@ -1548,12 +1548,12 @@
 	$.datepicker._gotoToday = function (id) {
 		var inst = this._getInst($(id)[0]),
 			$dp = inst.dpDiv;
-		this._base_gotoToday(id);
 		var tp_inst = this._get(inst, 'timepicker');
 		selectLocalTimezone(tp_inst);
 		var now = new Date();
 		this._setTime(inst, now);
 		this._setDate(inst, now);
+		this._base_gotoToday(id);
 	};
 
 	/*
@@ -1711,7 +1711,8 @@
 			}
 
 			var date = this._getDate(inst);
-			if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
+			var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());
+			if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {
 				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
 				date.setMicroseconds(tp_inst.microsec);
 
@@ -2239,6 +2240,6 @@
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.5.2";
+	$.timepicker.version = "1.5.3";
 
 }));

dist/jquery-ui-timepicker-addon.js

@@ -2,8 +2,8 @@
 	"name": "jquery-ui-timepicker-addon",
 	"title": "jQuery Timepicker Addon",
 	"description": "A timepicker addon for jQueryUI datepicker.",
-	"version": "1.5.2",
-	"modified": "2015-03-15",
+	"version": "1.5.3",
+	"modified": "2015-04-19",
 	"homepage": "http://trentrichardson.com/examples/timepicker",
 	"author": {
 		"name": "Trent Richardson",