From f152509fb69b13d96169cac7b7dde8c4d585f6c0 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 10:16:42 -0300
Subject: [PATCH 01/33] Update jquery-timepicker to version 1.3.3

---
 .../assets/javascripts/jquery.timepicker.js   | 300 ++++++++++++------
 .../assets/stylesheets/jquery.timepicker.css  | 134 ++++----
 2 files changed, 273 insertions(+), 161 deletions(-)
 mode change 100755 => 100644 vendor/assets/stylesheets/jquery.timepicker.css

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index b7bf38c..cb0e1a1 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/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"); }
 	};
diff --git a/vendor/assets/stylesheets/jquery.timepicker.css b/vendor/assets/stylesheets/jquery.timepicker.css
old mode 100755
new mode 100644
index 87c7987..0935d49
--- a/vendor/assets/stylesheets/jquery.timepicker.css
+++ b/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;
+}

From 8064dc1658bd47be9169871e617f75e15a0f67a7 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 10:24:44 -0300
Subject: [PATCH 02/33] Update datepair to version 1.2.13 and rename to
 jquery.datepair

---
 vendor/assets/javascripts/datepair.js | 531 +++++++++++++++-----------
 1 file changed, 305 insertions(+), 226 deletions(-)
 mode change 100755 => 100644 vendor/assets/javascripts/datepair.js

diff --git a/vendor/assets/javascripts/datepair.js b/vendor/assets/javascripts/datepair.js
old mode 100755
new mode 100644
index d01d796..7454530
--- a/vendor/assets/javascripts/datepair.js
+++ b/vendor/assets/javascripts/datepair.js
@@ -1,226 +1,305 @@
-$(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;}};
+/************************
+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"); }
+	};
+}));

From 6d633cbc08a59b966bc885160e87da4b6b09f679 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 10:25:27 -0300
Subject: [PATCH 03/33] Rename datepair to jquery.datepair

---
 README.md                                                     | 4 ++--
 vendor/assets/javascripts/{datepair.js => jquery.datepair.js} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename vendor/assets/javascripts/{datepair.js => jquery.datepair.js} (100%)

diff --git a/README.md b/README.md
index 2365792..ce69fbe 100644
--- a/README.md
+++ b/README.md
@@ -29,9 +29,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.
 
diff --git a/vendor/assets/javascripts/datepair.js b/vendor/assets/javascripts/jquery.datepair.js
similarity index 100%
rename from vendor/assets/javascripts/datepair.js
rename to vendor/assets/javascripts/jquery.datepair.js

From d52a2cab2c5dd173b00bbaa6ccd6e393cbe844d3 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 10:36:27 -0300
Subject: [PATCH 04/33] Add myself as maintaner

---
 README.md                       | 2 --
 jquery-timepicker-rails.gemspec | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ce69fbe..564b6ae 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-**I will not continue to maintain this gem as I don't use Rails asset pipeline anymore, if you are interested, [contact me](mailto:tkrotoff@gmail.com).**
-
 # jQuery timepicker for Rails
 
 jquery-timepicker packaged for the Rails 3.1+ asset pipeline.
diff --git a/jquery-timepicker-rails.gemspec b/jquery-timepicker-rails.gemspec
index 1572d95..e1c65d5 100644
--- a/jquery-timepicker-rails.gemspec
+++ b/jquery-timepicker-rails.gemspec
@@ -6,7 +6,7 @@ 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}

From a7a90242a9334860679f562ea3f72a37805367f9 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 10:45:08 -0300
Subject: [PATCH 05/33] Bump version number to 1.3.3

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 05e8354..aeb629c 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/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

From e11d9aeb768cbae88c1f324251231b1023f6c382 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 10:50:50 -0300
Subject: [PATCH 06/33] Fix license url

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 564b6ae..4e28434 100644
--- a/README.md
+++ b/README.md
@@ -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).

From 8e64ce44fcc0735b8926e030a1d5f8db2e523a9e Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 11:00:35 -0300
Subject: [PATCH 07/33] New gem's homepage on RubyGems

---
 jquery-timepicker-rails.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jquery-timepicker-rails.gemspec b/jquery-timepicker-rails.gemspec
index e1c65d5..cb5be28 100644
--- a/jquery-timepicker-rails.gemspec
+++ b/jquery-timepicker-rails.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   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($/)

From 26afee2af47ddad3947f82d53c280e2fb32b4a97 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 16 Feb 2014 12:19:34 -0300
Subject: [PATCH 08/33] Add gem badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4e28434..2c20b47 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # jQuery timepicker for Rails
+[![Gem Version](https://badge.fury.io/rb/jquery-timepicker-rails.png)](http://badge.fury.io/rb/jquery-timepicker-rails)
 
 jquery-timepicker packaged for the Rails 3.1+ asset pipeline.
 Check [jquery-timepicker project home page](http://github.com/jonthornton/jquery-timepicker).

From 01e4489e31271c061746c59df55dba8d06816ce4 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Mon, 24 Feb 2014 02:18:25 -0300
Subject: [PATCH 09/33] Update jquery-timepicker to version 1.3.4

---
 vendor/assets/javascripts/jquery.timepicker.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index cb0e1a1..1bb2758 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.3
+jquery-timepicker v1.3.4
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -243,9 +243,16 @@ requires jQuery 1.7+
 			if (!relative_date) {
 				relative_date = new Date();
 			}
+			var offset = _time2int(time_string);
 
-			relative_date.setHours(0, 0, 0, 0);
-			return new Date(relative_date.valueOf() + (_time2int(time_string)*1000));
+			// construct a Date with today's date, and offset's time
+			var time = new Date(relative_date);
+			time.setHours(offset / 3600);
+			time.setMinutes(offset % 3600 / 60);
+			time.setSeconds(offset % 60);
+			time.setMilliseconds(0);
+
+			return time;
 		},
 
 		setTime: function(value)

From b6c6960717ae2247a3bb86319107a38e3a6d5777 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Mon, 24 Feb 2014 02:19:11 -0300
Subject: [PATCH 10/33] Bump version number to 1.3.4

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index aeb629c..131828a 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.3"
+      VERSION = "1.3.4"
     end
   end
 end

From 21a804143126ffa6f402299ac9c93818a08b6cee Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Mon, 24 Feb 2014 12:52:05 -0300
Subject: [PATCH 11/33] Update jquery-datepair

---
 vendor/assets/javascripts/jquery.datepair.js | 50 +++++++++++++++-----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.datepair.js b/vendor/assets/javascripts/jquery.datepair.js
index 7454530..a2bf85a 100644
--- a/vendor/assets/javascripts/jquery.datepair.js
+++ b/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);
 	}
 
@@ -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)
@@ -266,7 +277,6 @@ requires jQuery 1.7+
 				$self.data('datepair-timedelta', null);
 			}
 
-			_updateEndMintime($self);
 			return;
 		}
 
@@ -290,8 +300,26 @@ requires jQuery 1.7+
 		}
 
 		$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;
+		}
+
+		var $startDateInput = _getStartDateInput($self);
+		var $endDateInput = _getEndDateInput($self);
+		if ($startDateInput.length && $endDateInput.length && $self.data('datepair-datedelta') === null) {
+			$self.trigger('rangeIncomplete');
+			return;
+		}
 
-		_updateEndMintime($self);
+		$self.trigger('rangeSelected');
 	}
 
 

From 5d6abd87908827b78397339b6948011955e85312 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Tue, 25 Feb 2014 01:05:57 -0300
Subject: [PATCH 12/33] Update jquery-datepair

---
 vendor/assets/javascripts/jquery.datepair.js | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.datepair.js b/vendor/assets/javascripts/jquery.datepair.js
index a2bf85a..3217e87 100644
--- a/vendor/assets/javascripts/jquery.datepair.js
+++ b/vendor/assets/javascripts/jquery.datepair.js
@@ -210,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);
 				}
 
@@ -268,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);
 				}
 
@@ -291,12 +291,12 @@ 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());
@@ -319,7 +319,11 @@ requires jQuery 1.7+
 			return;
 		}
 
-		$self.trigger('rangeSelected');
+		if ($self.data('datepair-datedelta') + $self.data('datepair-timedelta') >= 0) {
+			$self.trigger('rangeSelected');
+		} else {
+			$self.trigger('rangeError');
+		}
 	}
 
 

From a6765150ecd7ef03a2795b66156698ecd809249c Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Tue, 25 Feb 2014 01:07:11 -0300
Subject: [PATCH 13/33] Update jquery-timepicker to version 1.3.5

---
 .../assets/javascripts/jquery.timepicker.js   | 57 ++++++++++++++++---
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index 1bb2758..dee499c 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/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');

From 853d5ba6276c05b7ef09e4f31bea65895f7ab685 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Tue, 25 Feb 2014 01:07:37 -0300
Subject: [PATCH 14/33] Bump version number to 1.3.5

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 131828a..2b5c0ac 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/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

From 12c2d77760ed27bfba9fbac11f18f089dd4b6ed5 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Mon, 14 Apr 2014 00:54:10 +0200
Subject: [PATCH 15/33] Update jquery-timepicker to version 1.3.6

---
 .../assets/javascripts/jquery.timepicker.js   | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index dee499c..9933ab8 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.5
+jquery-timepicker v1.3.6
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -31,12 +31,17 @@ requires jQuery 1.7+
 		disableTouchKeyboard: false,
 		forceRoundTime: false,
 		appendTo: 'body',
+		orientation: 'ltr',
 		disableTimeRanges: [],
 		closeOnWindowScroll: false,
 		typeaheadHighlight: true,
 		noneOption: false
 	};
 	var _lang = {
+		am: 'am',
+		pm: 'pm',
+		AM: 'AM',
+		PM: 'PM',
 		decimal: '.',
 		mins: 'mins',
 		hr: 'hr',
@@ -53,7 +58,7 @@ requires jQuery 1.7+
 
 				// pick up settings from data attributes
 				var attributeOptions = [];
-				for (key in _defaults) {
+				for (var key in _defaults) {
 					if (self.data(key))  {
 						attributeOptions[key] = self.data(key);
 					}
@@ -122,22 +127,28 @@ requires jQuery 1.7+
 			// make sure other pickers are hidden
 			methods.hide();
 
+			// position the dropdown relative to the input
 			list.show();
+			var listOffset = {};
+
+			if (settings.orientation == 'rtl') {
+				// right-align the dropdown
+				listOffset.left = self.offset().left + self.outerWidth() - list.outerWidth() + parseInt(list.css('marginLeft').replace('px', ''), 10);
+			} else {
+				// left-align the dropdown
+				listOffset.left = self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10);
+			}
 
 			if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
 				// position the dropdown on top
-				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)
-				});
+				listOffset.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 + parseInt(list.css('marginLeft').replace('px', ''), 10),
-					'top': self.offset().top + self.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10)
-				});
+				listOffset.top = self.offset().top + self.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10);
 			}
 
+			list.offset(listOffset);
+
 			// position scrolling
 			var selected = list.find('.ui-timepicker-selected');
 
@@ -623,9 +634,8 @@ requires jQuery 1.7+
 		}
 
 		var self = $(this);
-		var list = self.data('timepicker-list');
 
-		if (list && list.is(':visible')) {
+		if (self.is(':focus')) {
 			return;
 		}
 
@@ -930,11 +940,11 @@ requires jQuery 1.7+
 			switch (code) {
 
 				case 'a':
-					output += (time.getHours() > 11) ? 'pm' : 'am';
+					output += (time.getHours() > 11) ? _lang.pm : _lang.am;
 					break;
 
 				case 'A':
-					output += (time.getHours() > 11) ? 'PM' : 'AM';
+					output += (time.getHours() > 11) ? _lang.PM : _lang.AM;
 					break;
 
 				case 'g':

From b4fcb04922f4c4c3171c2d7c29f4be515d03cd88 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Mon, 14 Apr 2014 00:55:04 +0200
Subject: [PATCH 16/33] Bump version number to 1.3.6

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 2b5c0ac..645b1c1 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.5"
+      VERSION = "1.3.6"
     end
   end
 end

From 997e61ebce3cd5cec90a431a02dcd24c1a3e04d2 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 20 Apr 2014 10:36:28 +0200
Subject: [PATCH 17/33] Update jquery-timepicker to version 1.3.7

---
 vendor/assets/javascripts/jquery.timepicker.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index 9933ab8..fd711a6 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.6
+jquery-timepicker v1.3.7
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -627,15 +627,16 @@ requires jQuery 1.7+
 	}
 
 
-	function _formatValue()
+	function _formatValue(e)
 	{
 		if (this.value === '') {
 			return;
 		}
 
 		var self = $(this);
+		var list = self.data('timepicker-list');
 
-		if (self.is(':focus')) {
+		if (self.is(':focus') && (!e || e.type != 'change')) {
 			return;
 		}
 

From 88c346dfc57055d9ed3bce52753371032c419154 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sun, 20 Apr 2014 10:37:02 +0200
Subject: [PATCH 18/33] Bump version number to 1.3.7

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 645b1c1..7ca1cc1 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.6"
+      VERSION = "1.3.7"
     end
   end
 end

From 9bebe2062089d98fb6a8b38c2fd4f8558c4672fd Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Fri, 23 May 2014 10:43:29 +0200
Subject: [PATCH 19/33] Update jquery-timepicker to version 1.3.8

---
 .../assets/javascripts/jquery.timepicker.js   | 33 ++++++++++++++-----
 .../assets/stylesheets/jquery.timepicker.css  |  5 +++
 2 files changed, 29 insertions(+), 9 deletions(-)

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

From 5429a1d6ab82f6fc9f1c593c897c1b34481aea1b Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Fri, 23 May 2014 10:43:51 +0200
Subject: [PATCH 20/33] Bump version number to 1.3.8

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 7ca1cc1..320b5e7 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.7"
+      VERSION = "1.3.8"
     end
   end
 end

From 8e46c59b81b78c33e46a5d23f24b20acddbe4feb Mon Sep 17 00:00:00 2001
From: Luisa Lima <luisalima@dcc.fc.up.pt>
Date: Mon, 2 Jun 2014 09:56:57 +0100
Subject: [PATCH 21/33] Update jquery timepicker to version 1.3.8.

---
 vendor/assets/javascripts/jquery.timepicker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index 137cb3d..0cedffc 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -431,7 +431,7 @@ requires jQuery 1.7+
 			}
 
 			if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
-				var durationString = _int2duration(i - durStart);
+				var durationString = _int2duration(i - durStart, settings.step);
 				if (settings.useSelect) {
 					row.text(row.text()+' ('+durationString+')');
 				} else {
@@ -903,7 +903,7 @@ requires jQuery 1.7+
 		return true;
 	}
 
-	function _int2duration(seconds)
+	function _int2duration(seconds, step)
 	{
 		var minutes = Math.round(seconds/60),
 			duration = [],

From 69b6380fd8334a3e95cecf46d22b23dcdd95b743 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Wed, 4 Jun 2014 14:31:05 +0200
Subject: [PATCH 22/33] Bump version number to 1.3.8.1

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 320b5e7..2bc6c07 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.8"
+      VERSION = "1.3.8.1"
     end
   end
 end

From 361587180979b0b437a7590630ceb537438ff204 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Tue, 24 Jun 2014 21:50:11 +0200
Subject: [PATCH 23/33] Update jquery-timepicker to version 1.3.9

---
 vendor/assets/javascripts/jquery.timepicker.js  | 13 ++++++++++---
 vendor/assets/stylesheets/jquery.timepicker.css |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index 0cedffc..15928a8 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -1,5 +1,5 @@
 /************************
-jquery-timepicker v1.3.8
+jquery-timepicker v1.3.9
 http://jonthornton.github.com/jquery-timepicker/
 
 requires jQuery 1.7+
@@ -288,6 +288,7 @@ requires jQuery 1.7+
 				return;
 			}
 
+			var settings = self.data('timepicker-settings');
 			self.removeAttr('autocomplete', 'off');
 			self.removeClass('ui-timepicker-input');
 			self.removeData('timepicker-settings');
@@ -298,6 +299,10 @@ requires jQuery 1.7+
 				self.data('timepicker-list').remove();
 			}
 
+			if (settings.useSelect) {
+				self.show();
+			}
+
 			self.removeData('timepicker-list');
 
 			return this;
@@ -376,8 +381,10 @@ requires jQuery 1.7+
 
 			if ($.isArray(settings.noneOption)) {
 				for (var i in settings.noneOption) {
-					var noneElement = _generateNoneElement(settings.noneOption[i], settings.useSelect);
-					list.append(noneElement);
+					if (parseInt(i, 10) === i){
+						var noneElement = _generateNoneElement(settings.noneOption[i], settings.useSelect);
+						list.append(noneElement);
+					}
 				}
 			} else {
 				var noneElement = _generateNoneElement(settings.noneOption, settings.useSelect);
diff --git a/vendor/assets/stylesheets/jquery.timepicker.css b/vendor/assets/stylesheets/jquery.timepicker.css
index 2111e60..cd75f13 100644
--- a/vendor/assets/stylesheets/jquery.timepicker.css
+++ b/vendor/assets/stylesheets/jquery.timepicker.css
@@ -13,7 +13,7 @@
 }
 
 .ui-timepicker-wrapper.ui-timepicker-with-duration {
-	width: 14em;
+	width: 13em;
 }
 
 .ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-30,

From f4b5b113d6632a149fcf0fcc181324d706222251 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Tue, 24 Jun 2014 22:00:08 +0200
Subject: [PATCH 24/33] Update jquery-datepair to version 0.2.1

---
 vendor/assets/javascripts/jquery.datepair.js | 619 +++++++++----------
 1 file changed, 293 insertions(+), 326 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.datepair.js b/vendor/assets/javascripts/jquery.datepair.js
index 3217e87..deb5933 100644
--- a/vendor/assets/javascripts/jquery.datepair.js
+++ b/vendor/assets/javascripts/jquery.datepair.js
@@ -1,337 +1,304 @@
-/************************
-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());
-				} else {
-					$self.data('datepair-datedelta', null);
-				}
-
-				// 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());
-				} else {
-					$self.data('datepair-timedelta', null);
-				}
-
-				_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');
-			_unbindChangeHandler($self)
-
-			return $self;
-		}
-	};
-
-	// private methods
-
-	function _parseSettings(settings)
-	{
-		// if (settings.startClass) {
-		// 	settings.minTime = _time2int(settings.minTime);
-		// }
-
-		return settings;
+/*!
+ * datepair.js v0.2.1 - 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
+ */
+
+(function(window, document) {
+
+    'use strict';
+
+    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) {
+    	if (jq) {
+    		jq(el).trigger(eventName);
+    	} else {
+    		var event = document.createEvent('CustomEvent');
+    		event.initCustomEvent(eventName, true, true, {});
+    		el.dispatchEvent(event);
+    	}
+    }
+    
+    // el.classList not supported by < IE10
+    // use jQuery if available
+    function hasClass(el, className) {
+    	if (jq) {
+    		return jq(el).hasClass(className);
+    	} else {
+    		return el.classList.contains(className);
+    	}
+    }
+    
+    function Datepair(container, options) {
+    	this.dateDelta = null;
+    	this.timeDelta = null;
+    	this._defaults =	{
+    		startClass: 'start',
+    		endClass: 'end',
+    		timeClass: 'time',
+    		dateClass: 'date',
+    		defaultDateDelta: 0,
+    		defaultTimeDelta: 3600000,
+    
+    		// defaults for jquery-timepicker; override when using other input widgets
+    		parseTime: function(input){
+    			return jq(input).timepicker('getTime');
+    		},
+    		updateTime: function(input, dateObj){
+    			jq(input).timepicker('setTime', dateObj);
+    		},
+    		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');
+    		},
+    		updateDate: function(input, dateObj){
+    			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);
+    
+    	// 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,
+    		// use that for event binding
+    		if (jq) {
+    			jq(this.container).on('change.datepair', jq.proxy(this.handleEvent, this));
+    		} else {
+    			this.container.addEventListener('change', this, false);
+    		}
+    	},
+    
+    	_unbindChangeHandler: function(){
+    		if (jq) {
+    			jq(this.container).off('change.datepair');
+    		} else {
+    			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);
+    			} else {
+    				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);
+    		} else if (hasClass(target, this.settings.endClass)) {
+    			if (endDate < startDate) {
+    				this.dateDelta = 0;
+    				this.settings.updateDate(this.startDateInput, endDate);
+    			} else {
+    				this.dateDelta = endDate.getTime() - startDate.getTime();
+    			}
+    		}
+    	},
+    
+    	_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) {
+    					var startTime = this.settings.parseTime(this.startTimeInput);
+    					var newEnd = new Date(startTime.getTime() + this.settings.defaultTimeDelta);
+    					this.settings.updateTime(this.endTimeInput, newEnd);
+    				} else if (this.endTimeInput.value) {
+    					var endTime = this.settings.parseTime(this.endTimeInput);
+    					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 {
+    			triggerSimpleCustomEvent(this.container, 'rangeError');
+    		}
+    	}
+    }
+
+    window.Datepair = Datepair;
+
+}(window, document));
+
+/*!
+ * datepair.js v0.2.1 - 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
+ */
+
+(function($) {
+
+	if(!$) {
+		return;
 	}
 
-	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);
+	////////////
+	// Plugin //
+	////////////
 
-		var settings = $self.data('datepair-settings');
-		var $target = $(e.target);
+	$.fn.datepair = function(option) {
+		var out;
+		this.each(function() {
+			var $this = $(this);
+			var data = $this.data('datepair');
+			var options = typeof option === 'object' && option;
 
-		if ($target.hasClass(settings.dateClass)) {
-			if ($target.val() != '') {
-				_dateChanged($self, $target);
-			} else {
-				$self.data('datepair-datedelta', null);
+			if (!data) {
+				data = new Datepair(this, options);
+				$this.data('datepair', data);
 			}
 
-		} else if ($target.hasClass(settings.timeClass)) {
-			if ($target.val() != '') {
-				_timeChanged($self, $target);
-			} else {
-				$self.data('datepair-timedelta', null);
+			if (typeof option === 'string') {
+				out = data[option]();
 			}
-		}
-
-		_validateRanges($self);
-		_updateEndMintime($self)
-		_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);
-			}
-
-			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());
-			}
-		}
-	}
-
-	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(endTime.getTime() - settings.defaultTimeDelta);
-					settings.updateTime($startTimeInput, newStart);
-				}
-
-				$self.data('datepair-timedelta', settings.defaultTimeDelta);
-			} else {
-				$self.data('datepair-timedelta', null);
-			}
-
-			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);
-			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;
-		}
-
-		var $startDateInput = _getStartDateInput($self);
-		var $endDateInput = _getEndDateInput($self);
-		if ($startDateInput.length && $endDateInput.length && $self.data('datepair-datedelta') === null) {
-			$self.trigger('rangeIncomplete');
-			return;
-		}
+		return out;
+	};
 
-		if ($self.data('datepair-datedelta') + $self.data('datepair-timedelta') >= 0) {
-			$self.trigger('rangeSelected');
-		} else {
-			$self.trigger('rangeError');
-		}
-	}
+	//////////////
+	// Data API //
+	//////////////
 
+	$('[data-datepair]').each(function() {
+		var $this = $(this);
+		$this.datepair($this.data());
+	});
 
-	// 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"); }
-	};
-}));
+}(window.Zepto || window.jQuery));
\ No newline at end of file

From 019e337c5612d3373f3dee74dd5c5dd5d263f408 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Tue, 24 Jun 2014 22:00:42 +0200
Subject: [PATCH 25/33] Bump version number to 1.3.9

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 2bc6c07..aed36c8 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.3.8.1"
+      VERSION = '1.3.9'
     end
   end
 end

From cedcbc337be17f7b871a22dc5d3d937f2ceb50cb Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sat, 19 Jul 2014 11:00:31 +0200
Subject: [PATCH 26/33] Update jquery-timepicker to version 1.4.3

---
 .../assets/javascripts/jquery.timepicker.js   | 117 +++++++++++-------
 .../assets/stylesheets/jquery.timepicker.css  |   0
 2 files changed, 70 insertions(+), 47 deletions(-)
 mode change 100644 => 100755 vendor/assets/stylesheets/jquery.timepicker.css

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index 15928a8..38171a4 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/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) {
diff --git a/vendor/assets/stylesheets/jquery.timepicker.css b/vendor/assets/stylesheets/jquery.timepicker.css
old mode 100644
new mode 100755

From 7838cb89ed134e9d0e74404a5a6206866bd5ccf9 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sat, 19 Jul 2014 11:05:58 +0200
Subject: [PATCH 27/33] Update jquery-datepair to version 0.2.2

---
 vendor/assets/javascripts/jquery.datepair.js | 94 +++++++++++---------
 1 file changed, 53 insertions(+), 41 deletions(-)

diff --git a/vendor/assets/javascripts/jquery.datepair.js b/vendor/assets/javascripts/jquery.datepair.js
index deb5933..52f4ff8 100644
--- a/vendor/assets/javascripts/jquery.datepair.js
+++ b/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
  */

From d8eb6e7540a352e04b3be32bc135c906cc473dc1 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Sat, 19 Jul 2014 11:06:21 +0200
Subject: [PATCH 28/33] Bump version number to 1.4.3

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index aed36c8..eef3399 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/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

From 454741bebcfff99c4edfccc8cb413155986e2f02 Mon Sep 17 00:00:00 2001
From: Justin Tomich <tomichj@gmail.com>
Date: Thu, 15 Sep 2016 13:11:47 -0700
Subject: [PATCH 29/33] updated jquery-timepicker-railse to 1.11.4,
 jquery.datepair.js to 0.4.14

added Datepair.js
css has not changed as of 1.11.4
set Jquery::Timepicker::Rails::VERSION to 1.11.4
---
 lib/jquery-timepicker-rails/version.rb        |   2 +-
 vendor/assets/javascripts/Datepair.js         | 347 +++++++++++++
 vendor/assets/javascripts/jquery.datepair.js  | 280 +---------
 .../assets/javascripts/jquery.timepicker.js   | 478 +++++++++++-------
 4 files changed, 657 insertions(+), 450 deletions(-)
 create mode 100755 vendor/assets/javascripts/Datepair.js
 mode change 100644 => 100755 vendor/assets/javascripts/jquery.datepair.js
 mode change 100644 => 100755 vendor/assets/javascripts/jquery.timepicker.js

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index eef3399..507e69b 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = '1.4.3'
+      VERSION = '1.11.4'
     end
   end
 end
diff --git a/vendor/assets/javascripts/Datepair.js b/vendor/assets/javascripts/Datepair.js
new file mode 100755
index 0000000..471a3c8
--- /dev/null
+++ b/vendor/assets/javascripts/Datepair.js
@@ -0,0 +1,347 @@
+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) {
+	if (jq) {
+		jq(el).trigger(eventName);
+	} else {
+		var event = document.createEvent('CustomEvent');
+		event.initCustomEvent(eventName, true, true, {});
+		el.dispatchEvent(event);
+	}
+}
+
+// el.classList not supported by < IE10
+// use jQuery if available
+function hasClass(el, className) {
+	if (jq) {
+		return jq(el).hasClass(className);
+	} else {
+		return el.classList.contains(className);
+	}
+}
+
+function Datepair(container, options) {
+	this.dateDelta = null;
+	this.timeDelta = null;
+	this._defaults =	{
+		startClass: 'start',
+		endClass: 'end',
+		timeClass: 'time',
+		dateClass: 'date',
+		defaultDateDelta: 0,
+		defaultTimeDelta: 3600000,
+		anchor: 'start',
+
+		// defaults for jquery-timepicker; override when using other input widgets
+		parseTime: function(input){
+			return jq(input).timepicker('getTime');
+		},
+		updateTime: function(input, dateObj){
+			jq(input).timepicker('setTime', dateObj);
+		},
+		setMinTime: function(input, dateObj){
+			jq(input).timepicker('option', 'minTime', dateObj);
+		},
+
+		// defaults for bootstrap datepicker; override when using other input widgets
+		parseDate: function(input){
+			return input.value && jq(input).datepicker('getDate');
+		},
+		updateDate: function(input, dateObj){
+			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
+	this.refresh();
+
+	// init starts here
+	this._bindChangeHandler();
+}
+
+Datepair.prototype = {
+	constructor: Datepair,
+
+	option: function(key, value)
+	{
+		if (typeof key == 'object') {
+			this.settings = simpleExtend(this.settings, key);
+
+		} else if (typeof key == 'string' && typeof value != 'undefined') {
+			this.settings[key] = value;
+
+		} else if (typeof key == 'string') {
+			return this.settings[key];
+		}
+
+		this._updateEndMintime();
+	},
+
+	getTimeDiff: function()
+	{
+		// due to the fact that times can wrap around, timeDiff for any
+		// time-only pair will always be >= 0
+		var delta = this.dateDelta + this.timeDelta;
+		if (delta < 0 && (!this.startDateInput || !this.endDateInput) ) {
+			delta += _ONE_DAY;
+		}
+
+		return delta;
+	},
+
+	refresh: function()
+	{
+		if (this.startDateInput && this.startDateInput.value && this.endDateInput && this.endDateInput.value) {
+			var startDate = this.settings.parseDate(this.startDateInput);
+			var endDate = this.settings.parseDate(this.endDateInput);
+			if (startDate && endDate) {
+				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);
+			if (startTime && endTime) {
+				this.timeDelta = endTime.getTime() - startTime.getTime();
+				this._updateEndMintime();
+			}
+		}
+	},
+
+	remove: function()
+	{
+		this._unbindChangeHandler();
+	},
+
+	_bindChangeHandler: function(){
+		// addEventListener doesn't work with synthetic "change" events
+		// fired by jQuery's trigger() functioin. If jQuery is present,
+		// use that for event binding
+		if (jq) {
+			jq(this.container).on('change.datepair', jq.proxy(this.handleEvent, this));
+		} else {
+			this.container.addEventListener('change', this, false);
+		}
+	},
+
+	_unbindChangeHandler: function(){
+		if (jq) {
+			jq(this.container).off('change.datepair');
+		} else {
+			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);
+				this._timeChanged(e.target);
+			} else {
+				this.dateDelta = null;
+			}
+
+		} else if (hasClass(e.target, this.settings.timeClass)) {
+			if (e.target.value != '') {
+				this._timeChanged(e.target);
+			} else {
+				this.timeDelta = null;
+			}
+		}
+
+		this._validateRanges();
+		this._updateEndMintime();
+		this._bindChangeHandler();
+	},
+
+	_dateChanged: function(target){
+		if (!this.startDateInput || !this.endDateInput) {
+			return;
+		}
+
+		var startDate = this.settings.parseDate(this.startDateInput);
+		var endDate = this.settings.parseDate(this.endDateInput);
+
+		if (!startDate || !endDate) {
+			if (this.settings.defaultDateDelta !== null) {
+				if (startDate) {
+					var newEnd = new Date(startDate.getTime() + this.settings.defaultDateDelta * _ONE_DAY);
+					this.settings.updateDate(this.endDateInput, newEnd);
+
+				} else if (endDate) {
+					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;
+		}
+
+		if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
+			var newDate = new Date(startDate.getTime() + this.dateDelta);
+			this.settings.updateDate(this.endDateInput, newDate);
+		} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
+			var newDate = new Date(endDate.getTime() - this.dateDelta);
+			this.settings.updateDate(this.startDateInput, newDate);
+		} else {
+			if (endDate < startDate) {
+				var otherInput = hasClass(target, this.settings.startClass) ? this.endDateInput : this.startDateInput;
+				var selectedDate = this.settings.parseDate(target);
+				this.dateDelta = 0;
+				this.settings.updateDate(otherInput, selectedDate);
+			} else {
+				this.dateDelta = endDate.getTime() - startDate.getTime();
+			}
+		}
+	},
+
+	_timeChanged: function(target){
+		if (!this.startTimeInput || !this.endTimeInput) {
+			return;
+		}
+
+		var startTime = this.settings.parseTime(this.startTimeInput);
+		var endTime = this.settings.parseTime(this.endTimeInput);
+
+		if (!startTime || !endTime) {
+			if (this.settings.defaultTimeDelta !== null) {
+				if (startTime) {
+					var newEnd = new Date(startTime.getTime() + this.settings.defaultTimeDelta);
+					this.settings.updateTime(this.endTimeInput, newEnd);
+				} else if (endTime) {
+					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;
+		}
+
+		if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
+			var newTime = new Date(startTime.getTime() + this.timeDelta);
+			this.settings.updateTime(this.endTimeInput, newTime);
+			endTime = this.settings.parseTime(this.endTimeInput);
+
+			this._doMidnightRollover(startTime, endTime);
+		} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
+			var newTime = new Date(endTime.getTime() - this.timeDelta);
+			this.settings.updateTime(this.startTimeInput, newTime);
+			startTime = this.settings.parseTime(this.startTimeInput);
+
+			this._doMidnightRollover(startTime, endTime);
+		} else {
+			this._doMidnightRollover(startTime, endTime);
+
+			var startDate, endDate;
+			if (this.startDateInput && this.endDateInput) {
+				startDate = this.settings.parseDate(this.startDateInput);
+				endDate = this.settings.parseDate(this.endDateInput);
+			}
+
+			if ((+startDate == +endDate) && (endTime < startTime)) {
+				var thisInput  = hasClass(target, this.settings.endClass) ? this.endTimeInput : this.startTimeInput;
+				var otherInput = hasClass(target, this.settings.startClass) ? this.endTimeInput : this.startTimeInput;
+				var selectedTime = this.settings.parseTime(thisInput);
+				this.timeDelta = 0;
+				this.settings.updateTime(otherInput, selectedTime);
+			} else {
+				this.timeDelta = endTime.getTime() - startTime.getTime();
+			}
+		}
+
+
+	},
+
+	_doMidnightRollover: function(startTime, endTime) {
+		if (!this.startDateInput || !this.endDateInput) {
+			return;
+		}
+
+		var endDate = this.settings.parseDate(this.endDateInput);
+		var startDate = this.settings.parseDate(this.startDateInput);
+		var newDelta = endTime.getTime() - startTime.getTime();
+		var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
+
+		if (this.dateDelta !== null
+				&& this.dateDelta + this.timeDelta <= _ONE_DAY
+				&& this.dateDelta + newDelta != 0
+				&& (offset > 0 || this.dateDelta != 0)
+				&& ((newDelta >= 0 && this.timeDelta < 0) || (newDelta < 0 && this.timeDelta >= 0))) {
+
+			if (this.settings.anchor == 'start') {
+				this.settings.updateDate(this.endDateInput, new Date(endDate.getTime() + offset));
+				this._dateChanged(this.endDateInput);
+			} else if (this.settings.anchor == 'end') {
+				this.settings.updateDate(this.startDateInput, new Date(startDate.getTime() - offset));
+				this._dateChanged(this.startDateInput);
+			}
+		}
+		this.timeDelta = newDelta;
+	},
+
+	_updateEndMintime: function(){
+		if (typeof this.settings.setMinTime != 'function') return;
+
+		var baseTime = null;
+		if (this.settings.anchor == 'start' && (!this.dateDelta || this.dateDelta < _ONE_DAY || (this.timeDelta && this.dateDelta + this.timeDelta < _ONE_DAY))) {
+			baseTime = this.settings.parseTime(this.startTimeInput);
+		}
+
+		this.settings.setMinTime(this.endTimeInput, baseTime);
+	},
+
+	_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;
+		}
+
+		// due to the fact that times can wrap around, any time-only pair will be considered valid
+		if (!this.startDateInput || !this.endDateInput || this.dateDelta + this.timeDelta >= 0) {
+			triggerSimpleCustomEvent(this.container, 'rangeSelected');
+		} else {
+			triggerSimpleCustomEvent(this.container, 'rangeError');
+		}
+	}
+};
diff --git a/vendor/assets/javascripts/jquery.datepair.js b/vendor/assets/javascripts/jquery.datepair.js
old mode 100644
new mode 100755
index 52f4ff8..b9aadd6
--- a/vendor/assets/javascripts/jquery.datepair.js
+++ b/vendor/assets/javascripts/jquery.datepair.js
@@ -1,279 +1,3 @@
-/*!
- * 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
- */
-
-(function(window, document) {
-
-    'use strict';
-
-    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) {
-    	if (jq) {
-    		jq(el).trigger(eventName);
-    	} else {
-    		var event = document.createEvent('CustomEvent');
-    		event.initCustomEvent(eventName, true, true, {});
-    		el.dispatchEvent(event);
-    	}
-    }
-
-    // el.classList not supported by < IE10
-    // use jQuery if available
-    function hasClass(el, className) {
-    	if (jq) {
-    		return jq(el).hasClass(className);
-    	} else {
-    		return el.classList.contains(className);
-    	}
-    }
-
-    function Datepair(container, options) {
-    	this.dateDelta = null;
-    	this.timeDelta = null;
-    	this._defaults =	{
-    		startClass: 'start',
-    		endClass: 'end',
-    		timeClass: 'time',
-    		dateClass: 'date',
-    		defaultDateDelta: 0,
-    		defaultTimeDelta: 3600000,
-
-    		// defaults for jquery-timepicker; override when using other input widgets
-    		parseTime: function(input){
-    			return jq(input).timepicker('getTime');
-    		},
-    		updateTime: function(input, dateObj){
-    			jq(input).timepicker('setTime', dateObj);
-    		},
-    		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');
-    		},
-    		updateDate: function(input, dateObj){
-    			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,
-    		// use that for event binding
-    		if (jq) {
-    			jq(this.container).on('change.datepair', jq.proxy(this.handleEvent, this));
-    		} else {
-    			this.container.addEventListener('change', this, false);
-    		}
-    	},
-
-    	_unbindChangeHandler: function(){
-    		if (jq) {
-    			jq(this.container).off('change.datepair');
-    		} else {
-    			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);
-    			} else {
-    				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);
-    		} else if (hasClass(target, this.settings.endClass)) {
-    			if (endDate < startDate) {
-    				this.dateDelta = 0;
-    				this.settings.updateDate(this.startDateInput, endDate);
-    			} else {
-    				this.dateDelta = endDate.getTime() - startDate.getTime();
-    			}
-    		}
-    	},
-
-    	_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) {
-    					var startTime = this.settings.parseTime(this.startTimeInput);
-    					var newEnd = new Date(startTime.getTime() + this.settings.defaultTimeDelta);
-    					this.settings.updateTime(this.endTimeInput, newEnd);
-    				} else if (this.endTimeInput.value) {
-    					var endTime = this.settings.parseTime(this.endTimeInput);
-    					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 {
-    			triggerSimpleCustomEvent(this.container, 'rangeError');
-    		}
-    	}
-    }
-
-    window.Datepair = Datepair;
-
-}(window, document));
-
-/*!
- * 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
- */
-
 (function($) {
 
 	if(!$) {
@@ -301,7 +25,7 @@
 			}
 		});
 
-		return out;
+		return out || this;
 	};
 
 	//////////////
@@ -313,4 +37,4 @@
 		$this.datepair($this.data());
 	});
 
-}(window.Zepto || window.jQuery));
\ No newline at end of file
+}(window.Zepto || window.jQuery));
diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
old mode 100644
new mode 100755
index 38171a4..e8e9601
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -1,13 +1,16 @@
-/************************
-jquery-timepicker v1.4.3
-http://jonthornton.github.com/jquery-timepicker/
-
-requires jQuery 1.7+
-************************/
+/*!
+ * jquery-timepicker v1.11.4 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
+ * Copyright (c) 2015 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
+ * License: MIT
+ */
 
 
 (function (factory) {
-	if (typeof define === 'function' && define.amd) {
+    if (typeof exports === "object" && exports &&
+        typeof module === "object" && module && module.exports === exports) {
+        // Browserify. Attach to jQuery module.
+        factory(require("jquery"));
+    } else if (typeof define === 'function' && define.amd) {
 		// AMD. Register as an anonymous module.
 		define(['jquery'], factory);
 	} else {
@@ -15,28 +18,7 @@ requires jQuery 1.7+
 		factory(jQuery);
 	}
 }(function ($) {
-	var _baseDate = _generateBaseDate();
 	var _ONE_DAY = 86400;
-	var _defaults =	{
-		className: null,
-		minTime: null,
-		maxTime: null,
-		durationTime: null,
-		step: 30,
-		showDuration: false,
-		showOnFocus: true,
-		timeFormat: 'g:ia',
-		scrollDefault: null,
-		selectOnBlur: false,
-		disableTouchKeyboard: false,
-		forceRoundTime: false,
-		appendTo: 'body',
-		orientation: 'ltr',
-		disableTimeRanges: [],
-		closeOnWindowScroll: false,
-		typeaheadHighlight: true,
-		noneOption: false
-	};
 	var _lang = {
 		am: 'am',
 		pm: 'pm',
@@ -48,8 +30,7 @@ requires jQuery 1.7+
 		hrs: 'hrs'
 	};
 
-	var methods =
-	{
+	var methods = {
 		init: function(options)
 		{
 			return this.each(function()
@@ -58,13 +39,13 @@ requires jQuery 1.7+
 
 				// pick up settings from data attributes
 				var attributeOptions = [];
-				for (var key in _defaults) {
+				for (var key in $.fn.timepicker.defaults) {
 					if (self.data(key))  {
 						attributeOptions[key] = self.data(key);
 					}
 				}
 
-				var settings = $.extend({}, _defaults, attributeOptions, options);
+				var settings = $.extend({}, $.fn.timepicker.defaults, attributeOptions, options);
 
 				if (settings.lang) {
 					_lang = $.extend(_lang, settings.lang);
@@ -78,10 +59,17 @@ requires jQuery 1.7+
 					_render(self);
 				} else {
 					self.prop('autocomplete', 'off');
-					self.on('click.timepicker focus.timepicker', methods.show);
+					if (settings.showOn) {
+						for (var i in settings.showOn) {
+							self.on(settings.showOn[i]+'.timepicker', methods.show);
+						}
+					}
 					self.on('change.timepicker', _formatValue);
 					self.on('keydown.timepicker', _keydownhandler);
 					self.on('keyup.timepicker', _keyuphandler);
+					if (settings.disableTextInput) {
+						self.on('keydown.timepicker', _disableTextInputHandler);
+					}
 
 					_formatValue.call(self.get(0));
 				}
@@ -94,10 +82,6 @@ requires jQuery 1.7+
 			var settings = self.data('timepicker-settings');
 
 			if (e) {
-				if (!settings.showOnFocus) {
-					return true;
-				}
-
 				e.preventDefault();
 			}
 
@@ -124,10 +108,13 @@ requires jQuery 1.7+
 				list = self.data('timepicker-list');
 			}
 
-			if (list.is(':visible')) {
+			if (_isVisible(list)) {
 				return;
 			}
 
+			self.data('ui-timepicker-value', self.val());
+			_setSelected(self, list);
+
 			// make sure other pickers are hidden
 			methods.hide();
 
@@ -135,7 +122,7 @@ requires jQuery 1.7+
 			list.show();
 			var listOffset = {};
 
-			if (settings.orientation == 'rtl') {
+			if (settings.orientation.match(/r/)) {
 				// right-align the dropdown
 				listOffset.left = self.offset().left + self.outerWidth() - list.outerWidth() + parseInt(list.css('marginLeft').replace('px', ''), 10);
 			} else {
@@ -143,11 +130,24 @@ requires jQuery 1.7+
 				listOffset.left = self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10);
 			}
 
-			if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
+			var verticalOrientation;
+			if (settings.orientation.match(/t/)) {
+				verticalOrientation = 't';
+			} else if (settings.orientation.match(/b/)) {
+				verticalOrientation = 'b';
+			} else if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
+				verticalOrientation = 't';
+			} else {
+				verticalOrientation = 'b';
+			}
+
+			if (verticalOrientation == 't') {
 				// position the dropdown on top
+				list.addClass('ui-timepicker-positioned-top');
 				listOffset.top = self.offset().top - list.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10);
 			} else {
 				// put it under the input
+				list.removeClass('ui-timepicker-positioned-top');
 				listOffset.top = self.offset().top + self.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10);
 			}
 
@@ -157,10 +157,11 @@ requires jQuery 1.7+
 			var selected = list.find('.ui-timepicker-selected');
 
 			if (!selected.length) {
-				if (_getTimeValue(self)) {
-					selected = _findRow(self, list, _time2int(_getTimeValue(self)));
+				var timeInt = _time2int(_getTimeValue(self));
+				if (timeInt !== null) {
+					selected = _findRow(self, list, timeInt);
 				} else if (settings.scrollDefault) {
-					selected = _findRow(self, list, settings.scrollDefault);
+					selected = _findRow(self, list, settings.scrollDefault());
 				}
 			}
 
@@ -171,8 +172,18 @@ requires jQuery 1.7+
 				list.scrollTop(0);
 			}
 
+			// prevent scroll propagation
+			if(settings.stopScrollPropagation) {
+				$(document).on('wheel.ui-timepicker', '.ui-timepicker-wrapper', function(e){
+					e.preventDefault();
+					var currentScroll = $(this).scrollTop();
+					$(this).scrollTop(currentScroll + e.originalEvent.deltaY);
+				});
+			}
+
 			// attach close handlers
 			$(document).on('touchstart.ui-timepicker mousedown.ui-timepicker', _closeHandler);
+			$(window).on('resize.ui-timepicker', _closeHandler);
 			if (settings.closeOnWindowScroll) {
 				$(document).on('scroll.ui-timepicker', _closeHandler);
 			}
@@ -191,8 +202,12 @@ requires jQuery 1.7+
 				self.blur();
 			}
 
-			$('.ui-timepicker-wrapper:visible').each(function() {
+			$('.ui-timepicker-wrapper').each(function() {
 				var list = $(this);
+				if (!_isVisible(list)) {
+					return;
+				}
+
 				var self = list.data('timepicker-input');
 				var settings = self.data('timepicker-settings');
 
@@ -209,6 +224,10 @@ requires jQuery 1.7+
 
 		option: function(key, value)
 		{
+			if (typeof key == 'string' && typeof value == 'undefined') {
+				return $(this).data('timepicker-settings')[key];
+			}
+
 			return this.each(function(){
 				var self = $(this);
 				var settings = self.data('timepicker-settings');
@@ -216,12 +235,8 @@ requires jQuery 1.7+
 
 				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[key] = value;
 				}
 
 				settings = _parseSettings(settings);
@@ -253,12 +268,16 @@ requires jQuery 1.7+
 				return null;
 			}
 
+			var offset = _time2int(time_string);
+			if (offset === null) {
+				return null;
+			}
+
 			if (!relative_date) {
 				relative_date = new Date();
 			}
-			var offset = _time2int(time_string);
 
-			// construct a Date with today's date, and offset's time
+			// construct a Date from relative date, and offset's time
 			var time = new Date(relative_date);
 			time.setHours(offset / 3600);
 			time.setMinutes(offset % 3600 / 60);
@@ -268,10 +287,26 @@ requires jQuery 1.7+
 			return time;
 		},
 
+		isVisible: function() {
+			var self = this;
+			var list = self.data('timepicker-list');
+			return !!(list && _isVisible(list));
+		},
+
 		setTime: function(value)
 		{
 			var self = this;
-			var prettyTime = _int2time(_time2int(value), self.data('timepicker-settings').timeFormat);
+			var settings = self.data('timepicker-settings');
+
+			if (settings.forceRoundTime) {
+				var prettyTime = _roundAndFormatTime(_time2int(value), settings)
+			} else {
+				var prettyTime = _int2time(_time2int(value), settings);
+			}
+
+			if (value && prettyTime === null && settings.noneOption) {
+				prettyTime = value;
+			}
 
 			_setTimeValue(self, prettyTime);
 			if (self.data('timepicker-list')) {
@@ -313,6 +348,12 @@ requires jQuery 1.7+
 
 	// private methods
 
+	function _isVisible(elem)
+	{
+		var el = elem[0];
+		return el.offsetWidth > 0 && el.offsetHeight > 0;
+	}
+
 	function _parseSettings(settings)
 	{
 		if (settings.minTime) {
@@ -328,19 +369,26 @@ requires jQuery 1.7+
 		}
 
 		if (settings.scrollDefault == 'now') {
-			settings.scrollDefault = _time2int(new Date());
-		} else if (settings.scrollDefault) {
-			settings.scrollDefault = _time2int(settings.scrollDefault);
+			settings.scrollDefault = function() {
+				return settings.roundingFunction(_time2int(new Date()), settings);
+			}
+		} else if (settings.scrollDefault && typeof settings.scrollDefault != 'function') {
+			var val = settings.scrollDefault;
+			settings.scrollDefault = function() {
+				return settings.roundingFunction(_time2int(val), settings);
+			}
 		} else if (settings.minTime) {
-			settings.scrollDefault = settings.minTime;
+			settings.scrollDefault = function() {
+				return settings.roundingFunction(settings.minTime, settings);
+			}
 		}
 
-		if (settings.scrollDefault) {
-			settings.scrollDefault = _time2int(_roundTime(settings.scrollDefault, settings));
+		if ($.type(settings.timeFormat) === "string" && settings.timeFormat.match(/[gh]/)) {
+			settings._twelveHourTime = true;
 		}
 
-		if (settings.timeFormat.match(/[gh]/)) {
-			settings._twelveHourTime = true;
+		if (settings.showOnFocus === false && settings.showOn.indexOf('focus') != -1) {
+			settings.showOn.splice(settings.showOn.indexOf('focus'), 1);
 		}
 
 		if (settings.disableTimeRanges.length > 0) {
@@ -399,7 +447,7 @@ requires jQuery 1.7+
 
 			if ($.isArray(settings.noneOption)) {
 				for (var i in settings.noneOption) {
-					if (parseInt(i, 10) === i){
+					if (parseInt(i, 10) == i){
 						var noneElement = _generateNoneElement(settings.noneOption[i], settings.useSelect);
 						list.append(noneElement);
 					}
@@ -415,6 +463,7 @@ requires jQuery 1.7+
 		}
 
 		if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
+			var stepval = typeof settings.step == 'function' ? 'function' : settings.step;
 			wrapped_list.addClass('ui-timepicker-with-duration');
 			wrapped_list.addClass('ui-timepicker-step-'+settings.step);
 		}
@@ -428,12 +477,12 @@ requires jQuery 1.7+
 		var start = (settings.minTime !== null) ? settings.minTime : 0;
 		var end = (settings.maxTime !== null) ? settings.maxTime : (start + _ONE_DAY - 1);
 
-		if (end <= start) {
+		if (end < start) {
 			// make sure the end time is greater than start time, otherwise there will be no list to show
 			end += _ONE_DAY;
 		}
 
-		if (end === _ONE_DAY-1 && settings.timeFormat.indexOf('H') !== -1) {
+		if (end === _ONE_DAY-1 && $.type(settings.timeFormat) === "string" && settings.show2400) {
 			// show a 24:00 option when using military time
 			end = _ONE_DAY;
 		}
@@ -442,15 +491,23 @@ requires jQuery 1.7+
 		var drCur = 0;
 		var drLen = dr.length;
 
-		for (var i=start; i <= end; i += settings.step*60) {
+		var stepFunc = settings.step;
+		if (typeof stepFunc != 'function') {
+			stepFunc = function() {
+				return settings.step;
+			}
+		}
+
+		for (var i=start, j=0; i <= end; j++, i += stepFunc(j)*60) {
 			var timeInt = i;
-			var timeString = _int2time(timeInt, settings.timeFormat);
+			var timeString = _int2time(timeInt, settings);
 
 			if (settings.useSelect) {
 				var row = $('<option />', { 'value': timeString });
 				row.text(timeString);
 			} else {
 				var row = $('<li />');
+				row.addClass(timeInt % 86400 < 43200 ? 'ui-timepicker-am' : 'ui-timepicker-pm');
 				row.data('time', (timeInt <= 86400 ? timeInt : timeInt % 86400));
 				row.text(timeString);
 			}
@@ -487,7 +544,10 @@ requires jQuery 1.7+
 		self.data('timepicker-list', wrapped_list);
 
 		if (settings.useSelect) {
-			list.val(_roundTime(self.val(), settings));
+			if (self.val()) {
+				list.val(_roundAndFormatTime(_time2int(self.val()), settings));
+			}
+
 			list.on('focus', function(){
 				$(this).data('timepicker-input').trigger('showTimepicker');
 			});
@@ -498,6 +558,7 @@ requires jQuery 1.7+
 				_setTimeValue(self, $(this).val(), 'select');
 			});
 
+			_setTimeValue(self, list.val(), 'initial');
 			self.hide().after(list);
 		} else {
 			var appendTo = settings.appendTo;
@@ -509,7 +570,7 @@ requires jQuery 1.7+
 			appendTo.append(wrapped_list);
 			_setSelected(self, list);
 
-			list.on('mousedown', 'li', function(e) {
+			list.on('mousedown click', 'li', function(e) {
 
 				// hack: temporarily disable the focus handler
 				// to deal with the fact that IE fires 'focus'
@@ -530,7 +591,11 @@ requires jQuery 1.7+
 
 				if (_selectValue(self)) {
 					self.trigger('hideTimepicker');
-					wrapped_list.hide();
+
+					list.on('mouseup.timepicker click.timepicker', 'li', function(e) {
+						list.off('mouseup.timepicker click.timepicker');
+						wrapped_list.hide();
+					});
 				}
 			});
 		}
@@ -560,39 +625,36 @@ requires jQuery 1.7+
 			return $('<li />', {
 					'class': className,
 					'text': label
-				}).data('time', value);
+				}).data('time', String(value));
 		}
 	}
 
-	function _roundTime(time, settings)
+	function _roundAndFormatTime(seconds, settings)
 	{
-		if (!$.isNumeric(time)) {
-			time = _time2int(time);
-		}
-
-		if (time === null) {
-			return null;
-		} else {
-			var step = settings.step*60;
-			// round to the nearest step
-			return _int2time(Math.round(time / step) * step, settings.timeFormat);
+		seconds = settings.roundingFunction(seconds, settings);
+		if (seconds !== null) {
+			return _int2time(seconds, settings);
 		}
 	}
 
-	function _generateBaseDate()
-	{
-		return new Date(1970, 1, 1, 0, 0, 0);
-	}
-
 	// event handler to decide whether to close timepicker
 	function _closeHandler(e)
 	{
+		if (e.target == window) {
+			// mobile Chrome fires focus events against window for some reason
+			return;
+		}
+
 		var target = $(e.target);
-		var input = target.closest('.ui-timepicker-input');
-		if (input.length === 0 && target.closest('.ui-timepicker-wrapper').length === 0) {
-			methods.hide();
-			$(document).unbind('.ui-timepicker');
+
+		if (target.closest('.ui-timepicker-input').length || target.closest('.ui-timepicker-wrapper').length) {
+			// active timepicker was focused. ignore
+			return;
 		}
+
+		methods.hide();
+		$(document).unbind('.ui-timepicker');
+		$(window).unbind('.ui-timepicker');
 	}
 
 	function _hideKeyboard(self)
@@ -609,7 +671,7 @@ requires jQuery 1.7+
 
 		var settings = self.data('timepicker-settings');
 		var out = false;
-		var halfStep = settings.step*30;
+		var value = settings.roundingFunction(value, settings);
 
 		// loop through the menu items
 		list.find('li').each(function(i, obj) {
@@ -618,10 +680,7 @@ requires jQuery 1.7+
 				return;
 			}
 
-			var offset = jObj.data('time') - value;
-
-			// check if the value is less than half a step from each row
-			if (Math.abs(offset) < halfStep || offset == halfStep) {
+			if (jObj.data('time') == value) {
 				out = jObj;
 				return false;
 			}
@@ -653,32 +712,30 @@ requires jQuery 1.7+
 	}
 
 
-	function _formatValue(e)
+	function _formatValue(e, origin)
 	{
-		if (this.value === '') {
+		if (this.value === '' || origin == 'timepicker') {
 			return;
 		}
 
 		var self = $(this);
-		var list = self.data('timepicker-list');
 
 		if (self.is(':focus') && (!e || e.type != 'change')) {
 			return;
 		}
 
-		var seconds = _time2int(this.value);
+		var settings = self.data('timepicker-settings');
+		var seconds = _time2int(this.value, settings);
 
 		if (seconds === null) {
 			self.trigger('timeFormatError');
 			return;
 		}
 
-		var settings = self.data('timepicker-settings');
 		var rangeError = false;
 		// check that the time in within bounds
-		if (settings.minTime !== null && seconds < settings.minTime) {
-			rangeError = true;
-		} else if (settings.maxTime !== null && seconds > settings.maxTime) {
+		if ((settings.minTime !== null && settings.maxTime !== null)
+			&& (seconds < settings.minTime || seconds > settings.maxTime)) {
 			rangeError = true;
 		}
 
@@ -691,18 +748,10 @@ requires jQuery 1.7+
 		});
 
 		if (settings.forceRoundTime) {
-			var offset = seconds % (settings.step*60); // step is in minutes
-
-			if (offset >= settings.step*30) {
-				// if offset is larger than a half step, round up
-				seconds += (settings.step*60) - offset;
-			} else {
-				// round down
-				seconds -= offset;
-			}
+			seconds = settings.roundingFunction(seconds, settings);
 		}
 
-		var prettyTime = _int2time(seconds, settings.timeFormat);
+		var prettyTime = _int2time(seconds, settings);
 
 		if (rangeError) {
 			if (_setTimeValue(self, prettyTime, 'error')) {
@@ -729,15 +778,15 @@ requires jQuery 1.7+
 			self.val(value);
 
 			var settings = self.data('timepicker-settings');
-			if (settings.useSelect) {
-				self.data('timepicker-list').val(_roundTime(value, settings));
+			if (settings.useSelect && source != 'select' && source != 'initial') {
+				self.data('timepicker-list').val(_roundAndFormatTime(_time2int(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');
+				self.trigger('selectTime').trigger('changeTime').trigger('change', 'timepicker');
 			} else if (source != 'error') {
 				self.trigger('changeTime');
 			}
@@ -749,6 +798,21 @@ requires jQuery 1.7+
 		}
 	}
 
+	/*
+	*  Filter freeform input
+	*/
+	function _disableTextInputHandler(e)
+	{
+		switch (e.keyCode) {
+			case 13: // return
+			case 9: //tab
+				return;
+
+			default:
+				e.preventDefault();
+		}
+	}
+
 	/*
 	*  Keyboard navigation via arrow keys
 	*/
@@ -757,7 +821,7 @@ requires jQuery 1.7+
 		var self = $(this);
 		var list = self.data('timepicker-list');
 
-		if (!list || !list.is(':visible')) {
+		if (!list || !_isVisible(list)) {
 			if (e.keyCode == 40) {
 				// show the list!
 				methods.show.call(self.get(0));
@@ -774,6 +838,7 @@ requires jQuery 1.7+
 
 			case 13: // return
 				if (_selectValue(self)) {
+					_formatValue.call(self.get(0), {'type':'change'});
 					methods.hide.apply(this);
 				}
 
@@ -847,13 +912,9 @@ requires jQuery 1.7+
 	{
 		var self = $(this);
 		var list = self.data('timepicker-list');
+		var settings = self.data('timepicker-settings');
 
-		if (!list || !list.is(':visible')) {
-			return true;
-		}
-
-		if (!self.data('timepicker-settings').typeaheadHighlight) {
-			list.find('li').removeClass('ui-timepicker-selected');
+		if (!list || !_isVisible(list) || settings.disableTextInput) {
 			return true;
 		}
 
@@ -885,12 +946,12 @@ requires jQuery 1.7+
 			case 186: // colon
 			case 8: // backspace
 			case 46: // delete
-				_setSelected(self, list);
+				if (settings.typeaheadHighlight) {
+					_setSelected(self, list);
+				} else {
+					list.hide();
+				}
 				break;
-
-			default:
-				// list.find('li').removeClass('ui-timepicker-selected');
-				return;
 		}
 	}
 
@@ -912,15 +973,13 @@ requires jQuery 1.7+
 		}
 
 		if (timeValue !== null) {
-			if (typeof timeValue == 'string') {
-				self.val(timeValue);
-			} else {
-				var timeString = _int2time(timeValue, settings.timeFormat);
-				_setTimeValue(self, timeString, 'select');
+			if (typeof timeValue != 'string') {
+				timeValue = _int2time(timeValue, settings);
 			}
+
+			_setTimeValue(self, timeValue, 'select');
 		}
 
-		//self.trigger('change').trigger('selectTime');
 		return true;
 	}
 
@@ -957,24 +1016,31 @@ requires jQuery 1.7+
 		return duration.join(' ');
 	}
 
-	function _int2time(seconds, format)
+	function _int2time(timeInt, settings)
 	{
-		if (seconds === null) {
-			return;
+		if (typeof timeInt != 'number') {
+			return null;
 		}
 
-		var time = new Date(_baseDate.valueOf() + (seconds*1000));
+		var seconds = parseInt(timeInt%60)
+			, minutes = parseInt((timeInt/60)%60)
+			, hours = parseInt((timeInt/(60*60))%24);
+
+		var time = new Date(1970, 0, 2, hours, minutes, seconds, 0);
 
 		if (isNaN(time.getTime())) {
-			return;
+			return null;
+		}
+
+		if ($.type(settings.timeFormat) === "function") {
+			return settings.timeFormat(time);
 		}
 
 		var output = '';
 		var hour, code;
+		for (var i=0; i<settings.timeFormat.length; i++) {
 
-		for (var i=0; i<format.length; i++) {
-
-			code = format.charAt(i);
+			code = settings.timeFormat.charAt(i);
 			switch (code) {
 
 				case 'a':
@@ -991,7 +1057,9 @@ requires jQuery 1.7+
 					break;
 
 				case 'G':
-					output += time.getHours();
+					hour = time.getHours();
+					if (timeInt === _ONE_DAY) hour = settings.show2400 ? 24 : 0;
+					output += hour;
 					break;
 
 				case 'h':
@@ -1006,7 +1074,7 @@ requires jQuery 1.7+
 
 				case 'H':
 					hour = time.getHours();
-					if (seconds === _ONE_DAY) hour = 24;
+					if (timeInt === _ONE_DAY) hour = settings.show2400 ? 24 : 0;
 					output += (hour > 9) ? hour : '0'+hour;
 					break;
 
@@ -1020,6 +1088,12 @@ requires jQuery 1.7+
 					output += (seconds > 9) ? seconds : '0'+seconds;
 					break;
 
+				case '\\':
+					// escape character; add the next character and skip ahead
+					i++;
+					output += settings.timeFormat.charAt(i);
+					break;
+
 				default:
 					output += code;
 			}
@@ -1030,59 +1104,70 @@ requires jQuery 1.7+
 
 	function _time2int(timeString, settings)
 	{
-		if (timeString === '') return null;
-		if (!timeString || timeString+0 == timeString) return timeString;
-
-		if (typeof(timeString) == 'object') {
-			timeString = timeString.getHours()+':'+_pad2(timeString.getMinutes())+':'+_pad2(timeString.getSeconds());
+		if (timeString === '' || timeString === null) return null;
+		if (typeof timeString == 'object') {
+			return timeString.getHours()*3600 + timeString.getMinutes()*60 + timeString.getSeconds();
+		}
+		if (typeof timeString != 'string') {
+			return timeString;
 		}
 
-		timeString = timeString.toLowerCase();
+		timeString = timeString.toLowerCase().replace(/[\s\.]/g, '');
 
-		var d = new Date(0);
-		var time;
+		// if the last character is an "a" or "p", add the "m"
+		if (timeString.slice(-1) == 'a' || timeString.slice(-1) == 'p') {
+			timeString += 'm';
+		}
 
-		// 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?$/);
+		var ampmRegex = '(' +
+			_lang.am.replace('.', '')+'|' +
+			_lang.pm.replace('.', '')+'|' +
+			_lang.AM.replace('.', '')+'|' +
+			_lang.PM.replace('.', '')+')?';
 
-			if (!time) {
-				time = timeString.match(/^([0-2][0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)m?$/);
-			}
-		} else {
-			time = timeString.match(/^(\d{1,2})(?::([0-5][0-9]))?(?::([0-5][0-9]))?\s*([pa]?)m?$/);
-		}
+		// try to parse time input
+		var pattern = new RegExp('^'+ampmRegex+'([0-9]?[0-9])\\W?([0-5][0-9])?\\W?([0-5][0-9])?'+ampmRegex+'$');
 
+		var time = timeString.match(pattern);
 		if (!time) {
 			return null;
 		}
 
-		var hour = parseInt(time[1]*1, 10);
-		var ampm = time[4];
+		var hour = parseInt(time[2]*1, 10);
+		if (hour > 24) {
+			if (settings && settings.wrapHours === false) {
+				return null;
+			} else {
+				hour = hour % 24;
+			}
+		}
+
+		var ampm = time[1] || time[5];
 		var hours = hour;
 
-		if (ampm) {
+		if (hour <= 12 && ampm) {
+			var isPm = (ampm == _lang.pm || ampm == _lang.PM);
+
 			if (hour == 12) {
-				hours = (time[4] == 'p') ? 12 : 0;
+				hours = isPm ? 12 : 0;
 			} else {
-				hours = (hour + (time[4] == 'p' ? 12 : 0));
+				hours = (hour + (isPm ? 12 : 0));
 			}
 		}
 
-		var minutes = ( time[2]*1 || 0 );
-		var seconds = ( time[3]*1 || 0 );
+		var minutes = ( time[3]*1 || 0 );
+		var seconds = ( time[4]*1 || 0 );
 		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 (hour < 12 && !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
+		return timeInt;
 	}
 
 	function _pad2(n) {
@@ -1103,4 +1188,55 @@ 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"); }
 	};
+	// Global defaults
+	$.fn.timepicker.defaults = {
+		appendTo: 'body',
+		className: null,
+		closeOnWindowScroll: false,
+		disableTextInput: false,
+		disableTimeRanges: [],
+		disableTouchKeyboard: false,
+		durationTime: null,
+		forceRoundTime: false,
+		maxTime: null,
+		minTime: null,
+		noneOption: false,
+		orientation: 'l',
+		roundingFunction: function(seconds, settings) {
+			if (seconds === null) {
+				return null;
+			} else if (typeof settings.step !== "number") {
+				// TODO: nearest fit irregular steps
+				return seconds;
+			} else {
+				var offset = seconds % (settings.step*60); // step is in minutes
+
+				if (offset >= settings.step*30) {
+					// if offset is larger than a half step, round up
+					seconds += (settings.step*60) - offset;
+				} else {
+					// round down
+					seconds -= offset;
+				}
+
+				if (seconds == _ONE_DAY && settings.show2400) {
+					return seconds;
+				}
+
+				return seconds%_ONE_DAY;
+			}
+		},
+		scrollDefault: null,
+		selectOnBlur: false,
+		show2400: false,
+		showDuration: false,
+		showOn: ['click', 'focus'],
+		showOnFocus: true,
+		step: 30,
+		stopScrollPropagation: false,
+		timeFormat: 'g:ia',
+		typeaheadHighlight: true,
+		useSelect: false,
+		wrapHours: true
+	};
 }));

From 2c8dfbfe717e34e9107be53ac51c3a1835fa1272 Mon Sep 17 00:00:00 2001
From: Justin Tomich <tomichj@gmail.com>
Date: Tue, 20 Sep 2016 17:03:08 -0700
Subject: [PATCH 30/33] updated readme

noted Datepair.js is now a separate file.
added require for Datepair
added link to Datepair project
---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c20b47..a1f15e5 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # jQuery timepicker for Rails
 [![Gem Version](https://badge.fury.io/rb/jquery-timepicker-rails.png)](http://badge.fury.io/rb/jquery-timepicker-rails)
 
-jquery-timepicker packaged for the Rails 3.1+ asset pipeline.
-Check [jquery-timepicker project home page](http://github.com/jonthornton/jquery-timepicker).
+jquery-timepicker and Datepair.js packaged for the Rails 3.1+ asset pipeline.
+See the [jquery-timepicker project home page](http://github.com/jonthornton/jquery-timepicker) and the [Datepair.js home page](https://github.com/jonthornton/Datepair.js).
 
 ## Installation
 
@@ -28,13 +28,13 @@ Add the following stylesheet file to `app/assets/stylesheets/application.css`:
 
     *= require jquery.timepicker.css
 
-Optionally, you can also use `jquery.datepair.js`:
+You can also include `Datepair.js`, and optionally it's accompanying jquery plugin, `jquery.datepair.js`:
 
+    //= require Datepair
     //= require jquery.datepair.js
 
-Most people will prefer to copy-paste this file in order to customize it.
-
-jquery-timepicker depends on jQuery and [bootstrap-datepicker](http://github.com/eternicode/bootstrap-datepicker) or [jQuery UI Datepicker](http://jqueryui.com/demos/datepicker/).
+Datepair.js depends on [bootstrap-datepicker](http://github.com/eternicode/bootstrap-datepicker) or [jQuery UI Datepicker](http://jqueryui.com/demos/datepicker/).
+jquery-timepicker depends on `jQuery`.
 
 ## License
 

From b1608f94e87f957d16fcea246a6d5ad6f2db3f1f Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Wed, 22 Mar 2017 12:39:10 +0100
Subject: [PATCH 31/33] Update Datepair to version 0.4.15

---
 vendor/assets/javascripts/Datepair.js        | 654 ++++++++++---------
 vendor/assets/javascripts/jquery.datepair.js |  13 +-
 2 files changed, 346 insertions(+), 321 deletions(-)
 mode change 100755 => 100644 vendor/assets/javascripts/Datepair.js
 mode change 100755 => 100644 vendor/assets/javascripts/jquery.datepair.js

diff --git a/vendor/assets/javascripts/Datepair.js b/vendor/assets/javascripts/Datepair.js
old mode 100755
new mode 100644
index 471a3c8..e57da6a
--- a/vendor/assets/javascripts/Datepair.js
+++ b/vendor/assets/javascripts/Datepair.js
@@ -1,347 +1,361 @@
-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];
+/*!
+ * datepair.js v0.4.15 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
+ * Copyright (c) 2016 Jon Thornton - http://jonthornton.github.com/Datepair.js
+ * License: MIT
+ */
+
+(function(window, document) {
+
+	'use strict';
+
+	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;
 	}
-
-	return out;
-}
-
-// IE's custom event support is totally borked.
-// Use jQuery if possible
-function triggerSimpleCustomEvent(el, eventName) {
-	if (jq) {
-		jq(el).trigger(eventName);
-	} else {
-		var event = document.createEvent('CustomEvent');
-		event.initCustomEvent(eventName, true, true, {});
-		el.dispatchEvent(event);
+	
+	// IE's custom event support is totally borked.
+	// Use jQuery if possible
+	function triggerSimpleCustomEvent(el, eventName) {
+		if (jq) {
+			jq(el).trigger(eventName);
+		} else {
+			var event = document.createEvent('CustomEvent');
+			event.initCustomEvent(eventName, true, true, {});
+			el.dispatchEvent(event);
+		}
 	}
-}
-
-// el.classList not supported by < IE10
-// use jQuery if available
-function hasClass(el, className) {
-	if (jq) {
-		return jq(el).hasClass(className);
-	} else {
-		return el.classList.contains(className);
+	
+	// el.classList not supported by < IE10
+	// use jQuery if available
+	function hasClass(el, className) {
+		if (jq) {
+			return jq(el).hasClass(className);
+		} else {
+			return el.classList.contains(className);
+		}
 	}
-}
-
-function Datepair(container, options) {
-	this.dateDelta = null;
-	this.timeDelta = null;
-	this._defaults =	{
-		startClass: 'start',
-		endClass: 'end',
-		timeClass: 'time',
-		dateClass: 'date',
-		defaultDateDelta: 0,
-		defaultTimeDelta: 3600000,
-		anchor: 'start',
-
-		// defaults for jquery-timepicker; override when using other input widgets
-		parseTime: function(input){
-			return jq(input).timepicker('getTime');
+	
+	function Datepair(container, options) {
+		this.dateDelta = null;
+		this.timeDelta = null;
+		this._defaults =	{
+			startClass: 'start',
+			endClass: 'end',
+			timeClass: 'time',
+			dateClass: 'date',
+			defaultDateDelta: 0,
+			defaultTimeDelta: 3600000,
+			anchor: 'start',
+	
+			// defaults for jquery-timepicker; override when using other input widgets
+			parseTime: function(input){
+				return jq(input).timepicker('getTime');
+			},
+			updateTime: function(input, dateObj){
+				jq(input).timepicker('setTime', dateObj);
+			},
+			setMinTime: function(input, dateObj){
+				jq(input).timepicker('option', 'minTime', dateObj);
+			},
+	
+			// defaults for bootstrap datepicker; override when using other input widgets
+			parseDate: function(input){
+				return input.value && jq(input).datepicker('getDate');
+			},
+			updateDate: function(input, dateObj){
+				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
+		this.refresh();
+	
+		// init starts here
+		this._bindChangeHandler();
+	}
+	
+	Datepair.prototype = {
+		constructor: Datepair,
+	
+		option: function(key, value)
+		{
+			if (typeof key == 'object') {
+				this.settings = simpleExtend(this.settings, key);
+	
+			} else if (typeof key == 'string' && typeof value != 'undefined') {
+				this.settings[key] = value;
+	
+			} else if (typeof key == 'string') {
+				return this.settings[key];
+			}
+	
+			this._updateEndMintime();
 		},
-		updateTime: function(input, dateObj){
-			jq(input).timepicker('setTime', dateObj);
+	
+		getTimeDiff: function()
+		{
+			// due to the fact that times can wrap around, timeDiff for any
+			// time-only pair will always be >= 0
+			var delta = this.dateDelta + this.timeDelta;
+			if (delta < 0 && (!this.startDateInput || !this.endDateInput) ) {
+				delta += _ONE_DAY;
+			}
+	
+			return delta;
 		},
-		setMinTime: function(input, dateObj){
-			jq(input).timepicker('option', 'minTime', dateObj);
+	
+		refresh: function()
+		{
+			if (this.startDateInput && this.startDateInput.value && this.endDateInput && this.endDateInput.value) {
+				var startDate = this.settings.parseDate(this.startDateInput);
+				var endDate = this.settings.parseDate(this.endDateInput);
+				if (startDate && endDate) {
+					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);
+				if (startTime && endTime) {
+					this.timeDelta = endTime.getTime() - startTime.getTime();
+					this._updateEndMintime();
+				}
+			}
 		},
-
-		// defaults for bootstrap datepicker; override when using other input widgets
-		parseDate: function(input){
-			return input.value && jq(input).datepicker('getDate');
+	
+		remove: function()
+		{
+			this._unbindChangeHandler();
 		},
-		updateDate: function(input, dateObj){
-			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
-	this.refresh();
-
-	// init starts here
-	this._bindChangeHandler();
-}
-
-Datepair.prototype = {
-	constructor: Datepair,
-
-	option: function(key, value)
-	{
-		if (typeof key == 'object') {
-			this.settings = simpleExtend(this.settings, key);
-
-		} else if (typeof key == 'string' && typeof value != 'undefined') {
-			this.settings[key] = value;
-
-		} else if (typeof key == 'string') {
-			return this.settings[key];
-		}
-
-		this._updateEndMintime();
-	},
-
-	getTimeDiff: function()
-	{
-		// due to the fact that times can wrap around, timeDiff for any
-		// time-only pair will always be >= 0
-		var delta = this.dateDelta + this.timeDelta;
-		if (delta < 0 && (!this.startDateInput || !this.endDateInput) ) {
-			delta += _ONE_DAY;
-		}
-
-		return delta;
-	},
-
-	refresh: function()
-	{
-		if (this.startDateInput && this.startDateInput.value && this.endDateInput && this.endDateInput.value) {
+	
+		_bindChangeHandler: function(){
+			// addEventListener doesn't work with synthetic "change" events
+			// fired by jQuery's trigger() functioin. If jQuery is present,
+			// use that for event binding
+			if (jq) {
+				jq(this.container).on('change.datepair', jq.proxy(this.handleEvent, this));
+			} else {
+				this.container.addEventListener('change', this, false);
+			}
+		},
+	
+		_unbindChangeHandler: function(){
+			if (jq) {
+				jq(this.container).off('change.datepair');
+			} else {
+				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);
+					this._timeChanged(e.target);
+				} else {
+					this.dateDelta = null;
+				}
+	
+			} else if (hasClass(e.target, this.settings.timeClass)) {
+				if (e.target.value != '') {
+					this._timeChanged(e.target);
+				} else {
+					this.timeDelta = null;
+				}
+			}
+	
+			this._validateRanges();
+			this._updateEndMintime();
+			this._bindChangeHandler();
+		},
+	
+		_dateChanged: function(target){
+			if (!this.startDateInput || !this.endDateInput) {
+				return;
+			}
+	
 			var startDate = this.settings.parseDate(this.startDateInput);
 			var endDate = this.settings.parseDate(this.endDateInput);
-			if (startDate && endDate) {
-				this.dateDelta = endDate.getTime() - startDate.getTime();
+	
+			if (!startDate || !endDate) {
+				if (this.settings.defaultDateDelta !== null) {
+					if (startDate) {
+						var newEnd = new Date(startDate.getTime() + this.settings.defaultDateDelta * _ONE_DAY);
+						this.settings.updateDate(this.endDateInput, newEnd);
+	
+					} else if (endDate) {
+						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;
 			}
-		}
-		if (this.startTimeInput && this.startTimeInput.value && this.endTimeInput && this.endTimeInput.value) {
+	
+			if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
+				var newDate = new Date(startDate.getTime() + this.dateDelta);
+				this.settings.updateDate(this.endDateInput, newDate);
+			} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
+				var newDate = new Date(endDate.getTime() - this.dateDelta);
+				this.settings.updateDate(this.startDateInput, newDate);
+			} else {
+				if (endDate < startDate) {
+					var otherInput = hasClass(target, this.settings.startClass) ? this.endDateInput : this.startDateInput;
+					var selectedDate = this.settings.parseDate(target);
+					this.dateDelta = 0;
+					this.settings.updateDate(otherInput, selectedDate);
+				} else {
+					this.dateDelta = endDate.getTime() - startDate.getTime();
+				}
+			}
+		},
+	
+		_timeChanged: function(target){
+			if (!this.startTimeInput || !this.endTimeInput) {
+				return;
+			}
+	
 			var startTime = this.settings.parseTime(this.startTimeInput);
 			var endTime = this.settings.parseTime(this.endTimeInput);
-			if (startTime && endTime) {
-				this.timeDelta = endTime.getTime() - startTime.getTime();
-				this._updateEndMintime();
+	
+			if (!startTime || !endTime) {
+				if (this.settings.defaultTimeDelta !== null) {
+					if (startTime) {
+						var newEnd = new Date(startTime.getTime() + this.settings.defaultTimeDelta);
+						this.settings.updateTime(this.endTimeInput, newEnd);
+					} else if (endTime) {
+						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;
 			}
-		}
-	},
-
-	remove: function()
-	{
-		this._unbindChangeHandler();
-	},
-
-	_bindChangeHandler: function(){
-		// addEventListener doesn't work with synthetic "change" events
-		// fired by jQuery's trigger() functioin. If jQuery is present,
-		// use that for event binding
-		if (jq) {
-			jq(this.container).on('change.datepair', jq.proxy(this.handleEvent, this));
-		} else {
-			this.container.addEventListener('change', this, false);
-		}
-	},
-
-	_unbindChangeHandler: function(){
-		if (jq) {
-			jq(this.container).off('change.datepair');
-		} else {
-			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);
-				this._timeChanged(e.target);
+	
+			if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
+				var newTime = new Date(startTime.getTime() + this.timeDelta);
+				this.settings.updateTime(this.endTimeInput, newTime);
+				endTime = this.settings.parseTime(this.endTimeInput);
+	
+				this._doMidnightRollover(startTime, endTime);
+			} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
+				var newTime = new Date(endTime.getTime() - this.timeDelta);
+				this.settings.updateTime(this.startTimeInput, newTime);
+				startTime = this.settings.parseTime(this.startTimeInput);
+	
+				this._doMidnightRollover(startTime, endTime);
 			} else {
-				this.dateDelta = null;
+				this._doMidnightRollover(startTime, endTime);
+	
+				var startDate, endDate;
+				if (this.startDateInput && this.endDateInput) {
+					startDate = this.settings.parseDate(this.startDateInput);
+					endDate = this.settings.parseDate(this.endDateInput);
+				}
+	
+				if ((+startDate == +endDate) && (endTime < startTime)) {
+					var thisInput  = hasClass(target, this.settings.endClass) ? this.endTimeInput : this.startTimeInput;
+					var otherInput = hasClass(target, this.settings.startClass) ? this.endTimeInput : this.startTimeInput;
+					var selectedTime = this.settings.parseTime(thisInput);
+					this.timeDelta = 0;
+					this.settings.updateTime(otherInput, selectedTime);
+				} else {
+					this.timeDelta = endTime.getTime() - startTime.getTime();
+				}
 			}
-
-		} else if (hasClass(e.target, this.settings.timeClass)) {
-			if (e.target.value != '') {
-				this._timeChanged(e.target);
-			} else {
-				this.timeDelta = null;
+	
+	
+		},
+	
+		_doMidnightRollover: function(startTime, endTime) {
+			if (!this.startDateInput || !this.endDateInput) {
+				return;
 			}
-		}
-
-		this._validateRanges();
-		this._updateEndMintime();
-		this._bindChangeHandler();
-	},
-
-	_dateChanged: function(target){
-		if (!this.startDateInput || !this.endDateInput) {
-			return;
-		}
-
-		var startDate = this.settings.parseDate(this.startDateInput);
-		var endDate = this.settings.parseDate(this.endDateInput);
-
-		if (!startDate || !endDate) {
-			if (this.settings.defaultDateDelta !== null) {
-				if (startDate) {
-					var newEnd = new Date(startDate.getTime() + this.settings.defaultDateDelta * _ONE_DAY);
-					this.settings.updateDate(this.endDateInput, newEnd);
-
-				} else if (endDate) {
-					var newStart = new Date(endDate.getTime() - this.settings.defaultDateDelta * _ONE_DAY);
-					this.settings.updateDate(this.startDateInput, newStart);
+	
+			var endDate = this.settings.parseDate(this.endDateInput);
+			var startDate = this.settings.parseDate(this.startDateInput);
+			var newDelta = endTime.getTime() - startTime.getTime();
+			var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
+	
+			if (this.dateDelta !== null
+					&& this.dateDelta + this.timeDelta <= _ONE_DAY
+					&& this.dateDelta + newDelta != 0
+					&& (offset > 0 || this.dateDelta != 0)
+					&& ((newDelta >= 0 && this.timeDelta < 0) || (newDelta < 0 && this.timeDelta >= 0))) {
+	
+				if (this.settings.anchor == 'start') {
+					this.settings.updateDate(this.endDateInput, new Date(endDate.getTime() + offset));
+					this._dateChanged(this.endDateInput);
+				} else if (this.settings.anchor == 'end') {
+					this.settings.updateDate(this.startDateInput, new Date(startDate.getTime() - offset));
+					this._dateChanged(this.startDateInput);
 				}
-
-				this.dateDelta = this.settings.defaultDateDelta * _ONE_DAY;
-			} else {
-				this.dateDelta = null;
 			}
-
-			return;
-		}
-
-		if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
-			var newDate = new Date(startDate.getTime() + this.dateDelta);
-			this.settings.updateDate(this.endDateInput, newDate);
-		} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
-			var newDate = new Date(endDate.getTime() - this.dateDelta);
-			this.settings.updateDate(this.startDateInput, newDate);
-		} else {
-			if (endDate < startDate) {
-				var otherInput = hasClass(target, this.settings.startClass) ? this.endDateInput : this.startDateInput;
-				var selectedDate = this.settings.parseDate(target);
-				this.dateDelta = 0;
-				this.settings.updateDate(otherInput, selectedDate);
-			} else {
-				this.dateDelta = endDate.getTime() - startDate.getTime();
+			this.timeDelta = newDelta;
+		},
+	
+		_updateEndMintime: function(){
+			if (typeof this.settings.setMinTime != 'function') return;
+	
+			var baseTime = null;
+			if (this.settings.anchor == 'start' && (!this.dateDelta || this.dateDelta < _ONE_DAY || (this.timeDelta && this.dateDelta + this.timeDelta < _ONE_DAY))) {
+				baseTime = this.settings.parseTime(this.startTimeInput);
 			}
-		}
-	},
-
-	_timeChanged: function(target){
-		if (!this.startTimeInput || !this.endTimeInput) {
-			return;
-		}
-
-		var startTime = this.settings.parseTime(this.startTimeInput);
-		var endTime = this.settings.parseTime(this.endTimeInput);
-
-		if (!startTime || !endTime) {
-			if (this.settings.defaultTimeDelta !== null) {
-				if (startTime) {
-					var newEnd = new Date(startTime.getTime() + this.settings.defaultTimeDelta);
-					this.settings.updateTime(this.endTimeInput, newEnd);
-				} else if (endTime) {
-					var newStart = new Date(endTime.getTime() - this.settings.defaultTimeDelta);
-					this.settings.updateTime(this.startTimeInput, newStart);
-				}
-
-				this.timeDelta = this.settings.defaultTimeDelta;
-			} else {
-				this.timeDelta = null;
+	
+			this.settings.setMinTime(this.endTimeInput, baseTime);
+		},
+	
+		_validateRanges: function(){
+			if (this.startTimeInput && this.endTimeInput && this.timeDelta === null) {
+				triggerSimpleCustomEvent(this.container, 'rangeIncomplete');
+				return;
 			}
-
-			return;
-		}
-
-		if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
-			var newTime = new Date(startTime.getTime() + this.timeDelta);
-			this.settings.updateTime(this.endTimeInput, newTime);
-			endTime = this.settings.parseTime(this.endTimeInput);
-
-			this._doMidnightRollover(startTime, endTime);
-		} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
-			var newTime = new Date(endTime.getTime() - this.timeDelta);
-			this.settings.updateTime(this.startTimeInput, newTime);
-			startTime = this.settings.parseTime(this.startTimeInput);
-
-			this._doMidnightRollover(startTime, endTime);
-		} else {
-			this._doMidnightRollover(startTime, endTime);
-
-			var startDate, endDate;
-			if (this.startDateInput && this.endDateInput) {
-				startDate = this.settings.parseDate(this.startDateInput);
-				endDate = this.settings.parseDate(this.endDateInput);
+	
+			if (this.startDateInput && this.endDateInput && this.dateDelta === null) {
+				triggerSimpleCustomEvent(this.container, 'rangeIncomplete');
+				return;
 			}
-
-			if ((+startDate == +endDate) && (endTime < startTime)) {
-				var thisInput  = hasClass(target, this.settings.endClass) ? this.endTimeInput : this.startTimeInput;
-				var otherInput = hasClass(target, this.settings.startClass) ? this.endTimeInput : this.startTimeInput;
-				var selectedTime = this.settings.parseTime(thisInput);
-				this.timeDelta = 0;
-				this.settings.updateTime(otherInput, selectedTime);
+	
+			// due to the fact that times can wrap around, any time-only pair will be considered valid
+			if (!this.startDateInput || !this.endDateInput || this.dateDelta + this.timeDelta >= 0) {
+				triggerSimpleCustomEvent(this.container, 'rangeSelected');
 			} else {
-				this.timeDelta = endTime.getTime() - startTime.getTime();
-			}
-		}
-
-
-	},
-
-	_doMidnightRollover: function(startTime, endTime) {
-		if (!this.startDateInput || !this.endDateInput) {
-			return;
-		}
-
-		var endDate = this.settings.parseDate(this.endDateInput);
-		var startDate = this.settings.parseDate(this.startDateInput);
-		var newDelta = endTime.getTime() - startTime.getTime();
-		var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
-
-		if (this.dateDelta !== null
-				&& this.dateDelta + this.timeDelta <= _ONE_DAY
-				&& this.dateDelta + newDelta != 0
-				&& (offset > 0 || this.dateDelta != 0)
-				&& ((newDelta >= 0 && this.timeDelta < 0) || (newDelta < 0 && this.timeDelta >= 0))) {
-
-			if (this.settings.anchor == 'start') {
-				this.settings.updateDate(this.endDateInput, new Date(endDate.getTime() + offset));
-				this._dateChanged(this.endDateInput);
-			} else if (this.settings.anchor == 'end') {
-				this.settings.updateDate(this.startDateInput, new Date(startDate.getTime() - offset));
-				this._dateChanged(this.startDateInput);
+				triggerSimpleCustomEvent(this.container, 'rangeError');
 			}
 		}
-		this.timeDelta = newDelta;
-	},
-
-	_updateEndMintime: function(){
-		if (typeof this.settings.setMinTime != 'function') return;
-
-		var baseTime = null;
-		if (this.settings.anchor == 'start' && (!this.dateDelta || this.dateDelta < _ONE_DAY || (this.timeDelta && this.dateDelta + this.timeDelta < _ONE_DAY))) {
-			baseTime = this.settings.parseTime(this.startTimeInput);
-		}
-
-		this.settings.setMinTime(this.endTimeInput, baseTime);
-	},
-
-	_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;
-		}
+	window.Datepair = Datepair;
 
-		// due to the fact that times can wrap around, any time-only pair will be considered valid
-		if (!this.startDateInput || !this.endDateInput || this.dateDelta + this.timeDelta >= 0) {
-			triggerSimpleCustomEvent(this.container, 'rangeSelected');
-		} else {
-			triggerSimpleCustomEvent(this.container, 'rangeError');
-		}
-	}
-};
+}(window, document));
\ No newline at end of file
diff --git a/vendor/assets/javascripts/jquery.datepair.js b/vendor/assets/javascripts/jquery.datepair.js
old mode 100755
new mode 100644
index b9aadd6..f043199
--- a/vendor/assets/javascripts/jquery.datepair.js
+++ b/vendor/assets/javascripts/jquery.datepair.js
@@ -1,3 +1,9 @@
+/*!
+ * datepair.js v0.4.15 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
+ * Copyright (c) 2016 Jon Thornton - http://jonthornton.github.com/Datepair.js
+ * License: MIT
+ */
+
 (function($) {
 
 	if(!$) {
@@ -20,6 +26,11 @@
 				$this.data('datepair', data);
 			}
 
+			if (option === 'remove') {
+				out = data['remove']();
+				$this.removeData('datepair', data);
+			}
+
 			if (typeof option === 'string') {
 				out = data[option]();
 			}
@@ -37,4 +48,4 @@
 		$this.datepair($this.data());
 	});
 
-}(window.Zepto || window.jQuery));
+}(window.Zepto || window.jQuery));
\ No newline at end of file

From 121cdc237d249f8bfb26a9745334b13d852bfe58 Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Wed, 22 Mar 2017 12:39:34 +0100
Subject: [PATCH 32/33] Update jquery-timepicker to version 1.11.10

---
 .../assets/javascripts/jquery.timepicker.js   | 137 ++++++++++--------
 1 file changed, 76 insertions(+), 61 deletions(-)
 mode change 100755 => 100644 vendor/assets/javascripts/jquery.timepicker.js

diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
old mode 100755
new mode 100644
index e8e9601..e5a7aeb
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -1,5 +1,5 @@
 /*!
- * jquery-timepicker v1.11.4 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
+ * jquery-timepicker v1.11.10 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
  * Copyright (c) 2015 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
  * License: MIT
  */
@@ -30,6 +30,58 @@
 		hrs: 'hrs'
 	};
 
+	var _DEFAULTS = {
+		appendTo: 'body',
+		className: null,
+		closeOnWindowScroll: false,
+		disableTextInput: false,
+		disableTimeRanges: [],
+		disableTouchKeyboard: false,
+		durationTime: null,
+		forceRoundTime: false,
+		maxTime: null,
+		minTime: null,
+		noneOption: false,
+		orientation: 'l',
+		roundingFunction: function(seconds, settings) {
+			if (seconds === null) {
+				return null;
+			} else if (typeof settings.step !== "number") {
+				// TODO: nearest fit irregular steps
+				return seconds;
+			} else {
+				var offset = seconds % (settings.step*60); // step is in minutes
+
+				var start = settings.minTime || 0;
+
+                // adjust offset by start mod step so that the offset is aligned not to 00:00 but to the start
+                offset -= start % (settings.step * 60);
+
+				if (offset >= settings.step*30) {
+					// if offset is larger than a half step, round up
+					seconds += (settings.step*60) - offset;
+				} else {
+					// round down
+					seconds -= offset;
+				}
+
+				return _moduloSeconds(seconds, settings);
+			}
+		},
+		scrollDefault: null,
+		selectOnBlur: false,
+		show2400: false,
+		showDuration: false,
+		showOn: ['click', 'focus'],
+		showOnFocus: true,
+		step: 30,
+		stopScrollPropagation: false,
+		timeFormat: 'g:ia',
+		typeaheadHighlight: true,
+		useSelect: false,
+		wrapHours: true
+	};
+
 	var methods = {
 		init: function(options)
 		{
@@ -39,13 +91,13 @@
 
 				// pick up settings from data attributes
 				var attributeOptions = [];
-				for (var key in $.fn.timepicker.defaults) {
+				for (var key in _DEFAULTS) {
 					if (self.data(key))  {
 						attributeOptions[key] = self.data(key);
 					}
 				}
 
-				var settings = $.extend({}, $.fn.timepicker.defaults, attributeOptions, options);
+				var settings = $.extend({}, _DEFAULTS, options, attributeOptions);
 
 				if (settings.lang) {
 					_lang = $.extend(_lang, settings.lang);
@@ -71,7 +123,7 @@
 						self.on('keydown.timepicker', _disableTextInputHandler);
 					}
 
-					_formatValue.call(self.get(0));
+					_formatValue.call(self.get(0), null, 'initial');
 				}
 			});
 		},
@@ -243,6 +295,8 @@
 
 				self.data('timepicker-settings', settings);
 
+				_formatValue.call(self.get(0), {'type':'change'}, 'initial');
+
 				if (list) {
 					list.remove();
 					self.data('timepicker-list', false);
@@ -507,8 +561,8 @@
 				row.text(timeString);
 			} else {
 				var row = $('<li />');
-				row.addClass(timeInt % 86400 < 43200 ? 'ui-timepicker-am' : 'ui-timepicker-pm');
-				row.data('time', (timeInt <= 86400 ? timeInt : timeInt % 86400));
+				row.addClass((timeInt % _ONE_DAY) < (_ONE_DAY / 2) ? 'ui-timepicker-am' : 'ui-timepicker-pm');
+				row.data('time', _moduloSeconds(timeInt, settings));
 				row.text(timeString);
 			}
 
@@ -748,17 +802,21 @@
 		});
 
 		if (settings.forceRoundTime) {
-			seconds = settings.roundingFunction(seconds, settings);
+			var roundSeconds = settings.roundingFunction(seconds, settings);
+			if (roundSeconds != seconds) {
+				seconds = roundSeconds;
+				origin = null;
+			}
 		}
 
 		var prettyTime = _int2time(seconds, settings);
 
 		if (rangeError) {
-			if (_setTimeValue(self, prettyTime, 'error')) {
+			if (_setTimeValue(self, prettyTime, 'error') || e && e.type == 'change') {
 				self.trigger('timeRangeError');
 			}
 		} else {
-			_setTimeValue(self, prettyTime);
+			_setTimeValue(self, prettyTime, origin);
 		}
 	}
 
@@ -787,7 +845,7 @@
 			self.data('ui-timepicker-value', value);
 			if (source == 'select') {
 				self.trigger('selectTime').trigger('changeTime').trigger('change', 'timepicker');
-			} else if (source != 'error') {
+			} else if (['error', 'initial'].indexOf(source) == -1) {
 				self.trigger('changeTime');
 			}
 
@@ -1174,6 +1232,14 @@
 		return ("0" + n).slice(-2);
 	}
 
+	function _moduloSeconds(seconds, settings) {
+		if (seconds == _ONE_DAY && settings.show2400) {
+			return seconds;
+		}
+
+		return seconds%_ONE_DAY;
+	}
+
 	// Plugin entry
 	$.fn.timepicker = function(method)
 	{
@@ -1188,55 +1254,4 @@
 		else if(typeof method === "object" || !method) { return methods.init.apply(this, arguments); }
 		else { $.error("Method "+ method + " does not exist on jQuery.timepicker"); }
 	};
-	// Global defaults
-	$.fn.timepicker.defaults = {
-		appendTo: 'body',
-		className: null,
-		closeOnWindowScroll: false,
-		disableTextInput: false,
-		disableTimeRanges: [],
-		disableTouchKeyboard: false,
-		durationTime: null,
-		forceRoundTime: false,
-		maxTime: null,
-		minTime: null,
-		noneOption: false,
-		orientation: 'l',
-		roundingFunction: function(seconds, settings) {
-			if (seconds === null) {
-				return null;
-			} else if (typeof settings.step !== "number") {
-				// TODO: nearest fit irregular steps
-				return seconds;
-			} else {
-				var offset = seconds % (settings.step*60); // step is in minutes
-
-				if (offset >= settings.step*30) {
-					// if offset is larger than a half step, round up
-					seconds += (settings.step*60) - offset;
-				} else {
-					// round down
-					seconds -= offset;
-				}
-
-				if (seconds == _ONE_DAY && settings.show2400) {
-					return seconds;
-				}
-
-				return seconds%_ONE_DAY;
-			}
-		},
-		scrollDefault: null,
-		selectOnBlur: false,
-		show2400: false,
-		showDuration: false,
-		showOn: ['click', 'focus'],
-		showOnFocus: true,
-		step: 30,
-		stopScrollPropagation: false,
-		timeFormat: 'g:ia',
-		typeaheadHighlight: true,
-		useSelect: false,
-		wrapHours: true
-	};
 }));

From 8641b4bb2c9992670c717754d0254e3d28e20b7c Mon Sep 17 00:00:00 2001
From: Fabio Cantoni <cover@revoc.net>
Date: Wed, 22 Mar 2017 12:40:10 +0100
Subject: [PATCH 33/33] Bump version to 1.11.10

---
 lib/jquery-timepicker-rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 507e69b..4134b04 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = '1.11.4'
+      VERSION = '1.11.10'
     end
   end
 end