Fix for NaN instead of dates and months names when wrong data placed …

…in input field, fixes [#26](#26) and [#27](#27)
nazar-pc · Jul 11, 2014 · 766742a · 766742a · mxp100 · Jul 16, 2014
1 parent 4eda6c4
commit 766742a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pickmeup",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "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.4.1 (11 July, 2014)
+* Fix for NaN instead of dates and months names when wrong data placed in input field, fixes [#26](https://github.com/nazar-pc/PickMeUp/issues/26) and [#27](https://github.com/nazar-pc/PickMeUp/issues/27)
+
 2.4.0 (01 July, 2014)
 * Add methods prev/next for external call
 

diff --git a/js/jquery.pickmeup.js b/js/jquery.pickmeup.js
@@ -295,14 +295,18 @@
 				break;
 			}
 		}
-		return new Date(
+		var parsed_date = new Date(
 			y === undefined ? now.getFullYear() : y,
 			m === undefined ? now.getMonth() : m,
 			d === undefined ? now.getDate() : d,
 			h === undefined ? now.getHours() : h,
 			min === undefined ? now.getMinutes() : min,
 			0
 		);
+		if (parsed_date.toString() == 'Invalid Date') {
+			parsed_date = new Date;
+		}
+		return parsed_date;
 	}
 	function formatDate (date, format, locale) {
 		var m = date.getMonth();

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.4.0",
+	"version"      : "2.4.1",
 	"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.4.0",
+	"version"      : "2.4.1",
 	"homepage"     : "https://github.com/nazar-pc/PickMeUp",
 	"author"       : {
 		"name"  : "Nazar Mokrynskyi",