Merge branch 'dev'

Author: trentrichardson

Gruntfile.js

@@ -7,7 +7,8 @@ module.exports = function(grunt) {
 		// Metadata.
 		pkg: grunt.file.readJSON('jquery-ui-timepicker-addon.json'),
 		banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
-			'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
+			//'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
+			'<%= pkg.modified %>\n' +
 			'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
 			'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
 			' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
@@ -70,7 +71,7 @@ module.exports = function(grunt) {
 				options: {
 					variables: {
 						version: '<%= pkg.version %>',
-						timestamp: '<%= grunt.template.today("yyyy-mm-dd") %>'
+						timestamp: '<%= pkg.modified %>'
 					},
 					prefix: '@@'
 				},

README.md

@@ -15,6 +15,8 @@ I recommend getting the eBook [Handling Time](https://sellfy.com/p/8gxZ) as it h
 - Include timepicker-addon script located in the `dist` directory.
 - now use timepicker with `$('#selector').datetimepicker()` or `$('#selector').timepicker()`.
 
+There is also a [Bower](http://bower.io/) package named `jqueryui-timepicker-addon`.  Beware there are other similar package names that point to forks which may not be current.
+
 Contributing Code - Please Read!
 --------------------------------
 - All code contributions and bug reports are much appreciated.

bower.json

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

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

@@ -0,0 +1,21 @@
+/* Armenian translation for the jQuery Timepicker Addon */
+/* Written by Artavazd Avetisyan [email protected] */
+(function($) {
+	$.timepicker.regional['am'] = {
+		timeOnlyTitle: 'Ընտրեք ժամանակը',
+		timeText: 'Ժամանակը',
+		hourText: 'Ժամ',
+		minuteText: 'Րոպե',
+		secondText: 'Վարկյան',
+		millisecText: 'Միլիվարկյան',
+		microsecText: 'Միկրովարկյան',
+		timezoneText: 'Ժամային գոտին',
+		currentText: 'Այժմ',
+		closeText: 'Փակել',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['am']);
+})(jQuery);

dist/index.html

@@ -124,9 +124,9 @@ <h3>Requirements</h3>
 
 	<br />
 	<h3>Version</h3>
-	<p>Version 1.4.1</p>
+	<p>Version 1.4.2</p>
 
-	<p>Last updated on 2013-11-10</p>
+	<p>Last updated on 2013-11-23</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/jquery-ui-timepicker-addon.js

@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.4.1 - 2013-11-10
+/*! jQuery Timepicker Addon - v1.4.2 - 2013-11-23
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2013 Trent Richardson; Licensed MIT */
 (function ($) {
@@ -16,7 +16,7 @@
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.4.1"
+			version: "1.4.2"
 		}
 	});
 
@@ -744,15 +744,22 @@
 				microsec = parseInt(microsec, 10);
 			}
 			if (timezone !== false) {
-				timezone = parseInt(timezone, 10);
+				timezone = timezone.toString();
 			}
 
 			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
 
 			// If the update was done in the input field, the input field should not be updated.
 			// If the update was done using the sliders, update the input field.
-			var hasChanged = (hour !== this.hour || minute !== this.minute || second !== this.second || millisec !== this.millisec || microsec !== this.microsec || 
-					(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || (this.timezone !== null && timezone !== this.timezone));
+			var hasChanged = (
+						hour !== parseInt(this.hour,10) || // sliders should all be numeric
+						minute !== parseInt(this.minute,10) || 
+						second !== parseInt(this.second,10) || 
+						millisec !== parseInt(this.millisec,10) || 
+						microsec !== parseInt(this.microsec,10) || 
+						(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || 
+						(this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
+					);
 
 			if (hasChanged) {
 
@@ -799,6 +806,7 @@
 			this.timeDefined = true;
 			if (hasChanged) {
 				this._updateDateTime();
+				this.$input.focus();
 			}
 		},
 
@@ -2132,6 +2140,6 @@
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.4.1";
+	$.timepicker.version = "1.4.2";
 
 })(jQuery);

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

@@ -2,7 +2,8 @@
 	"name": "jquery-ui-timepicker-addon",
 	"title": "jQuery Timepicker Addon",
 	"description": "A timepicker addon for jQueryUI datepicker.",
-	"version": "1.4.1",
+	"version": "1.4.2",
+	"modified": "2013-11-23",
 	"homepage": "http://trentrichardson.com/examples/timepicker",
 	"author": {
 		"name": "Trent Richardson",

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

@@ -0,0 +1,21 @@
+/* Armenian translation for the jQuery Timepicker Addon */
+/* Written by Artavazd Avetisyan [email protected] */
+(function($) {
+	$.timepicker.regional['am'] = {
+		timeOnlyTitle: 'Ընտրեք ժամանակը',
+		timeText: 'Ժամանակը',
+		hourText: 'Ժամ',
+		minuteText: 'Րոպե',
+		secondText: 'Վարկյան',
+		millisecText: 'Միլիվարկյան',
+		microsecText: 'Միկրովարկյան',
+		timezoneText: 'Ժամային գոտին',
+		currentText: 'Այժմ',
+		closeText: 'Փակել',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['am']);
+})(jQuery);