issue #139 isValidationCancelled tweak

ghiscoding · Dec 29, 2016 · 8ac3365 · 8ac3365
1 parent 2429871
commit 8ac3365
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation-ghiscoding",
-  "version": "1.5.12",
+  "version": "1.5.13",
   "author": "Ghislain B.",
   "description": "Angular-Validation Directive and Service (ghiscoding)",
   "main": [

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,6 @@
 Angular-Validation change logs
 
+1.5.13 (2016-12-29) Make sure element exist before looking for `isValidationCancelled`, issue #139
 1.5.12 (2016-12-15) Fix a small issue introduced by last commit (Angular Form overwritten with simple object in some rare occasions).
 1.5.11 (2016-12-15) Fix checkFormValidity with formName argument, issues #135 #139 #140 #141
 1.5.10 (2016-12-13) Fix UI Router issue by adding a UI Router watch on $stateChangeStart, issue #137

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation-ghiscoding",
-  "version": "1.5.12",
+  "version": "1.5.13",
   "author": "Ghislain B.",
   "description": "Angular-Validation Directive and Service (ghiscoding)",
   "main": "dist/angular-validation.min",

diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 #Angular Validation (Directive / Service)
-`Version: 1.5.12`
+`Version: 1.5.13`
 ### Forms Validation with Angular made easy!
 ##### (Concept comes from the amazing Laravel)
 

diff --git a/src/validation-directive.js b/src/validation-directive.js
@@ -92,10 +92,10 @@
         scope.$on('angularValidation.revalidate', function(event, args){
           if (args == ctrl.$name)
           {
-              ctrl.revalidateCalled = true;
-              var value = ctrl.$modelValue;
+            ctrl.revalidateCalled = true;
+            var value = ctrl.$modelValue;
 
-              if (!elm.isValidationCancelled) {
+            if (!!elm && elm.hasOwnProperty("isValidationCancelled")) {
               // attempt to validate & run validation callback if user requested it
               var validationPromise = attemptToValidate(value);
               if(!!_validationCallback) {
@@ -266,7 +266,7 @@
           var formElmObj = commonObj.getFormElementByName(ctrl.$name);
           var value = (typeof ctrl.$modelValue !== "undefined") ? ctrl.$modelValue : event.target.value;
 
-          if (!formElmObj.isValidationCancelled) {
+          if (!!formElmObj && formElmObj.hasOwnProperty("isValidationCancelled")) {
             // attempt to validate & run validation callback if user requested it
             var validationPromise = attemptToValidate(value, 0);
             if(!!_validationCallback) {