Merge pull request #1685 from jonathan-chin/master

fixed logic error with ngf-ignore-invalid
danialfarid · Sep 6, 2016 · 77b3126 · 77b3126
2 parents a570277 + fe94d68
commit 77b3126
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dist/ng-file-upload-all.js b/dist/ng-file-upload-all.js
@@ -1760,10 +1760,10 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
                   if (!runAllValidation) {
                     files.splice(i, 1);
                   }
+                  valid = false;
                 } else {
                   files.splice(i, 1);
                 }
-                valid = false;
               }
             }
           }

diff --git a/dist/ng-file-upload.js b/dist/ng-file-upload.js
@@ -1338,10 +1338,10 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
                   if (!runAllValidation) {
                     files.splice(i, 1);
                   }
+                  valid = false;
                 } else {
                   files.splice(i, 1);
                 }
-                valid = false;
               }
             }
           }

diff --git a/src/validate.js b/src/validate.js
@@ -152,10 +152,10 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
                   if (!runAllValidation) {
                     files.splice(i, 1);
                   }
+                  valid = false;
                 } else {
                   files.splice(i, 1);
                 }
-                valid = false;
               }
             }
           }