jquery-timepicker-rails 1.1.0.0 → 1.2.2.0

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

@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.1.0.0"
+      VERSION = "1.2.2.0"
     end
   end
 end

data/vendor/assets/javascripts/datepair.js

@@ -1,10 +1,11 @@
 $(function() {
-
-	var DATE_FORMAT = 'Y-m-d';
 	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
@@ -18,13 +19,21 @@ $(function() {
 
 	$('.datepair input.time').each(function() {
 		var $this = $(this);
-		var opts = { 'showDuration': true, 'timeFormat': 'g:ia', 'scrollDefaultNow': true };
+		
+		$this.timepicker({
+			'showDuration': true,
+			'timeFormat': TIMEPICKER_FORMAT,
+			'scrollDefaultNow': true
+		});
 
 		if ($this.hasClass('start') || $this.hasClass('end')) {
-			opts.onSelect = doDatepair;
+			$this.on('changeTime change', doDatepair);
 		}
+		
+		if ($this.hasClass('end')) {
+			$this.on('focus', function(){$('.ui-timepicker-with-duration').scrollTop(0);});
+		}		
 
-		$this.timepicker(opts);
 	});
 
 	$('.datepair').each(initDatepair);
@@ -38,11 +47,10 @@ $(function() {
 		var dateDelta = 0;
 
 		if (startDateInput.length && endDateInput.length) {
-			var startDate = new Date(startDateInput.val());
-			var endDate =  new Date(endDateInput.val());
+			var startDate = parseDate(startDateInput.val(), DATEPICKER_FORMAT);
+			var endDate =  parseDate(endDateInput.val(), DATEPICKER_FORMAT);
 
 			dateDelta = endDate.getTime() - startDate.getTime();
-
 			container.data('dateDelta', dateDelta);
 		}
 
@@ -82,17 +90,16 @@ $(function() {
 	{
 		var start = container.find('input.start.date');
 		var end = container.find('input.end.date');
-
 		if (!start.length || !end.length) {
 			return;
 		}
 
-		var startDate = new Date(start.val());
-		var endDate =  new Date(end.val());
+		var startDate = parseDate(start.val(), DATEPICKER_FORMAT);
+		var endDate =  parseDate(end.val(), DATEPICKER_FORMAT);
 
 		var oldDelta = container.data('dateDelta');
 
-		if (oldDelta && target.hasClass('start')) {
+		if (!isNaN(oldDelta) && oldDelta !== null && target.hasClass('start')) {
 			var newEnd = new Date(startDate.getTime()+oldDelta);
 			end.val(newEnd.format(DATE_FORMAT));
 			end.datepicker('update');
@@ -132,20 +139,24 @@ $(function() {
 		var start = container.find('input.start.time');
 		var end = container.find('input.end.time');
 
-		if (!start.length || !end.length) {
+		if (!start.length) {
 			return;
 		}
 
 		var startInt = start.timepicker('getSecondsFromMidnight');
-		var endInt = end.timepicker('getSecondsFromMidnight');
-
-		var oldDelta = container.data('timeDelta');
 		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;
 
@@ -170,11 +181,11 @@ $(function() {
 
 		if (newDelta < 0 && (!oldDelta || oldDelta > 0)) {
 			// overnight time span. advance the end date 1 day
-			var endDateAdvance = 86400000;
+			endDateAdvance = 86400000;
 
 		} else if (newDelta > 0 && oldDelta < 0) {
 			// switching from overnight to same-day time span. decrease the end date 1 day
-			var endDateAdvance = -86400000;
+			endDateAdvance = -86400000;
 		}
 
 		var startInput = container.find('.start.date');
@@ -189,7 +200,7 @@ $(function() {
 
 		if (endDateAdvance != 0) {
 			if (dateDelta || dateDelta === 0) {
-				var endDate =  new Date(endInput.val());
+				var endDate =  parseDate(endInput.val(), DATEPICKER_FORMAT);
 				var newEnd = new Date(endDate.getTime() + endDateAdvance);
 				endInput.val(newEnd.format(DATE_FORMAT));
 				endInput.datepicker('update');
@@ -199,5 +210,17 @@ $(function() {
 	}
 });
 
+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;}};
+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;}};

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

@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.1
+jquery-timepicker v1.2.2
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -7,13 +7,13 @@ 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);
-    }
+	if (typeof define === 'function' && define.amd) {
+		// AMD. Register as an anonymous module.
+		define(['jquery'], factory);
+	} else {
+		// Browser globals
+		factory(jQuery);
+	}
 }(function ($) {
 	var _baseDate = _generateBaseDate();
 	var _ONE_DAY = 86400;
@@ -32,7 +32,8 @@ requires jQuery 1.7+
 		forceRoundTime: false,
 		appendTo: 'body',
 		disableTimeRanges: [],
-		closeOnWindowScroll: true
+		closeOnWindowScroll: false,
+		disableTextInput: false
 	};
 	var _lang = {
 		decimal: '.',
@@ -78,8 +79,9 @@ requires jQuery 1.7+
 				self.data('timepicker-settings', settings);
 				self.prop('autocomplete', 'off');
 				self.on('click.timepicker focus.timepicker', methods.show);
-				self.on('blur.timepicker', _formatValue);
-				self.on('keydown.timepicker', _keyhandler);
+				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));
@@ -91,7 +93,7 @@ requires jQuery 1.7+
 			var self = $(this);
 			var settings = self.data('timepicker-settings');
 
-			if ('ontouchstart' in document && settings.disableTouchKeyboard) {
+			if (_hideKeyboard(self)) {
 				// block the keyboard on mobile devices
 				self.blur();
 			}
@@ -104,18 +106,11 @@ requires jQuery 1.7+
 			}
 
 			// check if list needs to be rendered
-			if (!list || list.length === 0) {
+			if (!list || list.length === 0 || typeof settings.durationTime === 'function') {
 				_render(self);
 				list = self.data('timepicker-list');
 			}
 
-			// check if a flag was set to close this picker
-			if (self.hasClass('ui-timepicker-hideme')) {
-				self.removeClass('ui-timepicker-hideme');
-				list.hide();
-				return;
-			}
-
 			if (list.is(':visible')) {
 				return;
 			}
@@ -127,23 +122,29 @@ requires jQuery 1.7+
 
 			if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
 				// position the dropdown on top
-				list.offset({ 'left':(self.offset().left), 'top': self.offset().top - list.outerHeight() });
+				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)
+				});
 			} else {
 				// put it under the input
-				list.offset({ 'left':(self.offset().left), 'top': self.offset().top + self.outerHeight() });
+				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)
+				});
 			}
 
 			// position scrolling
 			var selected = list.find('.ui-timepicker-selected');
 
 			if (!selected.length) {
-                if (self.val()) {
-                    selected = _findRow(self, list, _time2int(self.val()));
-                } else if (settings.scrollDefaultNow) {
-                    selected = _findRow(self, list, _time2int(new Date()));
-                } else if (settings.scrollDefaultTime !== false) {
-                    selected = _findRow(self, list, _time2int(settings.scrollDefaultTime));
-                }
+				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));
+				}
 			}
 
 			if (selected && selected.length) {
@@ -160,7 +161,7 @@ requires jQuery 1.7+
 
 		hide: function(e)
 		{
-			$('.ui-timepicker-list:visible').each(function() {
+			$('.ui-timepicker-wrapper:visible').each(function() {
 				var list = $(this);
 				var self = list.data('timepicker-input');
 				var settings = self.data('timepicker-settings');
@@ -176,7 +177,7 @@ requires jQuery 1.7+
 
 		option: function(key, value)
 		{
-			var self = $(this);
+			var self = this;
 			var settings = self.data('timepicker-settings');
 			var list = self.data('timepicker-list');
 
@@ -199,30 +200,32 @@ requires jQuery 1.7+
 				self.data('timepicker-list', false);
 			}
 
+			return self;
 		},
 
 		getSecondsFromMidnight: function()
 		{
-			return _time2int($(this).val());
+			return _time2int(_getTimeValue(this));
 		},
 
 		getTime: function()
 		{
+			var self = this;
 			var today = new Date();
 			today.setHours(0, 0, 0, 0);
-			return new Date(today.valueOf() + (_time2int($(this).val())*1000));
+			return new Date(today.valueOf() + (_time2int(_getTimeValue(self))*1000));
 		},
 
 		setTime: function(value)
 		{
-			var self = $(this);
+			var self = this;
 			var prettyTime = _int2time(_time2int(value), self.data('timepicker-settings').timeFormat);
-			self.val(prettyTime);
+			_setTimeValue(self, prettyTime);
 		},
 
 		remove: function()
 		{
-			var self = $(this);
+			var self = this;
 
 			// check if this element is a timepicker
 			if (!self.hasClass('ui-timepicker-input')) {
@@ -255,7 +258,7 @@ requires jQuery 1.7+
 			settings.maxTime = _time2int(settings.maxTime);
 		}
 
-		if (settings.durationTime) {
+		if (settings.durationTime && typeof settings.durationTime !== 'function') {
 			settings.durationTime = _time2int(settings.durationTime);
 		}
 
@@ -287,22 +290,26 @@ requires jQuery 1.7+
 			self.data('timepicker-list', false);
 		}
 
-		list = $('<ul />', {
-			'tabindex': -1,
-			'class': 'ui-timepicker-list'
-		});
+		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);
+
 
 		if (settings.className) {
-			list.addClass(settings.className);
+			wrapped_list.addClass(settings.className);
 		}
 
-		list.css({'display':'none', 'position': 'absolute' });
-
 		if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
-			list.addClass('ui-timepicker-with-duration');
+			wrapped_list.addClass('ui-timepicker-with-duration');
 		}
 
-		var durStart = (settings.durationTime !== null) ? settings.durationTime : settings.minTime;
+		var durStart = settings.minTime;
+		if (typeof settings.durationTime === 'function') {
+			durStart = _time2int(settings.durationTime());
+		} else if (settings.durationTime !== null) {
+			durStart = settings.durationTime;
+		}
 		var start = (settings.minTime !== null) ? settings.minTime : 0;
 		var end = (settings.maxTime !== null) ? settings.maxTime : (start + _ONE_DAY - 1);
 
@@ -311,8 +318,9 @@ requires jQuery 1.7+
 			end += _ONE_DAY;
 		}
 
-		var disabledTimeRanges = settings.disableTimeRanges;
-		var disabledRange = disabledTimeRanges.shift();
+		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;
@@ -328,19 +336,21 @@ requires jQuery 1.7+
 				row.append(duration);
 			}
 
-			if (disabledRange) {
-				if (timeInt >= disabledRange[0] && timeInt < disabledRange[1]) {
+			if (drCur < drLen) {
+				if (timeInt >= dr[drCur][1]) {
+					drCur += 1;
+				}
+
+				if (dr[drCur] && timeInt >= dr[drCur][0] && timeInt < dr[drCur][1]) {
 					row.addClass('ui-timepicker-disabled');
-				} else if (timeInt > disabledRange[1]) {
-					disabledRange = disabledTimeRanges.shift();
 				}
 			}
 
 			list.append(row);
 		}
 
-		list.data('timepicker-input', self);
-		self.data('timepicker-list', list);
+		wrapped_list.data('timepicker-input', self);
+		self.data('timepicker-list', wrapped_list);
 
 		var appendTo = settings.appendTo;
 		if (typeof appendTo === 'string') {
@@ -348,19 +358,31 @@ requires jQuery 1.7+
 		} else if (typeof appendTo === 'function') {
 			appendTo = appendTo(self);
 		}
-		appendTo.append(list);
+		appendTo.append(wrapped_list);
 		_setSelected(self, list);
 
 		list.on('click', 'li', function(e) {
-			self[0].focus();
+
+			// 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 (!_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.addClass('ui-timepicker-hideme');
-				list.hide();
+				self.trigger('hideTimepicker');
+				wrapped_list.hide();
 			}
 		});
 	}
@@ -387,13 +409,19 @@ requires jQuery 1.7+
 	{
 		var target = $(e.target);
 		var input = target.closest('.ui-timepicker-input');
-		if (input.length === 0 && target.closest('.ui-timepicker-list').length === 0) {
+		if (input.length === 0 && target.closest('.ui-timepicker-wrapper').length === 0) {
 			methods.hide();
 			$('body').unbind('.ui-timepicker');
 			$(window).unbind('.ui-timepicker');
 		}
 	}
 
+	function _hideKeyboard(self)
+	{
+		var settings = self.data('timepicker-settings');
+		return ((window.navigator.msMaxTouchPoints || 'ontouchstart' in document) && settings.disableTouchKeyboard);
+	}
+
 	function _findRow(self, list, value)
 	{
 		if (!value && value !== 0) {
@@ -422,10 +450,24 @@ requires jQuery 1.7+
 
 	function _setSelected(self, list)
 	{
-		var timeValue = _time2int(self.val());
+		list.find('li').removeClass('ui-timepicker-selected');
+
+		var timeValue = _time2int(_getTimeValue(self));
+		if (!timeValue) {
+			return;
+		}
 
 		var selected = _findRow(self, list, timeValue);
-		if (selected) selected.addClass('ui-timepicker-selected');
+		if (selected) {
+
+			var topDelta = selected.offset().top - list.offset().top;
+
+			if (topDelta + selected.outerHeight() > list.outerHeight() || topDelta < 0) {
+				list.scrollTop(list.scrollTop() + selected.position().top - selected.outerHeight());
+			}
+
+			selected.addClass('ui-timepicker-selected');
+		}
 	}
 
 
@@ -436,6 +478,12 @@ requires jQuery 1.7+
 		}
 
 		var self = $(this);
+		var list = self.data('timepicker-list');
+
+		if (list && list.is(':visible')) {
+			return;
+		}
+
 		var seconds = _time2int(this.value);
 
 		if (seconds === null) {
@@ -444,14 +492,22 @@ requires jQuery 1.7+
 		}
 
 		var settings = self.data('timepicker-settings');
-
+		var rangeError = false;
 		// check that the time in within bounds
 		if (settings.minTime !== null && seconds < settings.minTime) {
-			self.trigger('timeRangeError');
+			rangeError = true;
 		} else if (settings.maxTime !== null && seconds > settings.maxTime) {
-			self.trigger('timeRangeError');
+			rangeError = true;
 		}
 
+		// check that time isn't within disabled time ranges
+		$.each(settings.disableTimeRanges, function(){
+			if (seconds >= this[0] && seconds < this[1]) {
+				rangeError = true;
+				return false;
+			}
+		});
+
 		if (settings.forceRoundTime) {
 			var offset = seconds % (settings.step*60); // step is in minutes
 
@@ -465,19 +521,62 @@ requires jQuery 1.7+
 		}
 
 		var prettyTime = _int2time(seconds, settings.timeFormat);
-		self.val(prettyTime);
+
+		if (rangeError) {
+			if (_setTimeValue(self, prettyTime, 'error')) {
+				self.trigger('timeRangeError');
+			}
+		} else {
+			_setTimeValue(self, prettyTime);
+		}
 	}
 
-	function _keyhandler(e)
+	function _getTimeValue(self)
+	{
+		if (self.is('input')) {
+			return self.val();
+		} else {
+			// use the element's data attributes to store values
+			return self.data('ui-timepicker-value');
+		}
+	}
+
+	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 (source == 'select') {
+				self.trigger('selectTime').trigger('changeTime').trigger('change');
+			} else if (source != 'error') {
+				self.trigger('changeTime');
+			}
+
+			return true;
+		} else {
+			self.trigger('selectTime');
+			return false;
+		}
+	}
+
+	/*
+	*  Keyboard navigation via arrow keys
+	*/
+	function _keydownhandler(e)
 	{
 		var self = $(this);
 		var list = self.data('timepicker-list');
 
 		if (!list || !list.is(':visible')) {
 			if (e.keyCode == 40) {
-				self.focus();
+				if (!_hideKeyboard(self)) {
+					self.focus();
+				}
 			} else {
-				return true;
+				return _screenInput(e, self);
 			}
 		}
 
@@ -495,7 +594,7 @@ requires jQuery 1.7+
 				var selected = list.find('.ui-timepicker-selected');
 
 				if (!selected.length) {
-					list.children().each(function(i, obj) {
+					list.find('li').each(function(i, obj) {
 						if ($(obj).position().top > 0) {
 							selected = $(obj);
 							return false;
@@ -512,13 +611,13 @@ requires jQuery 1.7+
 					}
 				}
 
-				break;
+				return false;
 
 			case 40: // down
 				selected = list.find('.ui-timepicker-selected');
 
 				if (selected.length === 0) {
-					list.children().each(function(i, obj) {
+					list.find('li').each(function(i, obj) {
 						if ($(obj).position().top > 0) {
 							selected = $(obj);
 							return false;
@@ -535,33 +634,72 @@ requires jQuery 1.7+
 					}
 				}
 
-				break;
+				return false;
 
 			case 27: // escape
 				list.find('li').removeClass('ui-timepicker-selected');
-				list.hide();
+				methods.hide();
 				break;
 
 			case 9: //tab
 				methods.hide();
 				break;
 
-			case 16:
-			case 17:
-			case 18:
-			case 19:
-			case 20:
-			case 33:
-			case 34:
-			case 35:
-			case 36:
-			case 37:
-			case 39:
-			case 45:
-				return;
+			default:
+				return _screenInput(e, self);
+		}
+	}
+
+	function _screenInput(e, self)
+	{
+		return !self.data('timepicker-settings').disableTextInput || e.ctrlKey || e.altKey || e.metaKey || (e.keyCode != 2 && e.keyCode < 46);
+	}
+
+	/*
+	*	Time typeahead
+	*/
+	function _keyuphandler(e)
+	{
+		var self = $(this);
+		var list = self.data('timepicker-list');
+
+		if (!list || !list.is(':visible')) {
+			return true;
+		}
+
+		switch (e.keyCode) {
+
+			case 96: // numpad numerals
+			case 97:
+			case 98:
+			case 99:
+			case 100:
+			case 101:
+			case 102:
+			case 103:
+			case 104:
+			case 105:
+			case 48: // numerals
+			case 49:
+			case 50:
+			case 51:
+			case 52:
+			case 53:
+			case 54:
+			case 55:
+			case 56:
+			case 57:
+			case 65: // a
+			case 77: // m
+			case 80: // p
+			case 186: // colon
+			case 8: // backspace
+			case 46: // delete
+				_setSelected(self, list);
+				break;
 
 			default:
-				list.find('li').removeClass('ui-timepicker-selected');
+				// list.find('li').removeClass('ui-timepicker-selected');
 				return;
 		}
 	}
@@ -582,20 +720,20 @@ requires jQuery 1.7+
 			// selected value found
 			timeValue = cursor.data('time');
 
-		} else if (self.val()) {
+		} else if (_getTimeValue(self)) {
 
 			// no selected value; fall back on input value
-			timeValue = _time2int(self.val());
+			timeValue = _time2int(_getTimeValue(self));
 
 			_setSelected(self, list);
 		}
 
 		if (timeValue !== null) {
 			var timeString = _int2time(timeValue, settings.timeFormat);
-			self.val(timeString);
+			_setTimeValue(self, timeString, 'select');
 		}
 
-		self.trigger('change').trigger('changeTime');
+		//self.trigger('change').trigger('selectTime');
 		return true;
 	}
 
@@ -685,25 +823,29 @@ requires jQuery 1.7+
 	function _time2int(timeString)
 	{
 		if (timeString === '') return null;
-		if (timeString+0 == timeString) return timeString;
+		if (!timeString || timeString+0 == timeString) return timeString;
 
 		if (typeof(timeString) == 'object') {
-			timeString = timeString.getHours()+':'+timeString.getMinutes()+':'+timeString.getSeconds();
+			timeString = timeString.getHours()+':'+_pad2(timeString.getMinutes())+':'+_pad2(timeString.getSeconds());
 		}
 
+		timeString = timeString.toLowerCase();
+
 		var d = new Date(0);
+		var time;
 
-		var timeRegex;
-		if (timeString.indexOf(":") === -1 && $.isNumeric(timeString.charAt(1))) {
-			//zero-required, fixed-position version
-			timeRegex = /^([0-2][0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)/;
+		// try to parse time input
+		if (timeString.indexOf(":") === -1) {
+			// no colon present
+			time = timeString.match(/^([0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)m?$/);
+
+			if (!time) {
+				time = timeString.match(/^([0-2][0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)m?$/);
+			}
 		} else {
-			//colon-delimited version
-			timeRegex = /^(\d{1,2})(?::(\d{1,2}))?(?::(\d{1,2}))?\s*([pa]?)/;
+			time = timeString.match(/^(\d{1,2})(?::([0-5][0-9]))?(?::([0-5][0-9]))?\s*([pa]?)m?$/);
 		}
 
-		var time = timeString.toLowerCase().match(timeRegex);
-
 		if (!time) {
 			return null;
 		}
@@ -727,6 +869,10 @@ requires jQuery 1.7+
 		return hours*3600 + minutes*60 + seconds;
 	}
 
+	function _pad2(n) {
+		return ("0" + n).slice(-2);
+	}
+
 	// Plugin entry
 	$.fn.timepicker = function(method)
 	{
@@ -734,4 +880,4 @@ requires jQuery 1.7+
 		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,23 +1,27 @@
-.ui-timepicker-list {
+.ui-timepicker-wrapper {
 	overflow-y: auto;
 	height: 150px;
 	width: 6.5em;
 	background: #fff;
 	border: 1px solid #ddd;
-	margin: 0;
-	padding: 0;
-	list-style: none;
 	-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-list.ui-timepicker-with-duration {
+.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;
 }
@@ -60,4 +64,4 @@ li.ui-timepicker-selected .ui-timepicker-duration,
 .ui-timepicker-list li.ui-timepicker-disabled:hover,
 .ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
 	background: #f2f2f2;
-}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-timepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 1.2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties