Skip to content

Commit 3d250be

Browse files
committed
Update jQuery File Upload Validation Plugin to 1.1.2
1 parent 459b437 commit 3d250be

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Validation Plugin 1.0.2
2+
* jQuery File Upload Validation Plugin 1.1.2
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2013, Sebastian Tschan
@@ -9,8 +9,7 @@
99
* http://www.opensource.org/licenses/MIT
1010
*/
1111

12-
/*jslint nomen: true, unparam: true, regexp: true */
13-
/*global define, window */
12+
/* global define, window */
1413

1514
(function (factory) {
1615
'use strict';
@@ -34,13 +33,13 @@
3433
{
3534
action: 'validate',
3635
// Always trigger this action,
37-
// even if the previous action was rejected:
36+
// even if the previous action was rejected:
3837
always: true,
3938
// Options taken from the global options map:
40-
acceptFileTypes: '@acceptFileTypes',
41-
maxFileSize: '@maxFileSize',
42-
minFileSize: '@minFileSize',
43-
maxNumberOfFiles: '@maxNumberOfFiles',
39+
acceptFileTypes: '@',
40+
maxFileSize: '@',
41+
minFileSize: '@',
42+
maxNumberOfFiles: '@',
4443
disabled: '@disableValidation'
4544
}
4645
);
@@ -84,18 +83,22 @@
8483
var dfd = $.Deferred(),
8584
settings = this.options,
8685
file = data.files[data.index],
87-
numberOfFiles = settings.getNumberOfFiles();
88-
if (numberOfFiles && $.type(options.maxNumberOfFiles) === 'number' &&
89-
numberOfFiles + data.files.length > options.maxNumberOfFiles) {
86+
fileSize;
87+
if (options.minFileSize || options.maxFileSize) {
88+
fileSize = file.size;
89+
}
90+
if ($.type(options.maxNumberOfFiles) === 'number' &&
91+
(settings.getNumberOfFiles() || 0) + data.files.length >
92+
options.maxNumberOfFiles) {
9093
file.error = settings.i18n('maxNumberOfFiles');
9194
} else if (options.acceptFileTypes &&
9295
!(options.acceptFileTypes.test(file.type) ||
9396
options.acceptFileTypes.test(file.name))) {
9497
file.error = settings.i18n('acceptFileTypes');
95-
} else if (options.maxFileSize && file.size > options.maxFileSize) {
98+
} else if (fileSize > options.maxFileSize) {
9699
file.error = settings.i18n('maxFileSize');
97-
} else if ($.type(file.size) === 'number' &&
98-
file.size < options.minFileSize) {
100+
} else if ($.type(fileSize) === 'number' &&
101+
fileSize < options.minFileSize) {
99102
file.error = settings.i18n('minFileSize');
100103
} else {
101104
delete file.error;

0 commit comments

Comments
 (0)