Fix for bug when min and max were not specified and forced datepi…

…cker to stuck at 1970
nazar-pc · Jan 14, 2015 · e068562 · e068562
1 parent 079bbd6
commit e068562
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name"         : "pickmeup",
-	"version"      : "2.6.1",
+	"version"      : "2.6.2",
 	"homepage"     : "https://github.com/nazar-pc/PickMeUp",
 	"authors"      : [
 		"Nazar Mokrynskyi <nazar@mokrynskyi.com>"

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+2.6.2 (15 January, 2015)
+* Fix for bug when `min` and `max` were not specified and forced datepicker to stuck at 1970, fixes [#49](https://github.com/nazar-pc/PickMeUp/issues/49)
+
 2.6.1 (13 January, 2015)
 * Fix for bug when specified `max` date in the middle of the month caused inability to switch to that month
 

diff --git a/js/jquery.pickmeup.js b/js/jquery.pickmeup.js
@@ -111,8 +111,8 @@
 			current_cal		= Math.floor(options.calendars / 2),
 			actual_date		= options.date,
 			current_date	= options.current,
-			min_date		= new Date(options.min),
-			max_date		= new Date(options.max),
+			min_date		= options.min ? new Date(options.min) : null,
+			max_date		= options.max ? new Date(options.max) : null,
 			local_date,
 			header,
 			html,

diff --git a/js/jquery.pickmeup.min.js b/js/jquery.pickmeup.min.js
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
 		"date",
 		"calendar"
 	],
-	"version"      : "2.6.1",
+	"version"      : "2.6.2",
 	"homepage"     : "https://github.com/nazar-pc/PickMeUp",
 	"author"       : {
 		"name"  : "Nazar Mokrynskyi",

diff --git a/pickmeup.jquery.json b/pickmeup.jquery.json
@@ -7,7 +7,7 @@
 		"date",
 		"calendar"
 	],
-	"version"      : "2.6.1",
+	"version"      : "2.6.2",
 	"homepage"     : "https://github.com/nazar-pc/PickMeUp",
 	"author"       : {
 		"name"  : "Nazar Mokrynskyi",