jquery-timepicker-rails 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45718952790f6cd76d6c394f4d97163710f83281
-  data.tar.gz: 93e2971f8062d9bd1a20ed023971860adc567368
+  metadata.gz: 9fd1716bf9fb44052c53d2beb071f2ba87898996
+  data.tar.gz: b4876c48e96e8b41bf668ef6929f695d58d96096
 SHA512:
-  metadata.gz: 61017dad9c1c2bd5b8658a3491fbbf664535f44662dd5f90e57edec154c0f3aff542f15affb3e5621d2263b571a433c4d3cdbeb884201cb05d3f7909edaf6ed9
-  data.tar.gz: 6875ae7462327372bdce4d30143e2b98d8e344214946e2267df75c631e789eae4b6f2b1a84dbe2825f94f2a222ddda5d5792f1480d24d8d9c85e866943298342
+  metadata.gz: 2b862ed1f469bf4b9da10d9393bf66f3af554847431276f829c6b86277e97bfc1f1c5adde3685852170776f471309edb99d77de2527f849d4c46cb7355ffee6d
+  data.tar.gz: 3cf0d50775de147f466954c0b804190499872f88d6a8e1d836e9931d15ab0183e0cd3f37ec62c717a0c51dc824079bd8b6ddb473ada5e89ddaa73d265fe716de

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

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

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

@@ -67,6 +67,8 @@ requires jQuery 1.7+
 					var startDate = settings.parseDate($startDateInput);
 					var endDate = settings.parseDate($endDateInput);
 					$self.data('datepair-datedelta', endDate.getTime() - startDate.getTime());
+				} else {
+					$self.data('datepair-datedelta', null);
 				}
 
 				// initialize datepair-timedelta
@@ -77,6 +79,8 @@ requires jQuery 1.7+
 					var startTime = settings.parseTime($startTimeInput);
 					var endTime = settings.parseTime($endTimeInput);
 					$self.data('datepair-timedelta', endTime.getTime() - startTime.getTime());
+				} else {
+					$self.data('datepair-timedelta', null);
 				}
 
 				_updateEndMintime($self);
@@ -107,9 +111,11 @@ requires jQuery 1.7+
 
 		remove: function()
 		{
-			var self = this;
-			self.removeData('datepair-settings');
-			self.off('.timepicker');
+			var $self = this;
+			$self.removeData('datepair-settings');
+			_unbindChangeHandler($self)
+
+			return $self;
 		}
 	};
 
@@ -145,15 +151,23 @@ requires jQuery 1.7+
 		var settings = $self.data('datepair-settings');
 		var $target = $(e.target);
 
-		if ($target.val() != '') {
-			if ($target.hasClass(settings.dateClass)) {
+		if ($target.hasClass(settings.dateClass)) {
+			if ($target.val() != '') {
 				_dateChanged($self, $target);
+			} else {
+				$self.data('datepair-datedelta', null);
+			}
 
-			} else if ($target.hasClass(settings.timeClass)) {
+		} else if ($target.hasClass(settings.timeClass)) {
+			if ($target.val() != '') {
 				_timeChanged($self, $target);
+			} else {
+				$self.data('datepair-timedelta', null);
 			}
 		}
 
+		_validateRanges($self);
+		_updateEndMintime($self)
 		_bindChangeHandler($self);
 	}
 
@@ -196,7 +210,7 @@ requires jQuery 1.7+
 					settings.updateDate($endDateInput, newEnd);
 				} else if ($endDateInput.val()) {
 					var endDate = settings.parseDate($endDateInput);
-					var newStart = new Date(endDate.getTime() + settings.defaultDateDelta * _ONE_DAY);
+					var newStart = new Date(endDate.getTime() - settings.defaultDateDelta * _ONE_DAY);
 					settings.updateDate($startDateInput, newStart);
 				}
 
@@ -205,7 +219,6 @@ requires jQuery 1.7+
 				$self.data('datepair-datedelta', null);
 			}
 
-			_updateEndMintime($self);
 			return;
 		}
 
@@ -223,8 +236,6 @@ requires jQuery 1.7+
 				$self.data('datepair-datedelta', endDate.getTime() - startDate.getTime());
 			}
 		}
-
-		_updateEndMintime($self);
 	}
 
 	function _updateEndMintime($self)
@@ -257,7 +268,7 @@ requires jQuery 1.7+
 					settings.updateTime($endTimeInput, newEnd);
 				} else if ($endTimeInput.val()) {
 					var endTime = settings.parseTime($endTimeInput);
-					var newStart = new Date(endDate.getTime() + settings.defaultTimeDelta);
+					var newStart = new Date(endTime.getTime() - settings.defaultTimeDelta);
 					settings.updateTime($startTimeInput, newStart);
 				}
 
@@ -266,7 +277,6 @@ requires jQuery 1.7+
 				$self.data('datepair-timedelta', null);
 			}
 
-			_updateEndMintime($self);
 			return;
 		}
 
@@ -281,17 +291,39 @@ requires jQuery 1.7+
 
 		if ((endTime.getTime() - startTime.getTime()) * $self.data('datepair-timedelta') < 0) {
 			var $endDateInput = _getEndDateInput($self);
-			var endDate = settings.parseDate($endDateInput);
-			var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
-
-			settings.updateDate($endDateInput, new Date(endDate.getTime() + offset));
-			var newDelta = $self.data('datepair-timedelta') + offset;
-			$self.data('datepair-timedelta', newDelta);
+			if ($endDateInput.val()) {
+				var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
+				var endDate = settings.parseDate($endDateInput);
+				settings.updateDate($endDateInput, new Date(endDate.getTime() + offset));
+				_dateChanged($self, $endDateInput);
+			}
 		}
 
 		$self.data('datepair-timedelta', endTime.getTime() - startTime.getTime());
+	}
+
+	function _validateRanges($self)
+	{
+		var $startTimeInput = _getStartTimeInput($self);
+		var $endTimeInput = _getEndTimeInput($self);
+
+		if ($startTimeInput.length && $endTimeInput.length && $self.data('datepair-timedelta') === null) {
+			$self.trigger('rangeIncomplete');
+			return;
+		}
 
-		_updateEndMintime($self);
+		var $startDateInput = _getStartDateInput($self);
+		var $endDateInput = _getEndDateInput($self);
+		if ($startDateInput.length && $endDateInput.length && $self.data('datepair-datedelta') === null) {
+			$self.trigger('rangeIncomplete');
+			return;
+		}
+
+		if ($self.data('datepair-datedelta') + $self.data('datepair-timedelta') >= 0) {
+			$self.trigger('rangeSelected');
+		} else {
+			$self.trigger('rangeError');
+		}
 	}
 
 

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

@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.4
+jquery-timepicker v1.3.5
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -359,12 +359,18 @@ requires jQuery 1.7+
 		}
 
 		if (settings.noneOption) {
-			var defaultLabel = (settings.useSelect) ? 'Time...' : 'None';
-			var label = (typeof settings.noneOption == 'string') ? settings.noneOption : defaultLabel;
-			if (settings.useSelect) {
-				list.append($('<option value="">'+label+'</option>'));
+			if (settings.noneOption === true) {
+				settings.noneOption = (settings.useSelect) ? 'Time...' : 'None';
+			}
+
+			if ($.isArray(settings.noneOption)) {
+				for (var i in settings.noneOption) {
+					var noneElement = _generateNoneElement(settings.noneOption[i], settings.useSelect);
+					list.append(noneElement);
+				}
 			} else {
-				list.append($('<li>'+label+'</li>'));
+				var noneElement = _generateNoneElement(settings.noneOption, settings.useSelect);
+				list.append(noneElement);
 			}
 		}
 
@@ -493,6 +499,34 @@ requires jQuery 1.7+
 		}
 	}
 
+	function _generateNoneElement(optionValue, useSelect)
+	{
+		var label, className, value;
+
+		if (typeof optionValue == 'object') {
+			label = optionValue.label;
+			className = optionValue.className;
+			value = optionValue.value;
+		} else if (typeof optionValue == 'string') {
+			label = optionValue;
+		} else {
+			$.error('Invalid noneOption value');
+		}
+
+		if (useSelect) {
+			return $('<option />', {
+					'value': value,
+					'class': className,
+					'text': label
+				});
+		} else {
+			return $('<li />', {
+					'class': className,
+					'text': label
+				}).data('time', value);
+		}
+	}
+
 	function _roundTime(time, settings)
 	{
 		if (!$.isNumeric(time)) {
@@ -543,6 +577,9 @@ requires jQuery 1.7+
 		// loop through the menu items
 		list.find('li').each(function(i, obj) {
 			var jObj = $(obj);
+			if (typeof jObj.data('time') != 'number') {
+				return;
+			}
 
 			var offset = jObj.data('time') - value;
 
@@ -842,8 +879,12 @@ requires jQuery 1.7+
 		}
 
 		if (timeValue !== null) {
-			var timeString = _int2time(timeValue, settings.timeFormat);
-			_setTimeValue(self, timeString, 'select');
+			if (typeof timeValue == 'string') {
+				self.val(timeValue);
+			} else {
+				var timeString = _int2time(timeValue, settings.timeFormat);
+				_setTimeValue(self, timeString, 'select');
+			}
 		}
 
 		//self.trigger('change').trigger('selectTime');

metadata

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