jquery-timepicker-rails 1.2.5.0 → 1.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 05a01eddbe0f274448f77ffaa36ada2bc2f75b00
+  data.tar.gz: d52cfce42dfa37d144f673fb90d54c468b870926
+SHA512:
+  metadata.gz: d8021357d8803771eaec9cddb5e42685ba8f340166b0bc7c9c2d0a84b4ac00fca0e2c383b770575b70fa47bd7167dd238a7a152d5a31c233867ef8037ca3920a
+  data.tar.gz: cb87077aac414733be31d7d900de65f2a7819198ecc0e50bcfdc41f52a6163a72a897677b70a8b9b036e9c1b8c08f1a5ea981bb98496725525d211834760b1cb

data/README.md

@@ -27,9 +27,9 @@ Add the following stylesheet file to `app/assets/stylesheets/application.css`:
 
     *= require jquery.timepicker.css
 
-Optionally, you can also use `datepair.js`:
+Optionally, you can also use `jquery.datepair.js`:
 
-    //= require datepair.js
+    //= require jquery.datepair.js
 
 Most people will prefer to copy-paste this file in order to customize it.
 
@@ -39,4 +39,4 @@ jquery-timepicker depends on jQuery and [bootstrap-datepicker](http://github.com
 
 jquery-timepicker is being developed by [Jon Thornton](http://jonthornton.com/) and is under [MIT license](http://en.wikipedia.org/wiki/MIT_License).
 
-This gem is also licensed under [MIT license](https://raw.github.com/tkrotoff/jquery-timepicker-rails/master/LICENSE).
+This gem is also licensed under [MIT license](https://raw.github.com/tkrotoff/jquery-timepicker-rails/master/LICENSE.txt).

data/jquery-timepicker-rails.gemspec

@@ -6,11 +6,11 @@ require 'jquery-timepicker-rails/version'
 Gem::Specification.new do |spec|
   spec.name          = "jquery-timepicker-rails"
   spec.version       = Jquery::Timepicker::Rails::VERSION
-  spec.authors       = ["Tanguy Krotoff (jQuery plugin by Jon Thornton)"]
+  spec.authors       = ["Tanguy Krotoff (jQuery plugin by Jon Thornton)", "Fabio Cantoni"]
   spec.email         = ["tkrotoff@gmail.com"]
   spec.description   = %q{A jQuery timepicker plugin inspired by Google Calendar}
   spec.summary       = %q{jquery-timepicker packaged for the Rails 3.1+ asset pipeline}
-  spec.homepage      = "http://github.com/tkrotoff/jquery-timepicker-rails"
+  spec.homepage      = "https://github.com/cover/jquery-timepicker-rails"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

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

@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.2.5.0"
+      VERSION = "1.3.3"
     end
   end
 end

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

@@ -0,0 +1,305 @@
+/************************
+jquery-datepair v1.2.13
+http://jonthornton.github.com/jquery-datepair/
+
+requires jQuery 1.7+
+************************/
+
+
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD. Register as an anonymous module.
+		define(['jquery'], factory);
+	} else {
+		// Browser globals
+		factory(jQuery);
+	}
+}(function ($) {
+	var _ONE_DAY = 86400000;
+	var _defaults =	{
+		startClass: 'start',
+		endClass: 'end',
+		timeClass: 'time',
+		dateClass: 'date',
+		defaultDateDelta: 0,
+		defaultTimeDelta: 3600000,
+		parseTime: function($input){
+			return $input.timepicker('getTime');
+		},
+		updateTime: function($input, dateObj){
+			$input.timepicker('setTime', dateObj);
+		},
+		parseDate: function($input){
+			return $input.datepicker('getDate');
+		},
+		updateDate: function($input, dateObj){
+			$input.datepicker('update', dateObj);
+		},
+		setMinTime: function($input, dateObj){
+			$input.timepicker('option', 'minTime', dateObj);
+		}
+	};
+
+	var methods =
+	{
+		init: function(options)
+		{
+			return this.each(function()
+			{
+				var $self = $(this);
+
+				var settings = $.extend({}, _defaults);
+
+				if (options) {
+					settings = $.extend(settings, options);
+				}
+
+				settings = _parseSettings(settings);
+
+				$self.data('datepair-settings', settings);
+				_bindChangeHandler($self);
+
+				// initialize datepair-datedelta
+				var $startDateInput = _getStartDateInput($self);
+				var $endDateInput = _getEndDateInput($self);
+
+				if ($startDateInput.val() && $endDateInput.val()) {
+					var startDate = settings.parseDate($startDateInput);
+					var endDate = settings.parseDate($endDateInput);
+					$self.data('datepair-datedelta', endDate.getTime() - startDate.getTime());
+				}
+
+				// initialize datepair-timedelta
+				var $startTimeInput = _getStartTimeInput($self);
+				var $endTimeInput = _getEndTimeInput($self);
+
+				if ($startTimeInput.val() && $endTimeInput.val()) {
+					var startTime = settings.parseTime($startTimeInput);
+					var endTime = settings.parseTime($endTimeInput);
+					$self.data('datepair-timedelta', endTime.getTime() - startTime.getTime());
+				}
+
+				_updateEndMintime($self);
+			});
+		},
+
+		option: function(key, value)
+		{
+			var self = this;
+			var settings = self.data('datepair-settings');
+
+			if (typeof key == 'object') {
+				settings = $.extend(settings, key);
+
+			} else if (typeof key == 'string' && typeof value != 'undefined') {
+				settings[key] = value;
+
+			} else if (typeof key == 'string') {
+				return settings[key];
+			}
+
+			settings = _parseSettings(settings);
+
+			self.data('datepair-settings', settings);
+
+			return self;
+		},
+
+		remove: function()
+		{
+			var self = this;
+			self.removeData('datepair-settings');
+			self.off('.timepicker');
+		}
+	};
+
+	// private methods
+
+	function _parseSettings(settings)
+	{
+		// if (settings.startClass) {
+		// 	settings.minTime = _time2int(settings.minTime);
+		// }
+
+		return settings;
+	}
+
+	function _bindChangeHandler($self)
+	{
+		$self.on('change.datepair', null, _inputChanged);
+	}
+
+	function _unbindChangeHandler($self)
+	{
+		$self.off('change.datepair');
+	}
+
+	function _inputChanged(e)
+	{
+		var $self = $(this);
+
+		// temporarily unbind the change handler to prevent triggering this
+		// if we update other inputs
+		_unbindChangeHandler($self);
+
+		var settings = $self.data('datepair-settings');
+		var $target = $(e.target);
+
+		if ($target.val() != '') {
+			if ($target.hasClass(settings.dateClass)) {
+				_dateChanged($self, $target);
+
+			} else if ($target.hasClass(settings.timeClass)) {
+				_timeChanged($self, $target);
+			}
+		}
+
+		_bindChangeHandler($self);
+	}
+
+	function _getStartDateInput($self)
+	{
+		var settings = $self.data('datepair-settings');
+		return $self.find('.'+settings.startClass+'.'+settings.dateClass);
+	}
+
+	function _getEndDateInput($self)
+	{
+		var settings = $self.data('datepair-settings');
+		return $self.find('.'+settings.endClass+'.'+settings.dateClass);
+	}
+
+	function _getStartTimeInput($self)
+	{
+		var settings = $self.data('datepair-settings');
+		return $self.find('.'+settings.startClass+'.'+settings.timeClass);
+	}
+
+	function _getEndTimeInput($self)
+	{
+		var settings = $self.data('datepair-settings');
+		return $self.find('.'+settings.endClass+'.'+settings.timeClass);
+	}
+
+	function _dateChanged($self, $target)
+	{
+		var settings = $self.data('datepair-settings');
+
+		var $startDateInput = _getStartDateInput($self);
+		var $endDateInput = _getEndDateInput($self);
+
+		if (!$startDateInput.val() || !$endDateInput.val()) {
+			if (settings.defaultDateDelta !== null) {
+				if ($startDateInput.val()) {
+					var startDate = settings.parseDate($startDateInput);
+					var newEnd = new Date(startDate.getTime() + settings.defaultDateDelta * _ONE_DAY);
+					settings.updateDate($endDateInput, newEnd);
+				} else if ($endDateInput.val()) {
+					var endDate = settings.parseDate($endDateInput);
+					var newStart = new Date(endDate.getTime() + settings.defaultDateDelta * _ONE_DAY);
+					settings.updateDate($startDateInput, newStart);
+				}
+
+				$self.data('datepair-datedelta', settings.defaultDateDelta * _ONE_DAY);
+			} else {
+				$self.data('datepair-datedelta', null);
+			}
+
+			_updateEndMintime($self);
+			return;
+		}
+
+		var startDate = settings.parseDate($startDateInput);
+		var endDate = settings.parseDate($endDateInput);
+
+		if ($target.hasClass(settings.startClass)) {
+			var newEndDate = new Date(startDate.getTime()+$self.data('datepair-datedelta'));
+			settings.updateDate($endDateInput, newEndDate);
+		} else if ($target.hasClass(settings.endClass)) {
+			if (endDate < startDate) {
+				$self.data('datepair-datedelta', 0);
+				settings.updateDate($startDateInput, endDate);
+			} else {
+				$self.data('datepair-datedelta', endDate.getTime() - startDate.getTime());
+			}
+		}
+
+		_updateEndMintime($self);
+	}
+
+	function _updateEndMintime($self)
+	{
+		var settings = $self.data('datepair-settings');
+		if (typeof settings.setMinTime != 'function') return;
+
+		var startTime;
+		if ($self.data('datepair-datedelta') <= _ONE_DAY || !$self.data('datepair-datedelta')) {
+			var $startTimeInput = _getStartTimeInput($self);
+			var startTime = settings.parseTime($startTimeInput);
+		}
+
+		var $endTimeInput = _getEndTimeInput($self);
+		settings.setMinTime($endTimeInput, startTime);
+	}
+
+	function _timeChanged($self, $target)
+	{
+		var settings = $self.data('datepair-settings');
+
+		var $startTimeInput = _getStartTimeInput($self);
+		var $endTimeInput = _getEndTimeInput($self);
+
+		if (!$startTimeInput.val() || !$endTimeInput.val()) {
+			if (settings.defaultTimeDelta !== null) {
+				if ($startTimeInput.val()) {
+					var startTime = settings.parseTime($startTimeInput);
+					var newEnd = new Date(startTime.getTime() + settings.defaultTimeDelta);
+					settings.updateTime($endTimeInput, newEnd);
+				} else if ($endTimeInput.val()) {
+					var endTime = settings.parseTime($endTimeInput);
+					var newStart = new Date(endDate.getTime() + settings.defaultTimeDelta);
+					settings.updateTime($startTimeInput, newStart);
+				}
+
+				$self.data('datepair-timedelta', settings.defaultTimeDelta);
+			} else {
+				$self.data('datepair-timedelta', null);
+			}
+
+			_updateEndMintime($self);
+			return;
+		}
+
+		var startTime = settings.parseTime($startTimeInput);
+		var endTime = settings.parseTime($endTimeInput);
+
+		if ($target.hasClass(settings.startClass)) {
+			var newEndTime = new Date(startTime.getTime()+$self.data('datepair-timedelta'));
+			settings.updateTime($endTimeInput, newEndTime);
+			endTime = settings.parseTime($endTimeInput);
+		}
+
+		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);
+		}
+
+		$self.data('datepair-timedelta', endTime.getTime() - startTime.getTime());
+
+		_updateEndMintime($self);
+	}
+
+
+	// Plugin entry
+	$.fn.datepair = function(method)
+	{
+		if(methods[method]) { return methods[method].apply(this, Array.prototype.slice.call(arguments, 1)); }
+		else if(typeof method === "object" || !method) { return methods.init.apply(this, arguments); }
+		else { $.error("Method "+ method + " does not exist on jQuery.datepair"); }
+	};
+}));

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

@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.2.5
+jquery-timepicker v1.3.3
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -28,12 +28,13 @@ requires jQuery 1.7+
 		scrollDefaultNow: false,
 		scrollDefaultTime: false,
 		selectOnBlur: false,
-		disableTouchKeyboard: true,
+		disableTouchKeyboard: false,
 		forceRoundTime: false,
 		appendTo: 'body',
 		disableTimeRanges: [],
 		closeOnWindowScroll: false,
-		disableTextInput: false
+		typeaheadHighlight: true,
+		noneOption: false
 	};
 	var _lang = {
 		decimal: '.',
@@ -50,49 +51,52 @@ requires jQuery 1.7+
 			{
 				var self = $(this);
 
-				// convert dropdowns to text input
-				if (self[0].tagName == 'SELECT') {
-					var attrs = { 'type': 'text', 'value': self.val() };
-					var raw_attrs = self[0].attributes;
-
-					for (var i=0; i < raw_attrs.length; i++) {
-						attrs[raw_attrs[i].nodeName] = raw_attrs[i].nodeValue;
+				// pick up settings from data attributes
+				var attributeOptions = [];
+				for (key in _defaults) {
+					if (self.data(key))  {
+						attributeOptions[key] = self.data(key);
 					}
-
-					var input = $('<input />', attrs);
-					self.replaceWith(input);
-					self = input;
 				}
 
-				var settings = $.extend({}, _defaults);
-
-				if (options) {
-					settings = $.extend(settings, options);
-				}
+				var settings = $.extend({}, _defaults, attributeOptions, options);
 
 				if (settings.lang) {
 					_lang = $.extend(_lang, settings.lang);
 				}
 
 				settings = _parseSettings(settings);
-
 				self.data('timepicker-settings', settings);
-				self.prop('autocomplete', 'off');
-				self.on('click.timepicker focus.timepicker', methods.show);
-				self.on('change.timepicker', _formatValue);
-				self.on('keydown.timepicker', _keydownhandler);
-				self.on('keyup.timepicker', _keyuphandler);
 				self.addClass('ui-timepicker-input');
 
-				_formatValue.call(self.get(0));
+				if (settings.useSelect) {
+					_render(self);
+				} else {
+					self.prop('autocomplete', 'off');
+					self.on('click.timepicker focus.timepicker', methods.show);
+					self.on('change.timepicker', _formatValue);
+					self.on('keydown.timepicker', _keydownhandler);
+					self.on('keyup.timepicker', _keyuphandler);
+
+					_formatValue.call(self.get(0));
+				}
 			});
 		},
 
 		show: function(e)
 		{
+			if (e) {
+				e.preventDefault();
+			}
+
 			var self = $(this);
 			var settings = self.data('timepicker-settings');
 
+			if (settings.useSelect) {
+				self.data('timepicker-list').focus();
+				return;
+			}
+
 			if (_hideKeyboard(self)) {
 				// block the keyboard on mobile devices
 				self.blur();
@@ -154,13 +158,26 @@ requires jQuery 1.7+
 				list.scrollTop(0);
 			}
 
-			_attachCloseHandler(settings);
+			// attach close handlers
+			$(document).on('touchstart.ui-timepicker mousedown.ui-timepicker', _closeHandler);
+			if (settings.closeOnWindowScroll) {
+				$(document).on('scroll.ui-timepicker', _closeHandler);
+			}
 
 			self.trigger('showTimepicker');
+
+			return this;
 		},
 
 		hide: function(e)
 		{
+			var self = $(this);
+			var settings = self.data('timepicker-settings');
+
+			if (settings && settings.useSelect) {
+				self.blur();
+			}
+
 			$('.ui-timepicker-wrapper:visible').each(function() {
 				var list = $(this);
 				var self = list.data('timepicker-input');
@@ -173,6 +190,8 @@ requires jQuery 1.7+
 				list.hide();
 				self.trigger('hideTimepicker');
 			});
+
+			return this;
 		},
 
 		option: function(key, value)
@@ -200,7 +219,11 @@ requires jQuery 1.7+
 				self.data('timepicker-list', false);
 			}
 
-			return self;
+			if (settings.useSelect) {
+				_render(self);
+			}
+
+			return this;
 		},
 
 		getSecondsFromMidnight: function()
@@ -211,12 +234,18 @@ requires jQuery 1.7+
 		getTime: function(relative_date)
 		{
 			var self = this;
+
+			var time_string = _getTimeValue(self);
+			if (!time_string) {
+				return null;
+			}
+
 			if (!relative_date) {
 				relative_date = new Date();
 			}
 
 			relative_date.setHours(0, 0, 0, 0);
-			return new Date(relative_date.valueOf() + (_time2int(_getTimeValue(self))*1000));
+			return new Date(relative_date.valueOf() + (_time2int(time_string)*1000));
 		},
 
 		setTime: function(value)
@@ -228,6 +257,8 @@ requires jQuery 1.7+
 			if (self.data('timepicker-list')) {
 				_setSelected(self, self.data('timepicker-list'));
 			}
+
+			return this;
 		},
 
 		remove: function()
@@ -250,6 +281,8 @@ requires jQuery 1.7+
 			}
 
 			self.removeData('timepicker-list');
+
+			return this;
 		}
 	};
 
@@ -282,6 +315,17 @@ requires jQuery 1.7+
 			settings.disableTimeRanges = settings.disableTimeRanges.sort(function(a, b){
 				return a[0] - b[0];
 			});
+
+			// merge any overlapping ranges
+			for (var i = settings.disableTimeRanges.length-1; i > 0; i--) {
+				if (settings.disableTimeRanges[i][0] <= settings.disableTimeRanges[i-1][1]) {
+					settings.disableTimeRanges[i-1] = [
+						Math.min(settings.disableTimeRanges[i][0], settings.disableTimeRanges[i-1][0]),
+						Math.max(settings.disableTimeRanges[i][1], settings.disableTimeRanges[i-1][1])
+					];
+					settings.disableTimeRanges.splice(i, 1);
+				}
+			}
 		}
 
 		return settings;
@@ -297,11 +341,25 @@ requires jQuery 1.7+
 			self.data('timepicker-list', false);
 		}
 
-		list = $('<ul />', { 'class': 'ui-timepicker-list' });
+		if (settings.useSelect) {
+			list = $('<select />', { 'class': 'ui-timepicker-select' });
+			var wrapped_list = list;
+		} else {
+			list = $('<ul />', { 'class': 'ui-timepicker-list' });
 
-		var wrapped_list = $('<div />', { 'class': 'ui-timepicker-wrapper', 'tabindex': -1 });
-		wrapped_list.css({'display':'none', 'position': 'absolute' }).append(list);
+			var wrapped_list = $('<div />', { 'class': 'ui-timepicker-wrapper', 'tabindex': -1 });
+			wrapped_list.css({'display':'none', 'position': 'absolute' }).append(list);
+		}
 
+		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>'));
+			} else {
+				list.append($('<li>'+label+'</li>'));
+			}
+		}
 
 		if (settings.className) {
 			wrapped_list.addClass(settings.className);
@@ -325,22 +383,37 @@ requires jQuery 1.7+
 			end += _ONE_DAY;
 		}
 
+		if (end === _ONE_DAY-1 && settings.timeFormat.indexOf('H') !== -1) {
+			// show a 24:00 option when using military time
+			end = _ONE_DAY;
+		}
+
 		var dr = settings.disableTimeRanges;
 		var drCur = 0;
 		var drLen = dr.length;
 
 		for (var i=start; i <= end; i += settings.step*60) {
-			var timeInt = i%_ONE_DAY;
+			var timeInt = i;
+			var timeString = _int2time(timeInt, settings.timeFormat);
 
-			var row = $('<li />');
-			row.data('time', timeInt);
-			row.text(_int2time(timeInt, settings.timeFormat));
+			if (settings.useSelect) {
+				var row = $('<option />', { 'value': timeString });
+				row.text(timeString);
+			} else {
+				var row = $('<li />');
+				row.data('time', (timeInt <= 86400 ? timeInt : timeInt % 86400));
+				row.text(timeString);
+			}
 
 			if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
-				var duration = $('<span />');
-				duration.addClass('ui-timepicker-duration');
-				duration.text(' ('+_int2duration(i - durStart)+')');
-				row.append(duration);
+				var durationString = _int2duration(i - durStart);
+				if (settings.useSelect) {
+					row.text(row.text()+' ('+durationString+')');
+				} else {
+					var duration = $('<span />', { 'class': 'ui-timepicker-duration' });
+					duration.text(' ('+durationString+')');
+					row.append(duration);
+				}
 			}
 
 			if (drCur < drLen) {
@@ -349,7 +422,11 @@ requires jQuery 1.7+
 				}
 
 				if (dr[drCur] && timeInt >= dr[drCur][0] && timeInt < dr[drCur][1]) {
-					row.addClass('ui-timepicker-disabled');
+					if (settings.useSelect) {
+						row.prop('disabled', true);
+					} else {
+						row.addClass('ui-timepicker-disabled');
+					}
 				}
 			}
 
@@ -359,58 +436,76 @@ requires jQuery 1.7+
 		wrapped_list.data('timepicker-input', self);
 		self.data('timepicker-list', wrapped_list);
 
-		var appendTo = settings.appendTo;
-		if (typeof appendTo === 'string') {
-			appendTo = $(appendTo);
-		} else if (typeof appendTo === 'function') {
-			appendTo = appendTo(self);
-		}
-		appendTo.append(wrapped_list);
-		_setSelected(self, list);
-
-		list.on('click', 'li', function(e) {
-
-			// hack: temporarily disable the focus handler
-			// to deal with the fact that IE fires 'focus'
-			// events asynchronously
-			self.off('focus.timepicker');
-			self.on('focus.timepicker-ie-hack', function(){
-				self.off('focus.timepicker-ie-hack');
-				self.on('focus.timepicker', methods.show);
+		if (settings.useSelect) {
+			list.val(_roundTime(self.val(), settings));
+			list.on('focus', function(){
+				$(this).data('timepicker-input').trigger('showTimepicker');
+			});
+			list.on('blur', function(){
+				$(this).data('timepicker-input').trigger('hideTimepicker');
+			});
+			list.on('change', function(){
+				_setTimeValue(self, $(this).val(), 'select');
 			});
 
-			if (!_hideKeyboard(self)) {
-				self[0].focus();
+			self.hide().after(list);
+		} else {
+			var appendTo = settings.appendTo;
+			if (typeof appendTo === 'string') {
+				appendTo = $(appendTo);
+			} else if (typeof appendTo === 'function') {
+				appendTo = appendTo(self);
 			}
+			appendTo.append(wrapped_list);
+			_setSelected(self, list);
 
-			// make sure only the clicked row is selected
-			list.find('li').removeClass('ui-timepicker-selected');
-			$(this).addClass('ui-timepicker-selected');
+			list.on('click', 'li', function(e) {
 
-			if (_selectValue(self)) {
-				self.trigger('hideTimepicker');
-				wrapped_list.hide();
-			}
-		});
-	}
+				// hack: temporarily disable the focus handler
+				// to deal with the fact that IE fires 'focus'
+				// events asynchronously
+				self.off('focus.timepicker');
+				self.on('focus.timepicker-ie-hack', function(){
+					self.off('focus.timepicker-ie-hack');
+					self.on('focus.timepicker', methods.show);
+				});
 
-	function _generateBaseDate()
-	{
-		return new Date(1970, 1, 1, 0, 0, 0);
+				if (!_hideKeyboard(self)) {
+					self[0].focus();
+				}
+
+				// make sure only the clicked row is selected
+				list.find('li').removeClass('ui-timepicker-selected');
+				$(this).addClass('ui-timepicker-selected');
+
+				if (_selectValue(self)) {
+					self.trigger('hideTimepicker');
+					wrapped_list.hide();
+				}
+			});
+		}
 	}
 
-	function _attachCloseHandler(settings)
+	function _roundTime(time, settings)
 	{
-		if ('ontouchstart' in document) {
-			$('body').on('touchstart.ui-timepicker', _closeHandler);
+		if (!$.isNumeric(time)) {
+			time = _time2int(time);
+		}
+
+		if (time === null) {
+			return null;
 		} else {
-			$('body').on('mousedown.ui-timepicker', _closeHandler);
-			if (settings.closeOnWindowScroll) {
-				$(window).on('scroll.ui-timepicker', _closeHandler);
-			}
+			var step = settings.step*60;
+			// round to the nearest step
+			return _int2time(Math.round(time / step) * step, settings.timeFormat);
 		}
 	}
 
+	function _generateBaseDate()
+	{
+		return new Date(1970, 1, 1, 0, 0, 0);
+	}
+
 	// event handler to decide whether to close timepicker
 	function _closeHandler(e)
 	{
@@ -418,8 +513,7 @@ requires jQuery 1.7+
 		var input = target.closest('.ui-timepicker-input');
 		if (input.length === 0 && target.closest('.ui-timepicker-wrapper').length === 0) {
 			methods.hide();
-			$('body').unbind('.ui-timepicker');
-			$(window).unbind('.ui-timepicker');
+			$(document).unbind('.ui-timepicker');
 		}
 	}
 
@@ -550,12 +644,17 @@ requires jQuery 1.7+
 
 	function _setTimeValue(self, value, source)
 	{
-		if (self.data('ui-timepicker-value') != value) {
-			self.data('ui-timepicker-value', value);
-			if (self.is('input')) {
-				self.val(value);
+		if (self.is('input')) {
+			self.val(value);
+
+			var settings = self.data('timepicker-settings');
+			if (settings.useSelect) {
+				self.data('timepicker-list').val(_roundTime(value, settings));
 			}
+		}
 
+		if (self.data('ui-timepicker-value') != value) {
+			self.data('ui-timepicker-value', value);
 			if (source == 'select') {
 				self.trigger('selectTime').trigger('changeTime').trigger('change');
 			} else if (source != 'error') {
@@ -583,7 +682,7 @@ requires jQuery 1.7+
 					self.focus();
 				}
 			} else {
-				return _screenInput(e, self);
+				return true;
 			}
 		}
 
@@ -653,15 +752,10 @@ requires jQuery 1.7+
 				break;
 
 			default:
-				return _screenInput(e, self);
+				return true;
 		}
 	}
 
-	function _screenInput(e, self)
-	{
-		return !self.data('timepicker-settings').disableTextInput || e.ctrlKey || e.altKey || e.metaKey || (e.keyCode != 2 && e.keyCode < 46);
-	}
-
 	/*
 	*	Time typeahead
 	*/
@@ -674,6 +768,11 @@ requires jQuery 1.7+
 			return true;
 		}
 
+		if (!self.data('timepicker-settings').typeaheadHighlight) {
+			list.find('li').removeClass('ui-timepicker-selected');
+			return true;
+		}
+
 		switch (e.keyCode) {
 
 			case 96: // numpad numerals
@@ -769,6 +868,11 @@ requires jQuery 1.7+
 		}
 
 		var time = new Date(_baseDate.valueOf() + (seconds*1000));
+
+		if (isNaN(time.getTime())) {
+			return;
+		}
+
 		var output = '';
 		var hour, code;
 
@@ -806,6 +910,7 @@ requires jQuery 1.7+
 
 				case 'H':
 					hour = time.getHours();
+					if (seconds === _ONE_DAY) hour = 24;
 					output += (hour > 9) ? hour : '0'+hour;
 					break;
 
@@ -883,7 +988,14 @@ requires jQuery 1.7+
 	// Plugin entry
 	$.fn.timepicker = function(method)
 	{
-		if(methods[method]) { return methods[method].apply(this, Array.prototype.slice.call(arguments, 1)); }
+		if (!this.length) return this;
+		if (methods[method]) {
+			// check if this element is a timepicker
+			if (!this.hasClass('ui-timepicker-input')) {
+				return this;
+			}
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		}
 		else if(typeof method === "object" || !method) { return methods.init.apply(this, arguments); }
 		else { $.error("Method "+ method + " does not exist on jQuery.timepicker"); }
 	};

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

@@ -1,67 +1,67 @@
-.ui-timepicker-wrapper {
-	overflow-y: auto;
-	height: 150px;
-	width: 6.5em;
-	background: #fff;
-	border: 1px solid #ddd;
-	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	outline: none;
-	z-index: 10001;
-	margin: 0;
-}
-
-.ui-timepicker-wrapper.ui-timepicker-with-duration {
-	width: 11em;
-}
-
-.ui-timepicker-list {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.ui-timepicker-duration {
-	margin-left: 5px; color: #888;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-duration {
-	color: #888;
-}
-
-.ui-timepicker-list li {
-	padding: 3px 0 3px 5px;
-	cursor: pointer;
-	white-space: nowrap;
-	color: #000;
-	list-style: none;
-	margin: 0;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-selected {
-	background: #fff; color: #000;
-}
-
-li.ui-timepicker-selected,
-.ui-timepicker-list li:hover,
-.ui-timepicker-list .ui-timepicker-selected:hover {
-	background: #1980EC; color: #fff;
-}
-
-li.ui-timepicker-selected .ui-timepicker-duration,
-.ui-timepicker-list li:hover .ui-timepicker-duration {
-	color: #ccc;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled,
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	color: #888;
-	cursor: default;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	background: #f2f2f2;
-}
+.ui-timepicker-wrapper {
+	overflow-y: auto;
+	height: 150px;
+	width: 6.5em;
+	background: #fff;
+	border: 1px solid #ddd;
+	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	outline: none;
+	z-index: 10001;
+	margin: 0;
+}
+
+.ui-timepicker-wrapper.ui-timepicker-with-duration {
+	width: 11em;
+}
+
+.ui-timepicker-list {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.ui-timepicker-duration {
+	margin-left: 5px; color: #888;
+}
+
+.ui-timepicker-list:hover .ui-timepicker-duration {
+	color: #888;
+}
+
+.ui-timepicker-list li {
+	padding: 3px 0 3px 5px;
+	cursor: pointer;
+	white-space: nowrap;
+	color: #000;
+	list-style: none;
+	margin: 0;
+}
+
+.ui-timepicker-list:hover .ui-timepicker-selected {
+	background: #fff; color: #000;
+}
+
+li.ui-timepicker-selected,
+.ui-timepicker-list li:hover,
+.ui-timepicker-list .ui-timepicker-selected:hover {
+	background: #1980EC; color: #fff;
+}
+
+li.ui-timepicker-selected .ui-timepicker-duration,
+.ui-timepicker-list li:hover .ui-timepicker-duration {
+	color: #ccc;
+}
+
+.ui-timepicker-list li.ui-timepicker-disabled,
+.ui-timepicker-list li.ui-timepicker-disabled:hover,
+.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
+	color: #888;
+	cursor: default;
+}
+
+.ui-timepicker-list li.ui-timepicker-disabled:hover,
+.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
+	background: #f2f2f2;
+}

metadata

@@ -1,62 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: jquery-timepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.5.0
-  prerelease: 
+  version: 1.3.3
 platform: ruby
 authors:
 - Tanguy Krotoff (jQuery plugin by Jon Thornton)
+- Fabio Cantoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A jQuery timepicker plugin inspired by Google Calendar
@@ -66,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -74,32 +68,31 @@ files:
 - jquery-timepicker-rails.gemspec
 - lib/jquery-timepicker-rails.rb
 - lib/jquery-timepicker-rails/version.rb
-- vendor/assets/javascripts/datepair.js
+- vendor/assets/javascripts/jquery.datepair.js
 - vendor/assets/javascripts/jquery.timepicker.js
 - vendor/assets/stylesheets/jquery.timepicker.css
-homepage: http://github.com/tkrotoff/jquery-timepicker-rails
+homepage: https://github.com/cover/jquery-timepicker-rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: jquery-timepicker packaged for the Rails 3.1+ asset pipeline
 test_files: []

data/vendor/assets/javascripts/datepair.js

@@ -1,226 +0,0 @@
-$(function() {
-	var DATEPICKER_FORMAT = 'yyyy-m-d';
-	var TIMEPICKER_FORMAT = 'g:ia';
-	var DATE_FORMAT = 'Y-n-j'; // for this format see http://php.net/manual/function.date.php
-
-	$('.datepair input.date').each(function(){
-		var $this = $(this);
-
-		$this.datepicker({
-			'format': DATEPICKER_FORMAT,
-			'autoclose': true
-		});
-
-		if ($this.hasClass('start') || $this.hasClass('end')) {
-			$this.on('changeDate change', doDatepair);
-		}
-
-	});
-
-	$('.datepair input.time').each(function() {
-		var $this = $(this);
-		
-		$this.timepicker({
-			'showDuration': true,
-			'timeFormat': TIMEPICKER_FORMAT,
-			'scrollDefaultNow': true
-		});
-
-		if ($this.hasClass('start') || $this.hasClass('end')) {
-			$this.on('changeTime change', doDatepair);
-		}
-		
-		if ($this.hasClass('end')) {
-			$this.on('focus', function(){$('.ui-timepicker-with-duration').scrollTop(0);});
-		}		
-
-	});
-
-	$('.datepair').each(initDatepair);
-
-	function initDatepair()
-	{
-		var container = $(this);
-
-		var startDateInput = container.find('input.start.date');
-		var endDateInput = container.find('input.end.date');
-		var dateDelta = 0;
-
-		if (startDateInput.length && endDateInput.length) {
-			var startDate = parseDate(startDateInput.val(), DATEPICKER_FORMAT);
-			var endDate =  parseDate(endDateInput.val(), DATEPICKER_FORMAT);
-
-			dateDelta = endDate.getTime() - startDate.getTime();
-			container.data('dateDelta', dateDelta);
-		}
-
-		var startTimeInput = container.find('input.start.time');
-		var endTimeInput = container.find('input.end.time');
-
-		if (startTimeInput.length && endTimeInput.length) {
-			var startInt = startTimeInput.timepicker('getSecondsFromMidnight');
-			var endInt = endTimeInput.timepicker('getSecondsFromMidnight');
-
-			container.data('timeDelta', endInt - startInt);
-
-			if (dateDelta < 86400000) {
-				endTimeInput.timepicker('option', 'minTime', startInt);
-			}
-		}
-	}
-
-	function doDatepair()
-	{
-		var target = $(this);
-		if (target.val() == '') {
-			return;
-		}
-
-		var container = target.closest('.datepair');
-
-		if (target.hasClass('date')) {
-			updateDatePair(target, container);
-
-		} else if (target.hasClass('time')) {
-			updateTimePair(target, container);
-		}
-	}
-
-	function updateDatePair(target, container)
-	{
-		var start = container.find('input.start.date');
-		var end = container.find('input.end.date');
-		if (!start.length || !end.length) {
-			return;
-		}
-
-		var startDate = parseDate(start.val(), DATEPICKER_FORMAT);
-		var endDate =  parseDate(end.val(), DATEPICKER_FORMAT);
-
-		var oldDelta = container.data('dateDelta');
-
-		if (!isNaN(oldDelta) && oldDelta !== null && target.hasClass('start')) {
-			var newEnd = new Date(startDate.getTime()+oldDelta);
-			end.val(newEnd.format(DATE_FORMAT));
-			end.datepicker('update');
-			return;
-
-		} else {
-			var newDelta = endDate.getTime() - startDate.getTime();
-
-			if (newDelta < 0) {
-				newDelta = 0;
-
-				if (target.hasClass('start')) {
-					end.val(start.val());
-					end.datepicker('update');
-				} else if (target.hasClass('end')) {
-					start.val(end.val());
-					start.datepicker('update');
-				}
-			}
-
-			if (newDelta < 86400000) {
-				var startTimeVal = container.find('input.start.time').val();
-
-				if (startTimeVal) {
-					container.find('input.end.time').timepicker('option', {'minTime': startTimeVal});
-				}
-			} else {
-				container.find('input.end.time').timepicker('option', {'minTime': null});
-			}
-
-			container.data('dateDelta', newDelta);
-		}
-	}
-
-	function updateTimePair(target, container)
-	{
-		var start = container.find('input.start.time');
-		var end = container.find('input.end.time');
-
-		if (!start.length) {
-			return;
-		}
-
-		var startInt = start.timepicker('getSecondsFromMidnight');
-		var dateDelta = container.data('dateDelta');
-
-		if (target.hasClass('start') && (!dateDelta || dateDelta < 86400000)) {
-			end.timepicker('option', 'minTime', startInt);
-		}
-
-		if (!end.length) {
-			return;
-		}
-
-		var endInt = end.timepicker('getSecondsFromMidnight');
-		var oldDelta = container.data('timeDelta');
-
-		var endDateAdvance = 0;
-		var newDelta;
-
-		if (oldDelta && target.hasClass('start')) {
-			// lock the duration and advance the end time
-
-			var newEnd = (startInt+oldDelta)%86400;
-
-			if (newEnd < 0) {
-				newEnd += 86400;
-			}
-
-			end.timepicker('setTime', newEnd);
-			newDelta = newEnd - startInt;
-		} else if (startInt !== null && endInt !== null) {
-			newDelta = endInt - startInt;
-		} else {
-			return;
-		}
-
-		container.data('timeDelta', newDelta);
-
-		if (newDelta < 0 && (!oldDelta || oldDelta > 0)) {
-			// overnight time span. advance the end date 1 day
-			endDateAdvance = 86400000;
-
-		} else if (newDelta > 0 && oldDelta < 0) {
-			// switching from overnight to same-day time span. decrease the end date 1 day
-			endDateAdvance = -86400000;
-		}
-
-		var startInput = container.find('.start.date');
-		var endInput = container.find('.end.date');
-
-		if (startInput.val() && !endInput.val()) {
-			endInput.val(startInput.val());
-			endInput.datepicker('update');
-			dateDelta = 0;
-			container.data('dateDelta', 0);
-		}
-
-		if (endDateAdvance != 0) {
-			if (dateDelta || dateDelta === 0) {
-				var endDate =  parseDate(endInput.val(), DATEPICKER_FORMAT);
-				var newEnd = new Date(endDate.getTime() + endDateAdvance);
-				endInput.val(newEnd.format(DATE_FORMAT));
-				endInput.datepicker('update');
-				container.data('dateDelta', dateDelta + endDateAdvance);
-			}
-		}
-	}
-});
-
-function parseDate(input, format) {
-	if (input == '')
-		return new Date('');
-
-	format = format || 'yyyy-mm-dd'; // default format
-	var parts = input.match(/(\d+)/g), i = 0, fmt = {};
-	// extract date-part indexes from the format
-	format.replace(/(yyyy|dd?|mm?)/g, function(part) { fmt[part] = i++; });
-
-	return new Date(parts[fmt['yyyy']], parts[fmt['mm'] == undefined ? fmt['m'] : fmt['mm']]-1, parts[fmt['dd'] == undefined ? fmt['d'] : fmt['dd']]);
-}
-
-// Simulates PHP's date function
-Date.prototype.format=function(format){var returnStr='';var replace=Date.replaceChars;for(var i=0;i<format.length;i++){var curChar=format.charAt(i);if(replace[curChar]){returnStr+=replace[curChar].call(this);}else{returnStr+=curChar;}}return returnStr;};Date.replaceChars={shortMonths:['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],longMonths:['January','February','March','April','May','June','July','August','September','October','November','December'],shortDays:['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],longDays:['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],d:function(){return(this.getDate()<10?'0':'')+this.getDate();},D:function(){return Date.replaceChars.shortDays[this.getDay()];},j:function(){return this.getDate();},l:function(){return Date.replaceChars.longDays[this.getDay()];},N:function(){return this.getDay()+1;},S:function(){return(this.getDate()%10==1&&this.getDate()!=11?'st':(this.getDate()%10==2&&this.getDate()!=12?'nd':(this.getDate()%10==3&&this.getDate()!=13?'rd':'th')));},w:function(){return this.getDay();},z:function(){return"Not Yet Supported";},W:function(){return"Not Yet Supported";},F:function(){return Date.replaceChars.longMonths[this.getMonth()];},m:function(){return(this.getMonth()<9?'0':'')+(this.getMonth()+1);},M:function(){return Date.replaceChars.shortMonths[this.getMonth()];},n:function(){return this.getMonth()+1;},t:function(){return"Not Yet Supported";},L:function(){return(((this.getFullYear()%4==0)&&(this.getFullYear()%100!=0))||(this.getFullYear()%400==0))?'1':'0';},o:function(){return"Not Supported";},Y:function(){return this.getFullYear();},y:function(){return(''+this.getFullYear()).substr(2);},a:function(){return this.getHours()<12?'am':'pm';},A:function(){return this.getHours()<12?'AM':'PM';},B:function(){return"Not Yet Supported";},g:function(){return this.getHours()%12||12;},G:function(){return this.getHours();},h:function(){return((this.getHours()%12||12)<10?'0':'')+(this.getHours()%12||12);},H:function(){return(this.getHours()<10?'0':'')+this.getHours();},i:function(){return(this.getMinutes()<10?'0':'')+this.getMinutes();},s:function(){return(this.getSeconds()<10?'0':'')+this.getSeconds();},e:function(){return"Not Yet Supported";},I:function(){return"Not Supported";},O:function(){return(-this.getTimezoneOffset()<0?'-':'+')+(Math.abs(this.getTimezoneOffset()/60)<10?'0':'')+(Math.abs(this.getTimezoneOffset()/60))+'00';},P:function(){return(-this.getTimezoneOffset()<0?'-':'+')+(Math.abs(this.getTimezoneOffset()/60)<10?'0':'')+(Math.abs(this.getTimezoneOffset()/60))+':'+(Math.abs(this.getTimezoneOffset()%60)<10?'0':'')+(Math.abs(this.getTimezoneOffset()%60));},T:function(){var m=this.getMonth();this.setMonth(0);var result=this.toTimeString().replace(/^.+ \(?([^\)]+)\)?$/,'$1');this.setMonth(m);return result;},Z:function(){return-this.getTimezoneOffset()*60;},c:function(){return this.format("Y-m-d")+"T"+this.format("H:i:sP");},r:function(){return this.toString();},U:function(){return this.getTime()/1000;}};