This repository has been archived by the owner on Nov 28, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 953
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #561 from PSoul/master
fix #542
- Loading branch information
Showing
4 changed files
with
319 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| /* | ||
| * jQuery File Upload Processing Plugin | ||
| * https://github.com/blueimp/jQuery-File-Upload | ||
| * | ||
| * Copyright 2012, Sebastian Tschan | ||
| * https://blueimp.net | ||
| * | ||
| * Licensed under the MIT license: | ||
| * https://opensource.org/licenses/MIT | ||
| */ | ||
|
|
||
| /* jshint nomen:false */ | ||
| /* global define, require, window */ | ||
|
|
||
| ;(function (factory) { | ||
| 'use strict'; | ||
| if (typeof define === 'function' && define.amd) { | ||
| // Register as an anonymous AMD module: | ||
| define([ | ||
| 'jquery', | ||
| './jquery.fileupload' | ||
| ], factory); | ||
| } else if (typeof exports === 'object') { | ||
| // Node/CommonJS: | ||
| factory( | ||
| require('jquery'), | ||
| require('./jquery.fileupload') | ||
| ); | ||
| } else { | ||
| // Browser globals: | ||
| factory( | ||
| window.jQuery | ||
| ); | ||
| } | ||
| }(function ($) { | ||
| 'use strict'; | ||
|
|
||
| var originalAdd = $.blueimp.fileupload.prototype.options.add; | ||
|
|
||
| // The File Upload Processing plugin extends the fileupload widget | ||
| // with file processing functionality: | ||
| $.widget('blueimp.fileupload', $.blueimp.fileupload, { | ||
|
|
||
| options: { | ||
| // The list of processing actions: | ||
| processQueue: [ | ||
| /* | ||
| { | ||
| action: 'log', | ||
| type: 'debug' | ||
| } | ||
| */ | ||
| ], | ||
| add: function (e, data) { | ||
| var $this = $(this); | ||
| data.process(function () { | ||
| return $this.fileupload('process', data); | ||
| }); | ||
| originalAdd.call(this, e, data); | ||
| } | ||
| }, | ||
|
|
||
| processActions: { | ||
| /* | ||
| log: function (data, options) { | ||
| console[options.type]( | ||
| 'Processing "' + data.files[data.index].name + '"' | ||
| ); | ||
| } | ||
| */ | ||
| }, | ||
|
|
||
| _processFile: function (data, originalData) { | ||
| var that = this, | ||
| dfd = $.Deferred().resolveWith(that, [data]), | ||
| chain = dfd.promise(); | ||
| this._trigger('process', null, data); | ||
| $.each(data.processQueue, function (i, settings) { | ||
| var func = function (data) { | ||
| if (originalData.errorThrown) { | ||
| return $.Deferred() | ||
| .rejectWith(that, [originalData]).promise(); | ||
| } | ||
| return that.processActions[settings.action].call( | ||
| that, | ||
| data, | ||
| settings | ||
| ); | ||
| }; | ||
| chain = chain.then(func, settings.always && func); | ||
| }); | ||
| chain | ||
| .done(function () { | ||
| that._trigger('processdone', null, data); | ||
| that._trigger('processalways', null, data); | ||
| }) | ||
| .fail(function () { | ||
| that._trigger('processfail', null, data); | ||
| that._trigger('processalways', null, data); | ||
| }); | ||
| return chain; | ||
| }, | ||
|
|
||
| // Replaces the settings of each processQueue item that | ||
| // are strings starting with an "@", using the remaining | ||
| // substring as key for the option map, | ||
| // e.g. "@autoUpload" is replaced with options.autoUpload: | ||
| _transformProcessQueue: function (options) { | ||
| var processQueue = []; | ||
| $.each(options.processQueue, function () { | ||
| var settings = {}, | ||
| action = this.action, | ||
| prefix = this.prefix === true ? action : this.prefix; | ||
| $.each(this, function (key, value) { | ||
| if ($.type(value) === 'string' && | ||
| value.charAt(0) === '@') { | ||
| settings[key] = options[ | ||
| value.slice(1) || (prefix ? prefix + | ||
| key.charAt(0).toUpperCase() + key.slice(1) : key) | ||
| ]; | ||
| } else { | ||
| settings[key] = value; | ||
| } | ||
|
|
||
| }); | ||
| processQueue.push(settings); | ||
| }); | ||
| options.processQueue = processQueue; | ||
| }, | ||
|
|
||
| // Returns the number of files currently in the processsing queue: | ||
| processing: function () { | ||
| return this._processing; | ||
| }, | ||
|
|
||
| // Processes the files given as files property of the data parameter, | ||
| // returns a Promise object that allows to bind callbacks: | ||
| process: function (data) { | ||
| var that = this, | ||
| options = $.extend({}, this.options, data); | ||
| if (options.processQueue && options.processQueue.length) { | ||
| this._transformProcessQueue(options); | ||
| if (this._processing === 0) { | ||
| this._trigger('processstart'); | ||
| } | ||
| $.each(data.files, function (index) { | ||
| var opts = index ? $.extend({}, options) : options, | ||
| func = function () { | ||
| if (data.errorThrown) { | ||
| return $.Deferred() | ||
| .rejectWith(that, [data]).promise(); | ||
| } | ||
| return that._processFile(opts, data); | ||
| }; | ||
| opts.index = index; | ||
| that._processing += 1; | ||
| that._processingQueue = that._processingQueue.then(func, func) | ||
| .always(function () { | ||
| that._processing -= 1; | ||
| if (that._processing === 0) { | ||
| that._trigger('processstop'); | ||
| } | ||
| }); | ||
| }); | ||
| } | ||
| return this._processingQueue; | ||
| }, | ||
|
|
||
| _create: function () { | ||
| this._super(); | ||
| this._processing = 0; | ||
| this._processingQueue = $.Deferred().resolveWith(this) | ||
| .promise(); | ||
| } | ||
|
|
||
| }); | ||
|
|
||
| })); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| * jQuery File Upload Validation Plugin | ||
| * https://github.com/blueimp/jQuery-File-Upload | ||
| * | ||
| * Copyright 2013, Sebastian Tschan | ||
| * https://blueimp.net | ||
| * | ||
| * Licensed under the MIT license: | ||
| * https://opensource.org/licenses/MIT | ||
| */ | ||
|
|
||
| /* global define, require, window */ | ||
|
|
||
| ;(function (factory) { | ||
| 'use strict'; | ||
| if (typeof define === 'function' && define.amd) { | ||
| // Register as an anonymous AMD module: | ||
| define([ | ||
| 'jquery', | ||
| './jquery.fileupload-process' | ||
| ], factory); | ||
| } else if (typeof exports === 'object') { | ||
| // Node/CommonJS: | ||
| factory( | ||
| require('jquery'), | ||
| require('./jquery.fileupload-process') | ||
| ); | ||
| } else { | ||
| // Browser globals: | ||
| factory( | ||
| window.jQuery | ||
| ); | ||
| } | ||
| }(function ($) { | ||
| 'use strict'; | ||
|
|
||
| // Append to the default processQueue: | ||
| $.blueimp.fileupload.prototype.options.processQueue.push( | ||
| { | ||
| action: 'validate', | ||
| // Always trigger this action, | ||
| // even if the previous action was rejected: | ||
| always: true, | ||
| // Options taken from the global options map: | ||
| acceptFileTypes: '@', | ||
| maxFileSize: '@', | ||
| minFileSize: '@', | ||
| maxNumberOfFiles: '@', | ||
| disabled: '@disableValidation' | ||
| } | ||
| ); | ||
|
|
||
| // The File Upload Validation plugin extends the fileupload widget | ||
| // with file validation functionality: | ||
| $.widget('blueimp.fileupload', $.blueimp.fileupload, { | ||
|
|
||
| options: { | ||
| /* | ||
| // The regular expression for allowed file types, matches | ||
| // against either file type or file name: | ||
| acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, | ||
| // The maximum allowed file size in bytes: | ||
| maxFileSize: 10000000, // 10 MB | ||
| // The minimum allowed file size in bytes: | ||
| minFileSize: undefined, // No minimal file size | ||
| // The limit of files to be uploaded: | ||
| maxNumberOfFiles: 10, | ||
| */ | ||
|
|
||
| // Function returning the current number of files, | ||
| // has to be overriden for maxNumberOfFiles validation: | ||
| getNumberOfFiles: $.noop, | ||
|
|
||
| // Error and info messages: | ||
| messages: { | ||
| maxNumberOfFiles: 'Maximum number of files exceeded', | ||
| acceptFileTypes: 'File type not allowed', | ||
| maxFileSize: 'File is too large', | ||
| minFileSize: 'File is too small' | ||
| } | ||
| }, | ||
|
|
||
| processActions: { | ||
|
|
||
| validate: function (data, options) { | ||
| if (options.disabled) { | ||
| return data; | ||
| } | ||
| var dfd = $.Deferred(), | ||
| settings = this.options, | ||
| file = data.files[data.index], | ||
| fileSize; | ||
| if (options.minFileSize || options.maxFileSize) { | ||
| fileSize = file.size; | ||
| } | ||
| if ($.type(options.maxNumberOfFiles) === 'number' && | ||
| (settings.getNumberOfFiles() || 0) + data.files.length > | ||
| options.maxNumberOfFiles) { | ||
| file.error = settings.i18n('maxNumberOfFiles'); | ||
| } else if (options.acceptFileTypes && | ||
| !(options.acceptFileTypes.test(file.type) || | ||
| options.acceptFileTypes.test(file.name))) { | ||
| file.error = settings.i18n('acceptFileTypes'); | ||
| } else if (fileSize > options.maxFileSize) { | ||
| file.error = settings.i18n('maxFileSize'); | ||
| } else if ($.type(fileSize) === 'number' && | ||
| fileSize < options.minFileSize) { | ||
| file.error = settings.i18n('minFileSize'); | ||
| } else { | ||
| delete file.error; | ||
| } | ||
| if (file.error || data.files.error) { | ||
| data.files.error = true; | ||
| dfd.rejectWith(this, [data]); | ||
| } else { | ||
| dfd.resolveWith(this, [data]); | ||
| } | ||
| return dfd.promise(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| }); | ||
|
|
||
| })); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters