jquery-timepicker-rails 1.3.9 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 545fa00de0d6a98095473a70516e8ae9437cb9a4
-  data.tar.gz: 00b5995547dba2820adf60f2ae3467580c93af1e
+  metadata.gz: c978407cf2665af4f801c09c347d41e493133053
+  data.tar.gz: 037931e33cf27380cdf92a93131d2e37ef0129bb
 SHA512:
-  metadata.gz: 92fd90b8cb6d70dc849e77200a41705770731465dd2a5f5e7ec24096bdac4c7c1b5babce3e072b0946ed2f3f29e2a6507233ac32136cb8999af71ecfdf550f55
-  data.tar.gz: 40e0464a7e807e57eed19987dd259cf5947fbe848ba8897c5abef0741a20965d74ba7aa24940285fa30e0955fccc066c9c6b8c1d538e88ae1fac236aae55f864
+  metadata.gz: 831b5fe6f57a22b12e3cb9f4b9d3290eff7272c850833d7dff3fd221cb1f61cd8a1683875ddf8ed1fbc8fe5387c183dc020f3a8c40db0df136e5861eae46f9a2
+  data.tar.gz: 2d7cf44e2a010096a9490ed8f836386fb2e6ce149af1464804504f4da75a8b27478cdea06e8dc998f3d260832497ba11d32070be707930fef83db5194d175dad

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

@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = '1.3.9'
+      VERSION = '1.4.3'
     end
   end
 end

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

@@ -1,5 +1,5 @@
 /*!
- * datepair.js v0.2.1 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
+ * datepair.js v0.2.2 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
  * Copyright (c) 2014 Jon Thornton - http://jonthornton.github.com/Datepair.js
  * License: MIT
  */
@@ -10,19 +10,19 @@
 
     var _ONE_DAY = 86400000;
     var jq = window.Zepto || window.jQuery
-    
+
     function simpleExtend(obj1, obj2) {
     	var out = obj2 || {};
-    
+
     	for (var i in obj1) {
     		if (!(i in out)) {
     			out[i] = obj1[i]
     		}
     	}
-    
+
     	return out;
     }
-    
+
     // IE's custom event support is totally borked.
     // Use jQuery if possible
     function triggerSimpleCustomEvent(el, eventName) {
@@ -34,7 +34,7 @@
     		el.dispatchEvent(event);
     	}
     }
-    
+
     // el.classList not supported by < IE10
     // use jQuery if available
     function hasClass(el, className) {
@@ -44,7 +44,7 @@
     		return el.classList.contains(className);
     	}
     }
-    
+
     function Datepair(container, options) {
     	this.dateDelta = null;
     	this.timeDelta = null;
@@ -55,7 +55,7 @@
     		dateClass: 'date',
     		defaultDateDelta: 0,
     		defaultTimeDelta: 3600000,
-    
+
     		// defaults for jquery-timepicker; override when using other input widgets
     		parseTime: function(input){
     			return jq(input).timepicker('getTime');
@@ -66,7 +66,7 @@
     		setMinTime: function(input, dateObj){
     			jq(input).timepicker('option', 'minTime', dateObj);
     		},
-    
+
     		// defaults for bootstrap datepicker; override when using other input widgets
     		parseDate: function(input){
     			return jq(input).datepicker('getDate');
@@ -75,22 +75,34 @@
     			jq(input).datepicker('update', dateObj);
     		}
     	};
-    
+
     	this.container = container;
     	this.settings = simpleExtend(this._defaults, options);
-    
+
     	this.startDateInput = this.container.querySelector('.'+this.settings.startClass+'.'+this.settings.dateClass);
     	this.endDateInput = this.container.querySelector('.'+this.settings.endClass+'.'+this.settings.dateClass);
     	this.startTimeInput = this.container.querySelector('.'+this.settings.startClass+'.'+this.settings.timeClass);
     	this.endTimeInput = this.container.querySelector('.'+this.settings.endClass+'.'+this.settings.timeClass);
-    
+
+    	// initialize date and time deltas
+    	if (this.startDateInput && this.startDateInput.value && this.startDateInput && this.endDateInput.value) {
+    		var startDate = this.settings.parseDate(this.startDateInput);
+    		var endDate = this.settings.parseDate(this.endDateInput);
+    		this.dateDelta = endDate.getTime() - startDate.getTime();
+    	}
+    	if (this.startTimeInput && this.startTimeInput.value && this.endTimeInput && this.endTimeInput.value) {
+    		var startTime = this.settings.parseTime(this.startTimeInput);
+    		var endTime = this.settings.parseTime(this.endTimeInput);
+    		this.timeDelta = endTime.getTime() - startTime.getTime();
+    	}
+
     	// init starts here
     	this._bindChangeHandler();
     }
-    
+
     Datepair.prototype = {
     	constructor: Datepair,
-    
+
     	_bindChangeHandler: function(){
     		// addEventListener doesn't work with synthetic "change" events
     		// fired by jQuery's trigger() functioin. If jQuery is present,
@@ -101,7 +113,7 @@
     			this.container.addEventListener('change', this, false);
     		}
     	},
-    
+
     	_unbindChangeHandler: function(){
     		if (jq) {
     			jq(this.container).off('change.datepair');
@@ -109,20 +121,20 @@
     			this.container.removeEventListener('change', this, false);
     		}
     	},
-    
+
     	// This function will be called when passing 'this' to addEventListener
     	handleEvent: function(e){
     		// temporarily unbind the change handler to prevent triggering this
     		// if we update other inputs
     		this._unbindChangeHandler();
-    
+
     		if (hasClass(e.target, this.settings.dateClass)) {
     			if (e.target.value != '') {
     				this._dateChanged(e.target);
     			} else {
     				this.dateDelta = null;
     			}
-    
+
     		} else if (hasClass(e.target, this.settings.timeClass)) {
     			if (e.target.value != '') {
     				this._timeChanged(e.target);
@@ -130,41 +142,41 @@
     				this.timeDelta = null;
     			}
     		}
-    
+
     		this._validateRanges();
     		this._updateEndMintime()
     		this._bindChangeHandler();
     	},
-    
+
     	_dateChanged: function(target){
     		if (!this.startDateInput || !this.endDateInput) {
     			return
     		}
-    
+
     		if (!this.startDateInput.value || !this.endDateInput.value) {
     			if (this.settings.defaultDateDelta !== null) {
     				if (this.startDateInput.value) {
     					var startDate = this.settings.parseDate(this.startDateInput);
     					var newEnd = new Date(startDate.getTime() + this.settings.defaultDateDelta * _ONE_DAY);
     					this.settings.updateDate(this.endDateInput, newEnd);
-    
+
     				} else if (this.endDateInput.value) {
     					var endDate = this.settings.parseDate($endDateInput);
     					var newStart = new Date(endDate.getTime() - this.settings.defaultDateDelta * _ONE_DAY);
     					this.settings.updateDate(this.startDateInput, newStart);
     				}
-    
+
     				this.dateDelta = this.settings.defaultDateDelta * _ONE_DAY;
     			} else {
     				this.dateDelta = null;
     			}
-    
+
     			return;
     		}
-    
+
     		var startDate = this.settings.parseDate(this.startDateInput);
     		var endDate = this.settings.parseDate(this.endDateInput);
-    
+
     		if (hasClass(target, this.settings.startClass)) {
     			var newEndDate = new Date(startDate.getTime() + this.dateDelta);
     			this.settings.updateDate(this.endDateInput, newEndDate);
@@ -177,12 +189,12 @@
     			}
     		}
     	},
-    
+
     	_timeChanged: function(target){
     		if (!this.startTimeInput || !this.endTimeInput) {
     			return
     		}
-    
+
     		if (!this.startTimeInput.value || !this.endTimeInput.value) {
     			if (this.settings.defaultTimeDelta !== null) {
     				if (this.startTimeInput.value) {
@@ -194,56 +206,56 @@
     					var newStart = new Date(endTime.getTime() - this.settings.defaultTimeDelta);
     					this.settings.updateTime(this.startTimeInput, newStart);
     				}
-    
+
     				this.timeDelta = this.settings.defaultTimeDelta;
     			} else {
     				this.timeDelta = null;
     			}
-    
+
     			return;
     		}
-    
+
     		var startTime = this.settings.parseTime(this.startTimeInput);
     		var endTime = this.settings.parseTime(this.endTimeInput);
-    
+
     		if (hasClass(target, this.settings.startClass)) {
     			var newEndTime = new Date(startTime.getTime() + this.timeDelta);
     			this.settings.updateTime(this.endTimeInput, newEndTime);
     			endTime = this.settings.parseTime(this.endTimeInput);
     		}
-    
+
     		if (this.endDateInput && this.endDateInput.value && this.dateDelta + this.timeDelta < _ONE_DAY && (endTime.getTime() - startTime.getTime()) * this.timeDelta < 0) {
     			var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
     			var endDate = this.settings.parseDate(this.endDateInput);
     			this.settings.updateDate(this.endDateInput, new Date(endDate.getTime() + offset));
     			this._dateChanged(this.endDateInput);
     		}
-    
+
     		this.timeDelta = endTime.getTime() - startTime.getTime();
     	},
-    
+
     	_updateEndMintime: function(){
     		if (typeof this.settings.setMinTime != 'function') return;
-    
+
     		var startTime = null;
     		if (!this.dateDelta || this.dateDelta < _ONE_DAY || (this.timeDelta && this.dateDelta + this.timeDelta < _ONE_DAY)) {
     			startTime = this.settings.parseTime(this.startTimeInput);
     		}
-    
+
     		this.settings.setMinTime(this.endTimeInput, startTime);
     	},
-    
+
     	_validateRanges: function(){
     		if (this.startTimeInput && this.endTimeInput && this.timeDelta === null) {
     			triggerSimpleCustomEvent(this.container, 'rangeIncomplete');
     			return;
     		}
-    
+
     		if (this.startDateInput && this.endDateInput && this.dateDelta === null) {
     			triggerSimpleCustomEvent(this.container, 'rangeIncomplete');
     			return;
     		}
-    
+
     		if (this.dateDelta + this.timeDelta >= 0) {
     			triggerSimpleCustomEvent(this.container, 'rangeSelected');
     		} else {
@@ -257,7 +269,7 @@
 }(window, document));
 
 /*!
- * datepair.js v0.2.1 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
+ * datepair.js v0.2.2 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
  * Copyright (c) 2014 Jon Thornton - http://jonthornton.github.com/Datepair.js
  * License: MIT
  */

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

@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.9
+jquery-timepicker v1.4.3
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -24,9 +24,9 @@ requires jQuery 1.7+
 		durationTime: null,
 		step: 30,
 		showDuration: false,
+		showOnFocus: true,
 		timeFormat: 'g:ia',
-		scrollDefaultNow: false,
-		scrollDefaultTime: false,
+		scrollDefault: null,
 		selectOnBlur: false,
 		disableTouchKeyboard: false,
 		forceRoundTime: false,
@@ -90,13 +90,17 @@ requires jQuery 1.7+
 
 		show: function(e)
 		{
+			var self = $(this);
+			var settings = self.data('timepicker-settings');
+
 			if (e) {
+				if (!settings.showOnFocus) {
+					return true;
+				}
+
 				e.preventDefault();
 			}
 
-			var self = $(this);
-			var settings = self.data('timepicker-settings');
-
 			if (settings.useSelect) {
 				self.data('timepicker-list').focus();
 				return;
@@ -155,10 +159,8 @@ requires jQuery 1.7+
 			if (!selected.length) {
 				if (_getTimeValue(self)) {
 					selected = _findRow(self, list, _time2int(_getTimeValue(self)));
-				} else if (settings.scrollDefaultNow) {
-					selected = _findRow(self, list, _time2int(new Date()));
-				} else if (settings.scrollDefaultTime !== false) {
-					selected = _findRow(self, list, _time2int(settings.scrollDefaultTime));
+				} else if (settings.scrollDefault) {
+					selected = _findRow(self, list, settings.scrollDefault);
 				}
 			}
 
@@ -207,34 +209,34 @@ requires jQuery 1.7+
 
 		option: function(key, value)
 		{
-			var self = this;
-			var settings = self.data('timepicker-settings');
-			var list = self.data('timepicker-list');
-
-			if (typeof key == 'object') {
-				settings = $.extend(settings, key);
+			return this.each(function(){
+				var self = $(this);
+				var settings = self.data('timepicker-settings');
+				var list = self.data('timepicker-list');
 
-			} else if (typeof key == 'string' && typeof value != 'undefined') {
-				settings[key] = value;
+				if (typeof key == 'object') {
+					settings = $.extend(settings, key);
 
-			} else if (typeof key == 'string') {
-				return settings[key];
-			}
+				} else if (typeof key == 'string' && typeof value != 'undefined') {
+					settings[key] = value;
 
-			settings = _parseSettings(settings);
+				} else if (typeof key == 'string') {
+					return settings[key];
+				}
 
-			self.data('timepicker-settings', settings);
+				settings = _parseSettings(settings);
 
-			if (list) {
-				list.remove();
-				self.data('timepicker-list', false);
-			}
+				self.data('timepicker-settings', settings);
 
-			if (settings.useSelect) {
-				_render(self);
-			}
+				if (list) {
+					list.remove();
+					self.data('timepicker-list', false);
+				}
 
-			return this;
+				if (settings.useSelect) {
+					_render(self);
+				}
+			});
 		},
 
 		getSecondsFromMidnight: function()
@@ -325,6 +327,22 @@ requires jQuery 1.7+
 			settings.durationTime = _time2int(settings.durationTime);
 		}
 
+		if (settings.scrollDefault == 'now') {
+			settings.scrollDefault = _time2int(new Date());
+		} else if (settings.scrollDefault) {
+			settings.scrollDefault = _time2int(settings.scrollDefault);
+		} else if (settings.minTime) {
+			settings.scrollDefault = settings.minTime;
+		}
+
+		if (settings.scrollDefault) {
+			settings.scrollDefault = _time2int(_roundTime(settings.scrollDefault, settings));
+		}
+
+		if (settings.timeFormat.match(/[gh]/)) {
+			settings._twelveHourTime = true;
+		}
+
 		if (settings.disableTimeRanges.length > 0) {
 			// convert string times to integers
 			for (var i in settings.disableTimeRanges) {
@@ -491,7 +509,7 @@ requires jQuery 1.7+
 			appendTo.append(wrapped_list);
 			_setSelected(self, list);
 
-			list.on('click', 'li', function(e) {
+			list.on('mousedown', 'li', function(e) {
 
 				// hack: temporarily disable the focus handler
 				// to deal with the fact that IE fires 'focus'
@@ -616,7 +634,7 @@ requires jQuery 1.7+
 	{
 		list.find('li').removeClass('ui-timepicker-selected');
 
-		var timeValue = _time2int(_getTimeValue(self));
+		var timeValue = _time2int(_getTimeValue(self), self.data('timepicker-settings'));
 		if (timeValue === null) {
 			return;
 		}
@@ -741,6 +759,9 @@ requires jQuery 1.7+
 
 		if (!list || !list.is(':visible')) {
 			if (e.keyCode == 40) {
+				// show the list!
+				methods.show.call(self.get(0));
+				list = self.data('timepicker-list');
 				if (!_hideKeyboard(self)) {
 					self.focus();
 				}
@@ -888,13 +909,6 @@ requires jQuery 1.7+
 		if (cursor.length) {
 			// selected value found
 			timeValue = cursor.data('time');
-
-		} else if (_getTimeValue(self)) {
-
-			// no selected value; fall back on input value
-			timeValue = _time2int(_getTimeValue(self));
-
-			_setSelected(self, list);
 		}
 
 		if (timeValue !== null) {
@@ -912,6 +926,7 @@ requires jQuery 1.7+
 
 	function _int2duration(seconds, step)
 	{
+		seconds = Math.abs(seconds);
 		var minutes = Math.round(seconds/60),
 			duration = [],
 			hours, mins;
@@ -1013,7 +1028,7 @@ requires jQuery 1.7+
 		return output;
 	}
 
-	function _time2int(timeString)
+	function _time2int(timeString, settings)
 	{
 		if (timeString === '') return null;
 		if (!timeString || timeString+0 == timeString) return timeString;
@@ -1044,22 +1059,30 @@ requires jQuery 1.7+
 		}
 
 		var hour = parseInt(time[1]*1, 10);
-		var hours;
+		var ampm = time[4];
+		var hours = hour;
 
-		if (time[4]) {
+		if (ampm) {
 			if (hour == 12) {
 				hours = (time[4] == 'p') ? 12 : 0;
 			} else {
 				hours = (hour + (time[4] == 'p' ? 12 : 0));
 			}
-
-		} else {
-			hours = hour;
 		}
 
 		var minutes = ( time[2]*1 || 0 );
 		var seconds = ( time[3]*1 || 0 );
-		return hours*3600 + minutes*60 + seconds;
+		var timeInt = hours*3600 + minutes*60 + seconds;
+
+		// if no am/pm provided, intelligently guess based on the scrollDefault
+		if (!ampm && settings && settings._twelveHourTime && settings.scrollDefault) {
+			var delta = timeInt - settings.scrollDefault;
+			if (delta < 0 && delta >= _ONE_DAY / -2) {
+				timeInt = (timeInt + (_ONE_DAY / 2)) % _ONE_DAY;
+			}
+		}
+
+		return timeInt
 	}
 
 	function _pad2(n) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-timepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.3
 platform: ruby
 authors:
 - Tanguy Krotoff (jQuery plugin by Jon Thornton)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties