|
1 | 1 | /*
|
2 |
| - * jQuery File Upload Validation Plugin 1.0.2 |
| 2 | + * jQuery File Upload Validation Plugin 1.1.2 |
3 | 3 | * https://github.com/blueimp/jQuery-File-Upload
|
4 | 4 | *
|
5 | 5 | * Copyright 2013, Sebastian Tschan
|
|
9 | 9 | * http://www.opensource.org/licenses/MIT
|
10 | 10 | */
|
11 | 11 |
|
12 |
| -/*jslint nomen: true, unparam: true, regexp: true */ |
13 |
| -/*global define, window */ |
| 12 | +/* global define, window */ |
14 | 13 |
|
15 | 14 | (function (factory) {
|
16 | 15 | 'use strict';
|
|
34 | 33 | {
|
35 | 34 | action: 'validate',
|
36 | 35 | // Always trigger this action,
|
37 |
| - // even if the previous action was rejected: |
| 36 | + // even if the previous action was rejected: |
38 | 37 | always: true,
|
39 | 38 | // 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: '@', |
44 | 43 | disabled: '@disableValidation'
|
45 | 44 | }
|
46 | 45 | );
|
|
84 | 83 | var dfd = $.Deferred(),
|
85 | 84 | settings = this.options,
|
86 | 85 | 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) { |
90 | 93 | file.error = settings.i18n('maxNumberOfFiles');
|
91 | 94 | } else if (options.acceptFileTypes &&
|
92 | 95 | !(options.acceptFileTypes.test(file.type) ||
|
93 | 96 | options.acceptFileTypes.test(file.name))) {
|
94 | 97 | file.error = settings.i18n('acceptFileTypes');
|
95 |
| - } else if (options.maxFileSize && file.size > options.maxFileSize) { |
| 98 | + } else if (fileSize > options.maxFileSize) { |
96 | 99 | 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) { |
99 | 102 | file.error = settings.i18n('minFileSize');
|
100 | 103 | } else {
|
101 | 104 | delete file.error;
|
|
0 commit comments