jquery-timepicker-rails 0.0.2 → 0.1.0

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

@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "0.0.2"
+      VERSION = "0.1.0"
     end
   end
 end

data/vendor/assets/javascripts/datepair.js

@@ -1,8 +1,14 @@
 $(function() {
 
+	var DATE_FORMAT = 'Y-m-d';
+	var DATEPICKER_FORMAT = 'yyyy-m-d';
+
 	$('.datepair input.date').each(function(){
 		var $this = $(this);
-		$this.datepicker({ 'dateFormat': 'm/d/yy' });
+		$this.datepicker({
+			'format': DATEPICKER_FORMAT,
+			'autoclose': true
+		});
 
 		if ($this.hasClass('start') || $this.hasClass('end')) {
 			$this.on('changeDate change', doDatepair);
@@ -61,7 +67,7 @@ $(function() {
 		if (target.val() == '') {
 			return;
 		}
-		
+
 		var container = target.closest('.datepair');
 
 		if (target.hasClass('date')) {
@@ -88,7 +94,7 @@ $(function() {
 
 		if (oldDelta && target.hasClass('start')) {
 			var newEnd = new Date(startDate.getTime()+oldDelta);
-			end.val(newEnd.format('m/d/Y'));
+			end.val(newEnd.format(DATE_FORMAT));
 			end.datepicker('update');
 			return;
 
@@ -99,10 +105,10 @@ $(function() {
 				newDelta = 0;
 
 				if (target.hasClass('start')) {
-					end.val(startDate.format('m/d/Y'));
+					end.val(start.val());
 					end.datepicker('update');
 				} else if (target.hasClass('end')) {
-					start.val(endDate.format('m/d/Y'));
+					start.val(end.val());
 					start.datepicker('update');
 				}
 			}
@@ -185,7 +191,7 @@ $(function() {
 			if (dateDelta || dateDelta === 0) {
 				var endDate =  new Date(endInput.val());
 				var newEnd = new Date(endDate.getTime() + endDateAdvance);
-				endInput.val(newEnd.format('m/d/Y'));
+				endInput.val(newEnd.format(DATE_FORMAT));
 				endInput.datepicker('update');
 				container.data('dateDelta', dateDelta + endDateAdvance);
 			}

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

@@ -2,15 +2,22 @@
 jquery-timepicker
 http://jonthornton.github.com/jquery-timepicker/
 
-requires jQuery 1.6+
+requires jQuery 1.7+
 ************************/
 
 
-!(function($)
-{
-
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
 	var _baseDate = _generateBaseDate();
 	var _ONE_DAY = 86400;
+	var _closeEvent = 'ontouchstart' in document ? 'touchstart' : 'mousedown';
 	var _defaults =	{
 		className: null,
 		minTime: null,
@@ -21,7 +28,9 @@ requires jQuery 1.6+
 		timeFormat: 'g:ia',
 		scrollDefaultNow: false,
 		scrollDefaultTime: false,
-		selectOnBlur: false
+		selectOnBlur: false,
+		forceRoundTime: false,
+		appendTo: 'body'
 	};
 	var _lang = {
 		decimal: '.',
@@ -87,8 +96,10 @@ requires jQuery 1.6+
 
 				if (!globalInit) {
 					// close the dropdown when container loses focus
-					$('body').on('click', function(e) {
-						if ($(e.target).closest('.ui-timepicker-input').length == 0 && $(e.target).closest('.ui-timepicker-list').length == 0) {
+					$('body').on(_closeEvent, function(e) {
+						var target = $(e.target);
+						var input = target.closest('.ui-timepicker-input');
+						if (input.length === 0 && target.closest('.ui-timepicker-list').length === 0) {
 							methods.hide();
 						}
 					});
@@ -100,6 +111,12 @@ requires jQuery 1.6+
 		show: function(e)
 		{
 			var self = $(this);
+
+			if ('ontouchstart' in document) {
+				// block the keyboard on mobile devices
+				self.blur();
+			}
+
 			var list = self.data('timepicker-list');
 
 			// check if input is readonly
@@ -108,7 +125,7 @@ requires jQuery 1.6+
 			}
 
 			// check if list needs to be rendered
-			if (!list || list.length == 0) {
+			if (!list || list.length === 0) {
 				_render(self);
 				list = self.data('timepicker-list');
 			}
@@ -127,15 +144,12 @@ requires jQuery 1.6+
 			// make sure other pickers are hidden
 			methods.hide();
 
-			var topMargin = parseInt(self.css('marginTop').slice(0, -2));
-			if (!topMargin) topMargin = 0; // correct for IE returning "auto"
-
 			if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
 				// position the dropdown on top
-				list.css({ 'left':(self.offset().left), 'top': self.offset().top + topMargin - list.outerHeight() });
+				list.css({ 'left':(self.offset().left), 'top': self.offset().top - list.outerHeight() });
 			} else {
 				// put it under the input
-				list.css({ 'left':(self.offset().left), 'top': self.offset().top + topMargin + self.outerHeight() });
+				list.css({ 'left':(self.offset().left), 'top': self.offset().top + self.outerHeight() });
 			}
 
 			list.show();
@@ -145,13 +159,13 @@ requires jQuery 1.6+
 			var selected = list.find('.ui-timepicker-selected');
 
 			if (!selected.length) {
-				if (self.val()) {
-					selected = _findRow(self, list, _time2int(self.val()));
-				} else if (settings.minTime === null && settings.scrollDefaultNow) {
-					selected = _findRow(self, list, _time2int(new Date()));
-				} else if (settings.scrollDefaultTime !== false) {
-				  selected = _findRow(self, list, _time2int(settings.scrollDefaultTime));
-				}
+                if (self.val()) {
+                    selected = _findRow(self, list, _time2int(self.val()));
+                } else if (settings.scrollDefaultNow) {
+                    selected = _findRow(self, list, _time2int(new Date()));
+                } else if (settings.scrollDefaultTime !== false) {
+                    selected = _findRow(self, list, _time2int(settings.scrollDefaultTime));
+                }
 			}
 
 			if (selected && selected.length) {
@@ -278,7 +292,7 @@ requires jQuery 1.6+
 
 		list.css({'display':'none', 'position': 'absolute' });
 
-		if (settings.minTime !== null && settings.showDuration) {
+		if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
 			list.addClass('ui-timepicker-with-duration');
 		}
 
@@ -294,14 +308,14 @@ requires jQuery 1.6+
 		for (var i=start; i <= end; i += settings.step*60) {
 			var timeInt = i%_ONE_DAY;
 			var row = $('<li />');
-			row.data('time', timeInt)
+			row.data('time', timeInt);
 			row.text(_int2time(timeInt, settings.timeFormat));
 
-			if (settings.minTime !== null && settings.showDuration) {
+			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)
+				row.append(duration);
 			}
 
 			list.append(row);
@@ -310,7 +324,13 @@ requires jQuery 1.6+
 		list.data('timepicker-input', self);
 		self.data('timepicker-list', list);
 
-		$('body').append(list);
+		var appendTo = settings.appendTo;
+		if (typeof appendTo === 'string') {
+			appendTo = $(appendTo);
+		} else if (typeof appendTo === 'function') {
+			appendTo = appendTo(self);
+		}
+		appendTo.append(list);
 		_setSelected(self, list);
 
 		list.on('click', 'li', function(e) {
@@ -324,7 +344,7 @@ requires jQuery 1.6+
 			_selectValue(self);
 			list.hide();
 		});
-	};
+	}
 
 	function _generateBaseDate()
 	{
@@ -344,13 +364,16 @@ requires jQuery 1.6+
 
 		var settings = self.data('timepicker-settings');
 		var out = false;
+		var halfStep = settings.step*30;
 
 		// loop through the menu items
 		list.find('li').each(function(i, obj) {
 			var jObj = $(obj);
 
+			var offset = jObj.data('time') - value;
+
 			// check if the value is less than half a step from each row
-			if (Math.abs(jObj.data('time') - value) <= settings.step*30) {
+			if (Math.abs(offset) < halfStep || offset == halfStep) {
 				out = jObj;
 				return false;
 			}
@@ -370,19 +393,33 @@ requires jQuery 1.6+
 
 	function _formatValue()
 	{
-		if (this.value == '') {
+		if (this.value === '') {
 			return;
 		}
 
 		var self = $(this);
-		var timeInt = _time2int(this.value);
+		var seconds = _time2int(this.value);
 
-		if (timeInt === null) {
+		if (seconds === null) {
 			self.trigger('timeFormatError');
 			return;
 		}
 
-		var prettyTime = _int2time(timeInt, self.data('timepicker-settings').timeFormat);
+		var settings = self.data('timepicker-settings');
+
+		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;
+			}
+		}
+
+		var prettyTime = _int2time(seconds, settings.timeFormat);
 		self.val(prettyTime);
 	}
 
@@ -397,7 +434,7 @@ requires jQuery 1.6+
 			} else {
 				return true;
 			}
-		};
+		}
 
 		switch (e.keyCode) {
 
@@ -406,13 +443,11 @@ requires jQuery 1.6+
 				methods.hide.apply(this);
 				e.preventDefault();
 				return false;
-				break;
 
 			case 38: // up
 				var selected = list.find('.ui-timepicker-selected');
 
 				if (!selected.length) {
-					var selected;
 					list.children().each(function(i, obj) {
 						if ($(obj).position().top > 0) {
 							selected = $(obj);
@@ -433,10 +468,9 @@ requires jQuery 1.6+
 				break;
 
 			case 40: // down
-				var selected = list.find('.ui-timepicker-selected');
+				selected = list.find('.ui-timepicker-selected');
 
-				if (selected.length == 0) {
-					var selected;
+				if (selected.length === 0) {
 					list.children().each(function(i, obj) {
 						if ($(obj).position().top > 0) {
 							selected = $(obj);
@@ -483,11 +517,11 @@ requires jQuery 1.6+
 				list.find('li').removeClass('ui-timepicker-selected');
 				return;
 		}
-	};
+	}
 
 	function _selectValue(self)
 	{
-		var settings = self.data('timepicker-settings')
+		var settings = self.data('timepicker-settings');
 		var list = self.data('timepicker-list');
 		var timeValue = null;
 
@@ -495,12 +529,12 @@ requires jQuery 1.6+
 
 		if (cursor.length) {
 			// selected value found
-			var timeValue = cursor.data('time');
+			timeValue = cursor.data('time');
 
 		} else if (self.val()) {
 
 			// no selected value; fall back on input value
-			var timeValue = _time2int(self.val());
+			timeValue = _time2int(self.val());
 
 			_setSelected(self, list);
 		}
@@ -511,14 +545,14 @@ requires jQuery 1.6+
 		}
 
 		self.trigger('change').trigger('changeTime');
-	};
+	}
 
 	function _int2duration(seconds)
 	{
 		var minutes = Math.round(seconds/60);
 		var duration;
 
-		if (minutes < 60) {
+		if (Math.abs(minutes) < 60) {
 			duration = [minutes, _lang.mins];
 		} else if (minutes == 60) {
 			duration = ['1', _lang.hr];
@@ -529,7 +563,7 @@ requires jQuery 1.6+
 		}
 
 		return duration.join(' ');
-	};
+	}
 
 	function _int2time(seconds, format)
 	{
@@ -539,10 +573,11 @@ requires jQuery 1.6+
 
 		var time = new Date(_baseDate.valueOf() + (seconds*1000));
 		var output = '';
+		var hour, code;
 
 		for (var i=0; i<format.length; i++) {
 
-			var code = format.charAt(i);
+			code = format.charAt(i);
 			switch (code) {
 
 				case 'a':
@@ -554,8 +589,8 @@ requires jQuery 1.6+
 					break;
 
 				case 'g':
-					var hour = time.getHours() % 12;
-					output += (hour == 0) ? '12' : hour;
+					hour = time.getHours() % 12;
+					output += (hour === 0) ? '12' : hour;
 					break;
 
 				case 'G':
@@ -563,17 +598,17 @@ requires jQuery 1.6+
 					break;
 
 				case 'h':
-					var hour = time.getHours() % 12;
+					hour = time.getHours() % 12;
 
-					if (hour != 0 && hour < 10) {
+					if (hour !== 0 && hour < 10) {
 						hour = '0'+hour;
 					}
 
-					output += (hour == 0) ? '12' : hour;
+					output += (hour === 0) ? '12' : hour;
 					break;
 
 				case 'H':
-					var hour = time.getHours();
+					hour = time.getHours();
 					output += (hour > 9) ? hour : '0'+hour;
 					break;
 
@@ -583,7 +618,7 @@ requires jQuery 1.6+
 					break;
 
 				case 's':
-					var seconds = time.getSeconds();
+					seconds = time.getSeconds();
 					output += (seconds > 9) ? seconds : '0'+seconds;
 					break;
 
@@ -593,11 +628,11 @@ requires jQuery 1.6+
 		}
 
 		return output;
-	};
+	}
 
 	function _time2int(timeString)
 	{
-		if (timeString == '') return null;
+		if (timeString === '') return null;
 		if (timeString+0 == timeString) return timeString;
 
 		if (typeof(timeString) == 'object') {
@@ -605,29 +640,30 @@ requires jQuery 1.6+
 		}
 
 		var d = new Date(0);
-		var time = timeString.toLowerCase().match(/(\d{1,2})(?::(\d{2}))?(?::(\d{2}))?\s*([pa]?)/);
+		var time = timeString.toLowerCase().match(/(\d{1,2})(?::(\d{1,2}))?(?::(\d{2}))?\s*([pa]?)/);
 
 		if (!time) {
 			return null;
 		}
 
-		var hour = parseInt(time[1]*1);
+		var hour = parseInt(time[1]*1, 10);
+        var hours;
 
 		if (time[4]) {
 			if (hour == 12) {
-				var hours = (time[4] == 'p') ? 12 : 0;
+				hours = (time[4] == 'p') ? 12 : 0;
 			} else {
-				var hours = (hour + (time[4] == 'p' ? 12 : 0));
+				hours = (hour + (time[4] == 'p' ? 12 : 0));
 			}
 
 		} else {
-			var hours = hour;
+			hours = hour;
 		}
 
 		var minutes = ( time[2]*1 || 0 );
 		var seconds = ( time[3]*1 || 0 );
 		return hours*3600 + minutes*60 + seconds;
-	};
+	}
 
 	// Plugin entry
 	$.fn.timepicker = function(method)
@@ -636,4 +672,4 @@ requires jQuery 1.6+
 		else if(typeof method === "object" || !method) { return methods.init.apply(this, arguments); }
 		else { $.error("Method "+ method + " does not exist on jQuery.timepicker"); }
 	};
-})(jQuery);
+}));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-timepicker-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &26367564 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *26367564
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: A jQuery timepicker plugin inspired by Google Calendar
 email:
 - tkrotoff@gmail.com
@@ -60,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: jquery-timepicker packaged for the Rails 3.1+ asset pipeline