Skip to content

Commit 759e5e9

Browse files
committed
Merge pull request #219 from OleksandrBezhan/master
Reliably parse filters option
2 parents ea3acc0 + b2aa25a commit 759e5e9

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.temp
22
.idea
3+
*.iml
34
node_modules
4-
bower_components
5+
bower_components

angular-file-upload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ module
344344
FileUploader.prototype._getFilters = function(filters) {
345345
if (angular.isUndefined(filters)) return this.filters;
346346
if (angular.isArray(filters)) return filters;
347-
var names = filters.split(/\s*,/);
347+
var names = filters.match(/[^\s,]+/g);
348348
return this.filters.filter(function(filter) {
349349
return names.indexOf(filter.name) !== -1;
350350
}, this);

angular-file-upload.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

angular-file-upload.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ module
328328
FileUploader.prototype._getFilters = function(filters) {
329329
if (angular.isUndefined(filters)) return this.filters;
330330
if (angular.isArray(filters)) return filters;
331-
var names = filters.split(/\s*,/);
331+
var names = filters.match(/[^\s,]+/g);
332332
return this.filters.filter(function(filter) {
333333
return names.indexOf(filter.name) !== -1;
334334
}, this);

0 commit comments

Comments
 (0)