Merge branch 'dev'

trentrichardson · trentrichardson · commit 842046c3e3a9 · 2013-11-30T10:06:38.000-05:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "jqueryui-timepicker-addon",
-	"version": "1.4.2",
+	"version": "1.4.3",
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
diff --git a/dist/index.html b/dist/index.html
@@ -124,9 +124,9 @@ <h3>Requirements</h3>
 
 	<br />
 	<h3>Version</h3>
-	<p>Version 1.4.2</p>
+	<p>Version 1.4.3</p>
 
-	<p>Last updated on 2013-11-23</p>
+	<p>Last updated on 2013-11-30</p>
 	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
 	<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
 
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.4.2 - 2013-11-23
+/*! jQuery Timepicker Addon - v1.4.3 - 2013-11-30
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2013 Trent Richardson; Licensed MIT */
 (function ($) {
@@ -16,7 +16,7 @@
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.4.2"
+			version: "1.4.3"
 		}
 	});
 
@@ -1605,7 +1605,7 @@
 		// 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) {
+		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;
@@ -2140,6 +2140,6 @@
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.4.2";
+	$.timepicker.version = "1.4.3";
 
 })(jQuery);
diff --git a/dist/jquery-ui-timepicker-addon.min.css b/dist/jquery-ui-timepicker-addon.min.css
diff --git a/dist/jquery-ui-timepicker-addon.min.js b/dist/jquery-ui-timepicker-addon.min.js
diff --git a/jquery-ui-timepicker-addon.json b/jquery-ui-timepicker-addon.json
@@ -2,8 +2,8 @@
 	"name": "jquery-ui-timepicker-addon",
 	"title": "jQuery Timepicker Addon",
 	"description": "A timepicker addon for jQueryUI datepicker.",
-	"version": "1.4.2",
-	"modified": "2013-11-23",
+	"version": "1.4.3",
+	"modified": "2013-11-30",
 	"homepage": "http://trentrichardson.com/examples/timepicker",
 	"author": {
 		"name": "Trent Richardson",
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
@@ -1611,7 +1611,7 @@
 		// 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) {
+		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;
diff --git a/test/SpecRunner.html b/test/SpecRunner.html
@@ -7,6 +7,11 @@
 
     <link rel="shortcut icon" type="image/png" href="../lib/jasmine-1.3.1/jasmine_favicon.png">
     <link rel="stylesheet" type="text/css" href="../lib/jasmine-1.3.1/jasmine.css">
+    <style>
+        .ui-datepicker {
+            display: none;
+        }
+    </style>
     <script type="text/javascript" src="../lib/jasmine-1.3.1/jasmine.js"></script>
     <script type="text/javascript" src="../lib/jasmine-1.3.1/jasmine-html.js"></script>
     <script type="text/javascript" src="http://github.com/searls/jasmine-fixture/releases/1.0.5/1737/jasmine-fixture.js"></script>
diff --git a/test/jquery-ui-timepicker-addon_spec.js b/test/jquery-ui-timepicker-addon_spec.js
@@ -648,4 +648,17 @@ describe('datetimepicker', function() {
 			});
 		});
 	});
-});
+
+	describe('methods', function() {
+		describe('setDate', function() {
+			it('should accept null as date', function() {
+				var $input = affix('input').datetimepicker();
+				$input.datetimepicker('setDate', '2013-11-25 15:30:25');
+
+				$input.datetimepicker('setDate', null);
+
+				expect($input.datetimepicker('getDate')).toBeNull();
+			});
+		});
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jqueryui-timepicker-addon",`
`3`		`- "version": "1.4.2",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"`