Merge pull request #27 from dnasir/dev

Bug fixes
dnasir · Nov 23, 2014 · e68810a · e68810a
2 parents 61e0481 + 4dd7ef7
commit e68810a
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 24 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-dateParser",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "homepage": "https://github.com/dnasir/angular-dateParser",
   "authors": [
     "Dzulqarnain Nasir"

diff --git a/dateparser.directive.js b/dateparser.directive.js
@@ -1,3 +1,9 @@
+/*
+ * DateParser directive
+ * 
+ * Use this directive in form fields to implement the dateParser functionality.
+ */
+
 angular.module('dateParser')
     .directive('dateParser', ['dateFilter', '$dateParser', function(dateFilter, $dateParser) {
 
@@ -16,12 +22,9 @@ angular.module('dateParser')
 
                 ngModel.$parsers.unshift(function(viewValue) {
                     var date = $dateParser(viewValue, dateFormat);
-
-                    if(isNaN(date)) {
-                        ngModel.$setValidity('date', false);
-                    } else {
-                        ngModel.$setValidity('date', true);
-                    }
+
+                    // Set validity when view value changes
+                    ngModel.$setValidity('date', angular.isDate(date));
 
                     return date;
                 });
@@ -34,6 +37,10 @@ angular.module('dateParser')
 
                 // Format the new model value before it is displayed in the editor
 				ngModel.$formatters.push(function(modelValue) {
+
+                    // Set validity when model value changes
+                    ngModel.$setValidity('date', angular.isDate(modelValue));
+
 					return modelValue ? dateFilter(modelValue, dateFormat) : '';
 				});
             }

diff --git a/demo.html b/demo.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html ng-app="dateParserDirective">
+<html ng-app="dateParser">
 	<head>
 		<meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -194,14 +194,11 @@ <h6>Code</h6>
         </footer>
 
 		<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.min.js"></script>
-		<script src="dateparser.js"></script>
-        <script src="dateparser.directive.js"></script>
+		<script src="dist/angular-dateparser.min.js"></script>
         <script>
             function controller($scope) {
                 $scope.format = 'dd.MM.yyyy';
                 $scope.date = new Date();
-
-
             }
         </script>
 

diff --git a/dist/angular-dateparser.js b/dist/angular-dateparser.js
@@ -1,5 +1,5 @@
 /*!
- * angular-dateParser 1.0.11
+ * angular-dateParser 1.0.12
  * https://github.com/dnasir/angular-dateParser
  * Copyright 2014, Dzulqarnain Nasir
  * Licensed under: MIT (http://www.opensource.org/licenses/MIT)
@@ -243,18 +243,15 @@
                 });
                 ngModel.$parsers.unshift(function(viewValue) {
                     var date = $dateParser(viewValue, dateFormat);
-                    if (isNaN(date)) {
-                        ngModel.$setValidity("date", false);
-                    } else {
-                        ngModel.$setValidity("date", true);
-                    }
+                    ngModel.$setValidity("date", angular.isDate(date));
                     return date;
                 });
                 ngModel.$render = function() {
                     element.val(ngModel.$modelValue ? dateFilter(ngModel.$modelValue, dateFormat) : undefined);
                     scope.ngModel = ngModel.$modelValue;
                 };
                 ngModel.$formatters.push(function(modelValue) {
+                    ngModel.$setValidity("date", angular.isDate(modelValue));
                     return modelValue ? dateFilter(modelValue, dateFormat) : "";
                 });
             }

diff --git a/dist/angular-dateparser.min.js b/dist/angular-dateparser.min.js