Merge remote-tracking branch 'remotes/trent/dev' into parseDateTime

1 files changed, 15 insertions, 9 deletions

diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index b6e79aa..ab732c8 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -1,7 +1,7 @@
 /*
 * jQuery timepicker addon
 * By: Trent Richardson [http://trentrichardson.com]
-* Version 1.0.0-dev
+* Version 1.0.1-dev
 * Last Modified: 02/05/2012
 *
 * Copyright 2012 Trent Richardson
@@ -20,7 +20,13 @@
 
 (function($) {
 
-$.extend($.ui, { timepicker: { version: "1.0.0" } });
+// Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+$.ui.timepicker = $.ui.timepicker || {};
+if ($.ui.timepicker.version) {
+	return;
+}
+
+$.extend($.ui, { timepicker: { version: "1.0.1" } });
 
 //#######################################################################################
 // Return regexp to parse possible am/pm time postfixes. 
@@ -160,7 +166,7 @@ function Timepicker() {
 		separator: ' ',
 		altFieldTimeOnly: true,
 		showTimepicker: true,
-		timezoneIso8609: false,
+		timezoneIso8601: false,
 		timezoneList: null,
 		addSliderAccess: false,
 		sliderAccessArgs: null
@@ -248,7 +254,7 @@ $.extend(Timepicker.prototype, {
 			var timezoneList = [];
 			for (var i = -11; i <= 12; i++)
 				timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
-			if (tp_inst._defaults.timezoneIso8609)
+			if (tp_inst._defaults.timezoneIso8601)
 				timezoneList = $.map(timezoneList, function(val) {
 					return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
 				});
@@ -992,16 +998,16 @@ $.datepicker.parseTime = function(timeFormat, timeString, options) {
             var tz = treg[order.z].toUpperCase();
             switch (tz.length) {
             case 1:	// Z
-                tz = o.timezoneIso8609 ? 'Z' : '+0000';
+                tz = o.timezoneIso8601 ? 'Z' : '+0000';
                 break;
             case 5:	// +hhmm
-                if (o.timezoneIso8609)
+                if (o.timezoneIso8601)
                     tz = tz.substring(1) == '0000'
                        ? 'Z'
                        : tz.substring(0, 3) + ':' + tz.substring(3);
                 break;
             case 6:	// +hh:mm
-                if (!o.timezoneIso8609)
+                if (!o.timezoneIso8601)
                     tz = tz == 'Z' || tz.substring(1) == '00:00'
                        ? '+0000'
                        : tz.replace(/:/, '');
@@ -1186,7 +1192,7 @@ $.datepicker._gotoToday = function(id) {
 		tzoffset = Math.abs(tzoffset);
 		var tzmin = tzoffset % 60;
 		tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
-		if (tp_inst._defaults.timezoneIso8609)
+		if (tp_inst._defaults.timezoneIso8601)
 			tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
 		tp_inst.timezone_select.val(tzoffset);
 	}
@@ -1404,6 +1410,6 @@ function extendRemove(target, props) {
 };
 
 $.timepicker = new Timepicker(); // singleton instance
-$.timepicker.version = "1.0.0";
+$.timepicker.version = "1.0.1";
 
 })(jQuery);