jquery-timepicker-rails 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb17242a86d02827fc6ab90ffea9f5747fc4150
-  data.tar.gz: b2de80eb6c4f3d16441acd8ddf3aab411338d76f
+  metadata.gz: 58c295d9f0d5754e344f2d3722b1dae65261aadc
+  data.tar.gz: 601935bee43c7788d1fbfd4be3feab4014ce75e3
 SHA512:
-  metadata.gz: 8330a27a44f59e6e677e46612c8f11015536655eb29c64cd7d8d1575b06e719230d39b8d01a624ba9a59e381410f77ad236345f321beae9bb96f06dfe0bef88e
-  data.tar.gz: c38ed839513800a97c46ea1a92caa149748f83b799c254510b59868b6145cfe445162938cc15a92b4893c863ecadc2ed9701b77344ede69641d5cdf144eaa0f5
+  metadata.gz: a444ffe6e31b2679ba4ed11fa86df9aa2f20b79eb35792d58250a7239d05cd6fe6f27fed9eb91f786669311b9fba1b0995e59b514b6df4eed2c429b14bccb078
+  data.tar.gz: b388975a0ebdacb844bccabe1956ebc1917cfef49c47a1c03041760419ee00b498c0b5620779d484f99eefae27d9aa361a1cf321bd4e92f57347670ea0c07986

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

@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.7"
+      VERSION = "1.3.8"
     end
   end
 end

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

@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.7
+jquery-timepicker v1.3.8
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -391,6 +391,7 @@ requires jQuery 1.7+
 
 		if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
 			wrapped_list.addClass('ui-timepicker-with-duration');
+			wrapped_list.addClass('ui-timepicker-step-'+settings.step);
 		}
 
 		var durStart = settings.minTime;
@@ -904,17 +905,31 @@ requires jQuery 1.7+
 
 	function _int2duration(seconds)
 	{
-		var minutes = Math.round(seconds/60);
-		var duration;
+		var minutes = Math.round(seconds/60),
+			duration = [],
+			hours, mins;
 
-		if (Math.abs(minutes) < 60) {
+		if (minutes < 60) {
+			// Only show (x mins) under 1 hour
 			duration = [minutes, _lang.mins];
-		} else if (minutes == 60) {
-			duration = ['1', _lang.hr];
 		} else {
-			var hours = (minutes/60).toFixed(1);
-			if (_lang.decimal != '.') hours = hours.replace('.', _lang.decimal);
-			duration = [hours, _lang.hrs];
+			hours = Math.floor(minutes/60);
+			mins = minutes%60;
+
+			// Show decimal notation (eg: 1.5 hrs) for 30 minute steps
+			if (step == 30 && mins == 30) {
+				hours += _lang.decimal + 5;
+			}
+
+			duration.push(hours);
+			duration.push(hours == 1 ? _lang.hr : _lang.hrs);
+
+			// Show remainder minutes notation (eg: 1 hr 15 mins) for non-30 minute steps
+			// and only if there are remainder minutes to show
+			if (step != 30 && mins) {
+				duration.push(mins);
+				duration.push(_lang.mins);
+			}
 		}
 
 		return duration.join(' ');

data/vendor/assets/stylesheets/jquery.timepicker.css

@@ -13,6 +13,11 @@
 }
 
 .ui-timepicker-wrapper.ui-timepicker-with-duration {
+	width: 14em;
+}
+
+.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-30,
+.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-60 {
 	width: 11em;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-timepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Tanguy Krotoff (jQuery plugin by Jon Thornton)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties