Merge branch 'dev'

Author: trentrichardson

README.md

@@ -19,11 +19,28 @@ I recommend getting the eBook [Handling Time](https://sellfy.com/p/8gxZ) as it h
 
 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.
 
+Rails with Bower
+-----------------
+If you happen to use Rails with the [bower](gem "bower-rails", "~> 0.8.3") gem, here it is to use it easily :
+#### Bowerfile 
+```asset "jqueryui-timepicker-addon", "1.5.4"```
+
+#### application.js
+```javascript
+//= require jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon
+//= require jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-fr
+```
+
+#### application.css.scss
+```scss
+@import "jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.css";
+```
+
 Contributing Code - Please Read!
 --------------------------------
 - All code contributions and bug reports are much appreciated.
 - Please be sure to apply your fixes to the "dev" branch.
 - Also note tabs are appreciated over spaces.
 - Please read the [CONTRIBUTING.md][contributingmd] for more on using Grunt to produce builds.
 
-[contributingmd]: CONTRIBUTING.md
+[contributingmd]: CONTRIBUTING.md

bower.json

@@ -1,10 +1,11 @@
 {
 	"name": "jqueryui-timepicker-addon",
-	"version": "1.5.4",
+	"version": "1.5.5",
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
 	},
+	"main": ["dist/jquery-ui-timepicker-addon.js", "dist/jquery-ui-timepicker-addon.css"],
 	"dependencies": {
 	}
 }

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

@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.5.4 - 2015-05-11
+/*! jQuery Timepicker Addon - v1.5.5 - 2015-05-24
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 
@@ -248,6 +248,28 @@
 		isRTL: false
 	};
 
+// source: src/i18n/jquery-ui-timepicker-fa.js
+/* Persian translation for the jQuery Timepicker Addon */
+/* Written by Meysam Pour Ganji */
+
+    $.timepicker.regional['fa'] = {
+        timeOnlyTitle: 'انتخاب زمان',
+        timeText: 'زمان',
+        hourText: 'ساعت',
+        minuteText: 'دقیقه',
+        secondText: 'ثانیه',
+        millisecText: 'میلی ثانیه',
+        microsecText: 'میکرو ثانیه',
+        timezoneText: 'منطقه زمانی',
+        currentText: 'الان',
+        closeText: 'انتخاب',
+        timeFormat: 'HH:mm',
+        timeSuffix: '',
+        amNames: ['قبل ظهر', 'AM', 'A'],
+        pmNames: ['بعد ظهر', 'PM', 'P'],
+        isRTL: true
+    };
+
 // source: src/i18n/jquery-ui-timepicker-fi.js
 /* Finnish translation for the jQuery Timepicker Addon */
 /* Written by Juga Paazmaya (http://github.com/paazmaya) */

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

@@ -0,0 +1,22 @@
+/* Persian translation for the jQuery Timepicker Addon */
+/* Written by Meysam Pour Ganji */
+(function($) {
+    $.timepicker.regional['fa'] = {
+        timeOnlyTitle: 'انتخاب زمان',
+        timeText: 'زمان',
+        hourText: 'ساعت',
+        minuteText: 'دقیقه',
+        secondText: 'ثانیه',
+        millisecText: 'میلی ثانیه',
+        microsecText: 'میکرو ثانیه',
+        timezoneText: 'منطقه زمانی',
+        currentText: 'الان',
+        closeText: 'انتخاب',
+        timeFormat: 'HH:mm',
+        timeSuffix: '',
+        amNames: ['قبل ظهر', 'AM', 'A'],
+        pmNames: ['بعد ظهر', 'PM', 'P'],
+        isRTL: true
+    };
+    $.timepicker.setDefaults($.timepicker.regional['fa']);
+})(jQuery);

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

@@ -113,9 +113,9 @@ <h3>Requirements</h3>
 
 	<br />
 	<h3>Version</h3>
-	<p>Version 1.5.4</p>
+	<p>Version 1.5.5</p>
 
-	<p>Last updated on 2015-05-11</p>
+	<p>Last updated on 2015-05-24</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.4 - 2015-05-11
+/*! jQuery Timepicker Addon - v1.5.5 - 2015-05-24
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 (function (factory) {
@@ -22,7 +22,7 @@
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.5.4"
+			version: "1.5.5"
 		}
 	});
 
@@ -2240,6 +2240,6 @@
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.5.4";
+	$.timepicker.version = "1.5.5";
 
 }));

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.4",
-	"modified": "2015-05-11",
+	"version": "1.5.5",
+	"modified": "2015-05-24",
 	"homepage": "http://trentrichardson.com/examples/timepicker",
 	"author": {
 		"name": "Trent Richardson",

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

@@ -0,0 +1,22 @@
+/* Persian translation for the jQuery Timepicker Addon */
+/* Written by Meysam Pour Ganji */
+(function($) {
+    $.timepicker.regional['fa'] = {
+        timeOnlyTitle: 'انتخاب زمان',
+        timeText: 'زمان',
+        hourText: 'ساعت',
+        minuteText: 'دقیقه',
+        secondText: 'ثانیه',
+        millisecText: 'میلی ثانیه',
+        microsecText: 'میکرو ثانیه',
+        timezoneText: 'منطقه زمانی',
+        currentText: 'الان',
+        closeText: 'انتخاب',
+        timeFormat: 'HH:mm',
+        timeSuffix: '',
+        amNames: ['قبل ظهر', 'AM', 'A'],
+        pmNames: ['بعد ظهر', 'PM', 'P'],
+        isRTL: true
+    };
+    $.timepicker.setDefaults($.timepicker.regional['fa']);
+})(jQuery);