WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/jquery/jquery-ui-timepicker-addon.js

-/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
+/*! jQuery Timepicker Addon - v1.6.3 - 2016-04-20
 * http://trentrichardson.com/examples/timepicker
-* Copyright (c) 2015 Trent Richardson; Licensed MIT */
+* Copyright (c) 2016 Trent Richardson; Licensed MIT */
 (function (factory) {
 	if (typeof define === 'function' && define.amd) {
 		define(['jquery', 'jquery-ui'], factory);
 	} else {
 		factory(jQuery);
 	/*
 	* Extend jQueryUI, get it started with our version number
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.6.1"
+			version: "1.6.3"
+		}
 	});
 	/*
 	* Timepicker manager.
 	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
 	* Settings for (groups of) time pickers are maintained in an instance object,
 	* allowing multiple different settings on the same page.
 	*/
 		timezoneList: null,
 		units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
 		support: {},
 		control: null,
 		/*
 		* Override the default settings for all instances of the time picker.
 		* @param  {Object} settings  object - the new settings to use as defaults (anonymous object)
 		* @return {Object} the manager object
 		*/
 		setDefaults: function (settings) {
 				return val.toUpperCase();
 			});
 			// detect which units are supported
 			tp_inst.support = detectSupport(
 					tp_inst._defaults.timeFormat +
 					(tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
 					(tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
 			// controlType is string - key to our this._controls
 			if (typeof(tp_inst._defaults.controlType) === 'string') {
 						html += '</tr></table></div>';
+					}
 					html += '</dd>';
+				}
 				// Timezone
 				var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
 				html += '<dt class="ui_tpicker_timezone_label' + (showTz ? '' : noDisplay) + '">' + o.timezoneText + '</dt>';
 				html += '<dd class="ui_tpicker_timezone' + (showTz ? '' : noDisplay) + '"></dd>';
 				// if we only want time picker...
 				if (o.timeOnly === true) {
 					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
 					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+				}
 				// add sliders, adjust grids, add events
 				for (i = 0, l = tp_inst.units.length; i < l; i++) {
 					litem = tp_inst.units[i];
 					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
 					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
 										if (ap.indexOf('a') !== -1 && n === 12) {
 											n = 0;
+										}
+									}
+								}
 								tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
 								tp_inst._onTimeChange();
 								tp_inst._onSelectHandler();
 							}).css({
 					tp_inst._onTimeChange();
 					tp_inst._onSelectHandler();
 					tp_inst._afterInject();
 				});
 				// End timezone options
 				// inject timepicker into datepicker
 				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
 				if ($buttonPanel.length) {
 					$buttonPanel.before($tp);
 				} else {
 				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
 				if (this._defaults.addSliderAccess) {
 					var sliderAccessArgs = this._defaults.sliderAccessArgs,
 						rtl = this._defaults.isRTL;
 					sliderAccessArgs.isRTL = rtl;
 					setTimeout(function () { // fix for inline mode
 						if ($tp.find('.ui-slider-access').length === 0) {
 							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
 							// fix any grids since sliders are shorter
 					this._defaults.millisecMax = this.millisecMaxOriginal;
 					this._defaults.microsecMax = this.microsecMaxOriginal;
+				}
+			}
 			if (dp_inst.settings.minTime!==null) {
 				var tempMinTime=new Date("01/01/1970 " + dp_inst.settings.minTime);
 				if (this.hour<tempMinTime.getHours()) {
 					this.hour=this._defaults.hourMin=tempMinTime.getHours();
 					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
 				} else if (this.hour===tempMinTime.getHours() && this.minute<tempMinTime.getMinutes()) {
 					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
 				} else {
 					if (this._defaults.hourMin<tempMinTime.getHours()) {
 						this._defaults.hourMin=tempMinTime.getHours();
 						this._defaults.minuteMin=tempMinTime.getMinutes();
 					} else if (this._defaults.hourMin===tempMinTime.getHours()===this.hour && this._defaults.minuteMin<tempMinTime.getMinutes()) {
 						this._defaults.minuteMin=tempMinTime.getMinutes();
 					} else {
 						this._defaults.minuteMin=0;
+					}
 				}
+			}
 			if (dp_inst.settings.maxTime!==null) {
 				var tempMaxTime=new Date("01/01/1970 " + dp_inst.settings.maxTime);
 				if (this.hour>tempMaxTime.getHours()) {
 					this.hour=this._defaults.hourMax=tempMaxTime.getHours();
+					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
+				} else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {
 					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
-				} else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {
-					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
 				} else {
 					if (this._defaults.hourMax>tempMaxTime.getHours()) {
 						this._defaults.hourMax=tempMaxTime.getHours();
 						this._defaults.minuteMax=tempMaxTime.getMinutes();
 					} else if (this._defaults.hourMax===tempMaxTime.getHours()===this.hour && this._defaults.minuteMax>tempMaxTime.getMinutes()) {
 						this._defaults.minuteMax=tempMaxTime.getMinutes();
 					} else {
 						this._defaults.minuteMax=59;
+					}
 				}
+			}
 			if (adjustSliders !== undefined && adjustSliders === true) {
 				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
 					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
 					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
 					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
 			// If the update was done in the input field, the input field should not be updated.
 			// If the update was done using the sliders, update the input field.
 			var hasChanged = (
 						hour !== parseInt(this.hour,10) || // sliders should all be numeric
 						minute !== parseInt(this.minute,10) ||
 						second !== parseInt(this.second,10) ||
 						millisec !== parseInt(this.millisec,10) ||
 						microsec !== parseInt(this.microsec,10) ||
 						(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
 						(this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
 					);
 			if (hasChanged) {
+			}
 			// Updates the time within the timepicker
 			this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
 			if (this.$timeObj) {
-				var sPos = this.$timeObj[0].selectionStart;
-				var ePos = this.$timeObj[0].selectionEnd;
 				if (pickerTimeFormat === o.timeFormat) {
 					this.$timeObj.val(this.formattedTime + pickerTimeSuffix);
+				}
 				else {
 					this.$timeObj.val($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
+				}
+				if (this.$timeObj[0].setSelectionRange) {
+					var sPos = this.$timeObj[0].selectionStart;
+					var ePos = this.$timeObj[0].selectionEnd;
-				this.$timeObj[0].setSelectionRange(sPos, ePos);
+					this.$timeObj[0].setSelectionRange(sPos, ePos);
+				}
+			}
 			this.timeDefined = true;
 			if (hasChanged) {
 				this._updateDateTime();
 		/*
 		* update our input with the new date time..
 		*/
 		_updateDateTime: function (dp_inst) {
 			dp_inst = this.inst || dp_inst;
 			var dtTmp = (dp_inst.currentYear > 0?
 							new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) :
 							new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
 				dt = $.datepicker._daylightSavingAdjust(dtTmp),
 				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
 				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
 				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
 				formatCfg = $.datepicker._getFormatConfig(dp_inst),
 				timeAvailable = dt !== null && this.timeDefined;
 			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
 			var formattedDateTime = this.formattedDate;
 			// if a slider was changed but datepicker doesn't have a value yet, set it
 			if (dp_inst.lastVal === "") {
                 dp_inst.currentYear = dp_inst.selectedYear;
                 dp_inst.currentMonth = dp_inst.selectedMonth;
                 dp_inst.currentDay = dp_inst.selectedDay;
+            }
 			/*
 			* remove following lines to force every changes in date picker to change the input value
 			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker.
 			* If the user manually empty the value in the input field, the date picker will never change selected value.
 			*/
 			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
 			//	return;
 			//}
 			} else if (this.$altInput) {
 				this.$input.val(formattedDateTime);
 				var altFormattedDateTime = '',
 					altSeparator = this._defaults.altSeparator !== null ? this._defaults.altSeparator : this._defaults.separator,
 					altTimeSuffix = this._defaults.altTimeSuffix !== null ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
 				if (!this._defaults.timeOnly) {
 					if (this._defaults.altFormat) {
 						altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
+					}
 					else {
 							tp_inst._onTimeChange();
 						},
 						stop: function (event, ui) {
 							tp_inst._onSelectHandler();
+						}
 					});
 				},
 				options: function (tp_inst, obj, unit, opts, val) {
 					if (tp_inst._defaults.isRTL) {
 						if (typeof(opts) === 'string') {
 							if (opts === 'min' || opts === 'max') {
+								}
 								return Math.abs(obj.slider(opts));
+							}
 							return obj.slider(opts);
+						}
 						var min = opts.min,
 							max = opts.max;
 						opts.min = opts.max = null;
 						if (min !== undefined) {
 							opts.max = min * -1;
+						}
 						$t = obj.children('select');
 					if (typeof(opts) === 'string') {
 						if (val === undefined) {
 							return $t.data(opts);
+						}
 						o[opts] = val;
+					}
 					else { o = opts; }
 					return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min>=0 ? o.min : $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
 				},
 				value: function (tp_inst, obj, unit, val) {
 				try {
 					return strictParse(f, s, o);
+				}
 				catch (err2) {
 					$.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
 				}
+			}
 			return false;
 		}; // end looseParse
 		if (typeof o.parse === "function") {
 			return o.parse(timeFormat, timeString, o);
+		}
 		if (o.parse === 'loose') {
 			return looseParse(timeFormat, timeString, o);
 											.replace(/TT/g, ampm ? 'APM' : '')
 											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
 											.replace(/tT/g, ampm ? 'AaPpMm' : '')
 											.replace(/T/g, ampm ? 'AP' : '')
 											.replace(/tt/g, ampm ? 'apm' : '')
 											.replace(/t/g, ampm ? 'ap' : '') +
 											" " + tp_inst._defaults.separator +
 											tp_inst._defaults.timeSuffix +
 											(tz ? tp_inst._defaults.timezoneList.join('') : '') +
 											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) +
 											dateChars,
 					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
 				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+			}
+		}
 			var altField = tp_inst._defaults.altField;
 			if (altField) { // update alternate field too
 				var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
 					date = this._getDate(inst),
 					formatCfg = $.datepicker._getFormatConfig(inst),
 					altFormattedDateTime = '',
 					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator,
 					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
 					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
 				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
 				if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
 					if (tp_inst._defaults.altFormat) {
 						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
+					}
+				}
 				$(altField).val( inst.input.val() ? altFormattedDateTime : "");
+			}
+		}
 		else {
 			$.datepicker._base_updateAlternate(inst);
+		}
 	};
 	/*
 	* Override key up event to sync manual input changes.
 	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
 	$.datepicker._gotoToday = function (id) {
 		var inst = this._getInst($(id)[0]);
 		this._base_gotoToday(id);
 		var tp_inst = this._get(inst, 'timepicker');
+		if (!tp_inst) {
+		  return;
+		}
 		var tzoffset = $.timepicker.timezoneOffsetNumber(tp_inst.timezone);
 		var now = new Date();
-		now.setMinutes(now.getMinutes() + now.getTimezoneOffset() + tzoffset);
+		now.setMinutes(now.getMinutes() + now.getTimezoneOffset() + parseInt(tzoffset, 10));
 		this._setTime(inst, now);
 		this._setDate(inst, now);
 		tp_inst._onSelectHandler();
 	};
 			tp_inst.minute = date ? date.getMinutes() : defaults.minute;
 			tp_inst.second = date ? date.getSeconds() : defaults.second;
 			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
 			tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
 			//check if within min/max times..
 			tp_inst._limitMinMaxDateTime(inst, true);
 			tp_inst._onTimeChange();
 			tp_inst._updateDateTime(inst);
+		}
 			tp_date = new Date(date.getTime());
 			tp_date.setMicroseconds(date.getMicroseconds());
 		} else {
 			tp_date = date;
+		}
 		// This is important if you are using the timezone option, javascript's Date
 		// object will only return the timezone offset for the current locale, so we
 		// adjust it accordingly.  If not using timezone option this won't matter..
 		// If a timezone is different in tp, keep the timezone as is
 		if (tp_inst && tp_date) {
 			// look out for DST if tz wasn't specified
 			if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
 				tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
+			}
-			date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+			date = $.timepicker.timezoneAdjust(date, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset()), tp_inst.timezone);
-			tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
+			tp_date = $.timepicker.timezoneAdjust(tp_date, $.timepicker.timezoneOffsetString(-tp_date.getTimezoneOffset()), tp_inst.timezone);
+		}
 		this._updateDatepicker(inst);
 		this._base_setDateDatepicker.apply(this, arguments);
 		this._setTimeDatepicker(target, tp_date, true);
 			if (inst.lastVal === undefined) {
 				this._setDateFromField(inst, noDefault);
+			}
 			var date = this._getDate(inst);
+			var currDT = null;
+			if (tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) {
-			var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());
+				currDT = tp_inst.$input.val() + ' ' + tp_inst.$altInput.val();
+			}
+			else if (tp_inst.$input.get(0).tagName !== 'INPUT' && tp_inst.$altInput) {
+				/**
+				 * in case the datetimepicker has been applied to a non-input tag for inline UI,
+				 * and the user has not configured the plugin to display only time in altInput,
+				 * pick current date time from the altInput (and hope for the best, for now, until "ER1" is applied)
+				 *
+				 * @todo ER1. Since altInput can have a totally difference format, convert it to standard format by reading input format from "altFormat" and "altTimeFormat" option values
+				 */
+				currDT = tp_inst.$altInput.val();
+			}
+			else {
+				currDT = tp_inst.$input.val();
+			}
 			if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {
 				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
 				date.setMicroseconds(tp_inst.microsec);
 				// This is important if you are using the timezone option, javascript's Date
 				// object will only return the timezone offset for the current locale, so we
 				// adjust it accordingly.  If not using timezone option this won't matter..
 				if (tp_inst.timezone != null) {
 					// look out for DST if tz wasn't specified
 					if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
 						tp_inst.timezone = date.getTimezoneOffset() * -1;
+					}
-					date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+					date = $.timepicker.timezoneAdjust(date, tp_inst.timezone, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset()));
+				}
+			}
 			return date;
+		}
 		return this._base_getDateDatepicker(target, noDefault);
 				tp_inst._defaults.maxDateTime = max;
 			} else if (onselect) {
 				tp_inst._defaults.onSelect = onselect;
+			}
 			// Datepicker will override our date when we call _base_optionDatepicker when
 			// calling minDate/maxDate, so we will first grab the value, call
 			// _base_optionDatepicker, then set our value back.
 			if(min || max){
 				$target = $(target);
 				oldVal = $target.datetimepicker('getDate');
 				ret = this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
 		if (value === undefined) {
 			return this._base_optionDatepicker.call($.datepicker, target, name);
+		}
 		return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
 	};
 	/*
 	* jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
 	* it will return false for all objects
 	*/
 	var isEmptyObject = function (obj) {
 		var off = tzMinutes,
 			minutes = off % 60,
 			hours = (off - minutes) / 60,
 			iso = iso8601 ? ':' : '',
 			tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
 		if (tz === '+00:00') {
 			return 'Z';
+		}
 		return tz;
 	};
 		if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
 			return 0;
+		}
 		if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
-			return tzString;
+			return parseInt(tzString, 10);
+		}
 		return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
 					((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
 					parseInt(normalized.substr(3, 2), 10))); // minutes
 	};
 	/**
 	 * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
 	 * @param  {Date} date
+	 * @param  {string} fromTimezone formatted like "+0500", "-1245"
 	 * @param  {string} toTimezone formatted like "+0500", "-1245"
 	 * @return {Date}
 	 */
-	$.timepicker.timezoneAdjust = function (date, toTimezone) {
+	$.timepicker.timezoneAdjust = function (date, fromTimezone, toTimezone) {
+		var fromTz = $.timepicker.timezoneOffsetNumber(fromTimezone);
 		var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
 		if (!isNaN(toTz)) {
-			date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz);
+			date.setMinutes(date.getMinutes() + (-fromTz) - (-toTz));
+		}
 		return date;
 	};
 	/**
+				}
 				if (option === 'maxDate') {
 					date.setMilliseconds(date.getMilliseconds() - options.minInterval);
+				}
+			}
 			if (date.getTime) {
 				other[method].call(other, 'option', option, date);
+			}
+		}
 				selected($(this), startTime, 'maxDate');
+			}
 		}, options, options.end));
 		checkDates(startTime, endTime);
 		selected(startTime, endTime, 'minDate');
 		selected(endTime, startTime, 'maxDate');
 		return $([startTime.get(0), endTime.get(0)]);
 	};
 	 * Log error or data to the console during error or debugging
 	 * @param  {Object} err pass any type object to log to the console during error or debugging
 	 * @return {void}
 	 */
 	$.timepicker.log = function () {
+		// Older IE (9, maybe 10) throw error on accessing `window.console.log.apply`, so check first.
-		if (window.console) {
+		if (window.console && window.console.log && window.console.log.apply) {
 			window.console.log.apply(window.console, Array.prototype.slice.call(arguments));
+		}
 	};
 	/*
+	}
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.6.1";
+	$.timepicker.version = "1.6.3";
 }));

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/jquery/jquery-ui-timepicker-addon.js – Rev 5804 → 7002