jquery-timepicker-rails 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd1716bf9fb44052c53d2beb071f2ba87898996
-  data.tar.gz: b4876c48e96e8b41bf668ef6929f695d58d96096
+  metadata.gz: c42a8f86a2e335c9e1334379379e9eb2490d94c9
+  data.tar.gz: a82b7b764a3d2e4017c0053871f83d05c439ab32
 SHA512:
-  metadata.gz: 2b862ed1f469bf4b9da10d9393bf66f3af554847431276f829c6b86277e97bfc1f1c5adde3685852170776f471309edb99d77de2527f849d4c46cb7355ffee6d
-  data.tar.gz: 3cf0d50775de147f466954c0b804190499872f88d6a8e1d836e9931d15ab0183e0cd3f37ec62c717a0c51dc824079bd8b6ddb473ada5e89ddaa73d265fe716de
+  metadata.gz: 2364986133af6d352bb35a57ab5986fb2416d73ea00e76fd80c8f7eb2a1dda21950caca91d05982f4adab1e0b15aa2ace1880dab1dc2b3e372f9b76b126d9010
+  data.tar.gz: 9211129ad12356ff0bdb115c2a8135edca14318f0d8f90fc87c44f66e1ecf794e39a0018189b5522c1c8c691fc560e0512288a71c73eb489be90ab14cc3d2567

data/lib/jquery-timepicker-rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.5"
+      VERSION = "1.3.6"
     end
   end
 end

data/vendor/assets/javascripts/jquery.timepicker.js

@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.5
+jquery-timepicker v1.3.6
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -31,12 +31,17 @@ requires jQuery 1.7+
 		disableTouchKeyboard: false,
 		forceRoundTime: false,
 		appendTo: 'body',
+		orientation: 'ltr',
 		disableTimeRanges: [],
 		closeOnWindowScroll: false,
 		typeaheadHighlight: true,
 		noneOption: false
 	};
 	var _lang = {
+		am: 'am',
+		pm: 'pm',
+		AM: 'AM',
+		PM: 'PM',
 		decimal: '.',
 		mins: 'mins',
 		hr: 'hr',
@@ -53,7 +58,7 @@ requires jQuery 1.7+
 
 				// pick up settings from data attributes
 				var attributeOptions = [];
-				for (key in _defaults) {
+				for (var key in _defaults) {
 					if (self.data(key))  {
 						attributeOptions[key] = self.data(key);
 					}
@@ -122,22 +127,28 @@ requires jQuery 1.7+
 			// make sure other pickers are hidden
 			methods.hide();
 
+			// position the dropdown relative to the input
 			list.show();
+			var listOffset = {};
+
+			if (settings.orientation == 'rtl') {
+				// right-align the dropdown
+				listOffset.left = self.offset().left + self.outerWidth() - list.outerWidth() + parseInt(list.css('marginLeft').replace('px', ''), 10);
+			} else {
+				// left-align the dropdown
+				listOffset.left = self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10);
+			}
 
 			if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
 				// position the dropdown on top
-				list.offset({
-					'left': self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10),
-					'top': self.offset().top - list.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10)
-				});
+				listOffset.top = self.offset().top - list.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10);
 			} else {
 				// put it under the input
-				list.offset({
-					'left':self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10),
-					'top': self.offset().top + self.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10)
-				});
+				listOffset.top = self.offset().top + self.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10);
 			}
 
+			list.offset(listOffset);
+
 			// position scrolling
 			var selected = list.find('.ui-timepicker-selected');
 
@@ -623,9 +634,8 @@ requires jQuery 1.7+
 		}
 
 		var self = $(this);
-		var list = self.data('timepicker-list');
 
-		if (list && list.is(':visible')) {
+		if (self.is(':focus')) {
 			return;
 		}
 
@@ -930,11 +940,11 @@ requires jQuery 1.7+
 			switch (code) {
 
 				case 'a':
-					output += (time.getHours() > 11) ? 'pm' : 'am';
+					output += (time.getHours() > 11) ? _lang.pm : _lang.am;
 					break;
 
 				case 'A':
-					output += (time.getHours() > 11) ? 'PM' : 'AM';
+					output += (time.getHours() > 11) ? _lang.PM : _lang.AM;
 					break;
 
 				case 'g':

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-timepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Tanguy Krotoff (jQuery plugin by Jon Thornton)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: jquery-timepicker packaged for the Rails 3.1+ asset pipeline