Merge pull request #1 from haikulearning/guikubivan-validation-bug

Fix validation for mix of content types and exclusions * See danialfarid#1026
haikulearning · Apr 27, 2016 · e4c696d · e4c696d
2 parents 332e2d4 + 7bbf116
commit e4c696d
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/validate.js b/src/validate.js
@@ -11,10 +11,8 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
         for (var i = 0; i < split.length; i++) {
           var r = globStringToRegex(split[i]);
           if (r.regexp) {
+            regexp += regexp ? '|' : '';
             regexp += '(' + r.regexp + ')';
-            if (i < split.length - 1) {
-              regexp += '|';
-            }
           } else {
             excludes = excludes.concat(r.excludes);
           }