Merge branch 'dev'

trentrichardson · trentrichardson · commit 17c4f29b6c57 · 2015-11-14T10:41:00.000-05:00
diff --git a/dist/i18n/jquery-ui-timepicker-addon-i18n.js b/dist/i18n/jquery-ui-timepicker-addon-i18n.js
@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.5.6 - 2015-11-14
+/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 
diff --git a/dist/i18n/jquery-ui-timepicker-addon-i18n.min.js b/dist/i18n/jquery-ui-timepicker-addon-i18n.min.js
diff --git a/dist/i18n/jquery-ui-timepicker-mk.js b/dist/i18n/jquery-ui-timepicker-mk.js
@@ -0,0 +1,22 @@
+/* Macedonian cyrilic translation for the jQuery Timepicker Addon */
+/* Written by Vlatko Ristovski */
+(function($) {
+	$.timepicker.regional['mk'] = {
+		timeOnlyTitle: 'Одберете време',
+		timeText: 'Време',
+		hourText: 'Час',
+		minuteText: 'Минути',
+		secondText: 'Секунди',
+		millisecText: 'Милисекунди',
+		microsecText: 'Микросекунди',
+		timezoneText: 'Временска зона',
+		currentText: 'Сега',
+		closeText: 'Затвори',
+		timeFormat: 'HH:mm',
+		timeSuffix: '',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['mk']);
+})(jQuery);
diff --git a/dist/index.html b/dist/index.html
@@ -113,7 +113,7 @@ <h3>Requirements</h3>
 
 	<br />
 	<h3>Version</h3>
-	<p>Version 1.5.6</p>
+	<p>Version 1.6.1</p>
 
 	<p>Last updated on 2015-11-14</p>
 	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.5.6 - 2015-11-14
+/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 (function (factory) {
@@ -22,7 +22,7 @@
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.5.6"
+			version: "1.6.1"
 		}
 	});
 
@@ -2258,6 +2258,6 @@
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.5.6";
+	$.timepicker.version = "1.6.1";
 
 }));
diff --git a/dist/jquery-ui-timepicker-addon.min.css b/dist/jquery-ui-timepicker-addon.min.css
diff --git a/dist/jquery-ui-timepicker-addon.min.js b/dist/jquery-ui-timepicker-addon.min.js
diff --git a/jquery-ui-timepicker-addon.json b/jquery-ui-timepicker-addon.json
@@ -2,7 +2,7 @@
 	"name": "jquery-ui-timepicker-addon",
 	"title": "jQuery Timepicker Addon",
 	"description": "A timepicker addon for jQueryUI datepicker.",
-	"version": "1.5.6",
+	"version": "1.6.1",
 	"modified": "2015-11-14",
 	"homepage": "http://trentrichardson.com/examples/timepicker",
 	"author": {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jquery-ui-timepicker-addon",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"engines": {
 		"node": ">= 0.8.0"
 	},

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*! jQuery Timepicker Addon - v1.5.6 - 2015-11-14`
	`1`	`+/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14`
`2`	`2`	`* http://trentrichardson.com/examples/timepicker`
`3`	`3`	`* Copyright (c) 2015 Trent Richardson; Licensed MIT */`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jquery-ui-timepicker-addon",`
`3`		`- "version": "1.6.0",`
	`3`	`+ "version": "1.6.1",`
`4`	`4`	`"engines": {`
`5`	`5`	`"node": ">= 0.8.0"`
`6`	`6`	`},`