From a44bd91731d6594e6e2aff359e7cde769b62e0a8 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 23 Oct 2012 15:00:08 +0900 Subject: [PATCH 001/759] Return success status of DELETE request. Fixes #1796. --- server/php/upload.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index dcfa658a3..dbea04c98 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ generate_response($info, $print_response); + return $this->generate_response($success, $print_response); } } From 825879e070d60e02067caf5315a0e08ff6acb96b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 23 Oct 2012 16:39:56 +0900 Subject: [PATCH 002/759] Improved NoScript usability. --- css/jquery.fileupload-ui-noscript.css | 27 +++++++++++++++++++++++++++ index.html | 10 +++++++--- js/main.js | 19 ++++++++++++------- 3 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 css/jquery.fileupload-ui-noscript.css diff --git a/css/jquery.fileupload-ui-noscript.css b/css/jquery.fileupload-ui-noscript.css new file mode 100644 index 000000000..c45048559 --- /dev/null +++ b/css/jquery.fileupload-ui-noscript.css @@ -0,0 +1,27 @@ +@charset "UTF-8"; +/* + * jQuery File Upload UI Plugin NoScript CSS 1.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.fileinput-button input { + position: static; + opacity: 1; + filter: none; + transform: none; + font-size: inherit; + direction: inherit; +} + +.fileinput-button span, +.fileinput-button i, +.fileupload-buttonbar .delete, +.fileupload-buttonbar .toggle { + display: none; +} diff --git a/index.html b/index.html index c04c54f9c..cb8be2dd1 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ + + @@ -46,7 +48,7 @@ jQuery File Upload
    -
  • Demo
    • +
  • Demo
  • Downloads
  • Source Code
  • Documentation
    • @@ -68,7 +70,9 @@

    jQuery File Upload Demo


    -
    + + +
    diff --git a/js/main.js b/js/main.js index 01c86feba..65c75890b 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin JS Example 6.7 + * jQuery File Upload Plugin JS Example 6.10 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -16,7 +16,9 @@ $(function () { 'use strict'; // Initialize the jQuery File Upload widget: - $('#fileupload').fileupload(); + $('#fileupload').fileupload({ + url: 'server/php/' + }); // Enable iframe cross-domain access via redirect option: $('#fileupload').fileupload( @@ -66,12 +68,15 @@ $(function () { // Load existing files: $('#fileupload').each(function () { var that = this; - $.getJSON(this.action, function (result) { - if (result && result.length) { - $(that).fileupload('option', 'done') - .call(that, null, {result: result}); + $.getJSON( + $(this).fileupload('option', 'url'), + function (result) { + if (result && result.length) { + $(that).fileupload('option', 'done') + .call(that, null, {result: result}); + } } - }); + ); }); } From dde9fa5ac0e66a8f8c92e02b99ae09b130e9cfc7 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 23 Oct 2012 16:59:42 +0900 Subject: [PATCH 003/759] Only use fmt.Sprintf if redirect URL contains "%s". --- server/gae-go/app/main.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/gae-go/app/main.go b/server/gae-go/app/main.go index c87724700..711cac20b 100644 --- a/server/gae-go/app/main.go +++ b/server/gae-go/app/main.go @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin GAE Go Example 2.1.2 + * jQuery File Upload Plugin GAE Go Example 2.1.3 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2011, Sebastian Tschan @@ -219,10 +219,13 @@ func post(w http.ResponseWriter, r *http.Request) { b, err := json.Marshal(handleUploads(r)) check(err) if redirect := r.FormValue("redirect"); redirect != "" { - http.Redirect(w, r, fmt.Sprintf( - redirect, - escape(string(b)), - ), http.StatusFound) + if strings.Contains(redirect, "%s") { + redirect = fmt.Sprintf( + redirect, + escape(string(b)), + ) + } + http.Redirect(w, r, redirect, http.StatusFound) return } w.Header().Set("Cache-Control", "no-cache") From f685a1650a0a7c4d96052ea557b0bcb46f2601cc Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 24 Oct 2012 13:35:04 +0900 Subject: [PATCH 004/759] Updated requirements to Widget Factory 1.9+. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a80c64124..a99438d30 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Please also provide a [JSFiddle](http://jsfiddle.net/) to allow to reproduce the ## Requirements * [jQuery](http://jquery.com/) v. 1.6+ -* [jQuery UI widget factory](http://wiki.jqueryui.com/w/page/12138135/Widget%20factory) v. 1.8+ (included) +* [jQuery UI widget factory](http://api.jqueryui.com/jQuery.widget/) v. 1.9+ (included) * [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/jquery.iframe-transport.js) (included) * [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.1.0+ (optional) * [JavaScript Load Image function](https://github.com/blueimp/JavaScript-Load-Image) v. 1.2.1+ (optional) From 58161d234158b00a9321e4eed157a4e6eabfb898 Mon Sep 17 00:00:00 2001 From: sieppl Date: Thu, 25 Oct 2012 19:06:53 +0300 Subject: [PATCH 005/759] Update server/php/upload.class.php Changing options merge to array_merge in order to have full control when passing options array. https://github.com/blueimp/jQuery-File-Upload/issues/1807 --- server/php/upload.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index dbea04c98..53d1f4f42 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -91,7 +91,7 @@ function __construct($options = null, $initialize = true) { ) ); if ($options) { - $this->options = array_replace_recursive($this->options, $options); + $this->options = array_merge($this->options, $options); } if ($initialize) { $this->initialize(); From 76a0e49b63f8cbe30d41b9a6119fd71b23f48d42 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Oct 2012 10:28:10 +0900 Subject: [PATCH 006/759] Simplify enabling CORS with credentials. Please note the following Chrome issue: http://code.google.com/p/chromium/issues/detail?id=158148 --- index.html | 4 +-- js/jquery.fileupload-ui.js | 9 +++---- js/main.js | 26 +++++++++--------- server/php/upload.class.php | 53 ++++++++++++++++++++++++++++--------- test/index.html | 6 ++--- test/test.js | 8 +++--- 6 files changed, 68 insertions(+), 38 deletions(-) diff --git a/index.html b/index.html index cb8be2dd1..1cb85018b 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ -
    +
    @@ -120,7 +120,7 @@

    {% } %} - diff --git a/test/test.js b/test/test.js index 903626e09..82cdb5eb7 100644 --- a/test/test.js +++ b/test/test.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin Test 6.10 + * jQuery File Upload Plugin Test 6.11 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -811,9 +811,9 @@ $(function () { 'non-multipart upload sets file type as contentType' ); strictEqual( - data.headers['X-File-Name'], - param.files[0].name, - 'non-multipart upload sets X-File-Name header' + data.headers['Content-Disposition'], + 'attachment; filename="' + param.files[0].name + '"', + 'non-multipart upload sets Content-Disposition header' ); start(); } From 48ba2c6d5c426c169a03280971165562ade9dfc3 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Oct 2012 11:10:03 +0900 Subject: [PATCH 007/759] Return error message when post_max_size is exceeded. Fixes #1800. --- server/php/upload.class.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index e5a2f2004..b106535f9 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ 'Missing a temporary folder', 7 => 'Failed to write file to disk', 8 => 'A PHP extension stopped the file upload', + 'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', 'max_file_size' => 'File is too big', 'min_file_size' => 'File is too small', 'accept_file_types' => 'Filetype not allowed', @@ -326,13 +327,28 @@ protected function get_error_message($error) { $this->error_messages[$error] : $error; } + function get_config_bytes($val) { + $val = trim($val); + $last = strtolower($val[strlen($val)-1]); + switch($last) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + } + return $this->fix_integer_overflow($val); + } + protected function validate($uploaded_file, $file, $error, $index) { if ($error) { $file->error = $this->get_error_message($error); return false; } - if (!$file->name) { - $file->error = $this->get_error_message('missingFileName'); + $content_length = $this->fix_integer_overflow(intval($_SERVER['CONTENT_LENGTH'])); + if ($content_length > $this->get_config_bytes(ini_get('post_max_size'))) { + $file->error = $this->get_error_message('post_max_size'); return false; } if (!preg_match($this->options['accept_file_types'], $file->name)) { @@ -342,7 +358,7 @@ protected function validate($uploaded_file, $file, $error, $index) { if ($uploaded_file && is_uploaded_file($uploaded_file)) { $file_size = $this->get_file_size($uploaded_file); } else { - $file_size = $_SERVER['CONTENT_LENGTH']; + $file_size = $content_length; } if ($this->options['max_file_size'] && ( $file_size > $this->options['max_file_size'] || From 88f465319aa87a18c996d3543f4e14d95df604b8 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Oct 2012 12:19:00 +0900 Subject: [PATCH 008/759] Updated jQuery UI Widget Factory to version 1.9.1. --- js/vendor/jquery.ui.widget.js | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/js/vendor/jquery.ui.widget.js b/js/vendor/jquery.ui.widget.js index 937ebfda4..886aff691 100644 --- a/js/vendor/jquery.ui.widget.js +++ b/js/vendor/jquery.ui.widget.js @@ -1,5 +1,5 @@ /* - * jQuery UI Widget 1.9.0+amd + * jQuery UI Widget 1.9.1+amd * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012 jQuery Foundation and other contributors @@ -110,7 +110,7 @@ $.widget = function( name, base, prototype ) { // TODO: remove support for widgetEventPrefix // always use the name + a colon as the prefix, e.g., draggable:start // don't prefix for widgets that aren't DOM-based - widgetEventPrefix: name + widgetEventPrefix: basePrototype.widgetEventPrefix || name }, prototype, { constructor: constructor, namespace: namespace, @@ -151,8 +151,17 @@ $.widget.extend = function( target ) { for ( ; inputIndex < inputLength; inputIndex++ ) { for ( key in input[ inputIndex ] ) { value = input[ inputIndex ][ key ]; - if (input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) { - target[ key ] = $.isPlainObject( value ) ? $.widget.extend( {}, target[ key ], value ) : value; + if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) { + // Clone objects + if ( $.isPlainObject( value ) ) { + target[ key ] = $.isPlainObject( target[ key ] ) ? + $.widget.extend( {}, target[ key ], value ) : + // Don't extend strings, arrays, etc. with objects + $.widget.extend( {}, value ); + // Copy everything else by reference + } else { + target[ key ] = value; + } } } } @@ -205,7 +214,7 @@ $.widget.bridge = function( name, object ) { }; }; -$.Widget = function( options, element ) {}; +$.Widget = function( /* options, element */ ) {}; $.Widget._childConstructors = []; $.Widget.prototype = { @@ -237,7 +246,13 @@ $.Widget.prototype = { // TODO remove dual storage $.data( element, this.widgetName, this ); $.data( element, this.widgetFullName, this ); - this._on({ remove: "destroy" }); + this._on( this.element, { + remove: function( event ) { + if ( event.target === element ) { + this.destroy(); + } + } + }); this.document = $( element.style ? // element within the document element.ownerDocument : @@ -356,17 +371,19 @@ $.Widget.prototype = { }, _on: function( element, handlers ) { + var delegateElement, + instance = this; // no element argument, shuffle and use this.element if ( !handlers ) { handlers = element; element = this.element; + delegateElement = this.widget(); } else { // accept selectors, DOM elements - element = $( element ); + element = delegateElement = $( element ); this.bindings = this.bindings.add( element ); } - var instance = this; $.each( handlers, function( event, handler ) { function handlerProxy() { // allow widgets to customize the disabled handling @@ -390,7 +407,7 @@ $.Widget.prototype = { eventName = match[1] + instance.eventNamespace, selector = match[2]; if ( selector ) { - instance.widget().delegate( selector, eventName, handlerProxy ); + delegateElement.delegate( selector, eventName, handlerProxy ); } else { element.bind( eventName, handlerProxy ); } From 1e1ec5ab30fd58e4255bd2e01d029b777ae28b80 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Oct 2012 12:32:29 +0900 Subject: [PATCH 009/759] Updated version number. --- server/php/upload.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 51837e415..b5550ef17 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ Date: Tue, 30 Oct 2012 12:08:25 +0900 Subject: [PATCH 010/759] Fixed arguments handling for rejected piped uploads. Fixes #1812. --- js/jquery.fileupload.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 5504ebec0..6356012f3 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.19.2 + * jQuery File Upload Plugin 5.19.3 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -644,18 +644,18 @@ _onSend: function (e, data) { var that = this, jqXHR, + aborted, slot, pipe, options = that._getAJAXSettings(data), - send = function (resolve, args) { + send = function () { that._sending += 1; // Set timer for bitrate progress calculation: options._bitrateTimer = new that._BitrateTimer(); jqXHR = jqXHR || ( - (resolve !== false && - that._trigger('send', e, options) !== false && - (that._chunkedUpload(options) || $.ajax(options))) || - that._getXHRPromise(false, options.context, args) + ((aborted || that._trigger('send', e, options) === false) && + that._getXHRPromise(false, options.context, aborted)) || + that._chunkedUpload(options) || $.ajax(options) ).done(function (result, textStatus, jqXHR) { that._onDone(result, textStatus, jqXHR, options); }).fail(function (jqXHR, textStatus, errorThrown) { @@ -705,12 +705,12 @@ // which is delegated to the jqXHR object of the current upload, // and jqXHR callbacks mapped to the equivalent Promise methods: pipe.abort = function () { - var args = [undefined, 'abort', 'abort']; + aborted = [undefined, 'abort', 'abort']; if (!jqXHR) { if (slot) { - slot.rejectWith(pipe, args); + slot.rejectWith(options.context, aborted); } - return send(false, args); + return send(); } return jqXHR.abort(); }; From 05d87a063e4ee80e3862036b3765a5b8adfa4e79 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Wed, 31 Oct 2012 14:03:11 -0700 Subject: [PATCH 011/759] Changed split() to be preg_split() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit split() is deprecated in php 5.3 and throws an E_Deprecated warning when running strict that breaks the chunked uploads.  Switching to preg_split() fixes the issue. --- server/php/upload.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index b5550ef17..5c84f06b7 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -665,7 +665,7 @@ public function post($print_response = true) { // Parse the Content-Range header, which has the following form: // Content-Range: bytes 0-524287/2000000 $content_range = isset($_SERVER['HTTP_CONTENT_RANGE']) ? - split('[^0-9]+', $_SERVER['HTTP_CONTENT_RANGE']) : null; + preg_split("/[^0-9]+/", $_SERVER['HTTP_CONTENT_RANGE']) : null; $size = $content_range ? $content_range[3] : null; $info = array(); if ($upload && is_array($upload['tmp_name'])) { From 401e27213b6756ef6cdc0d425b1d859abd80cadc Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 1 Nov 2012 13:09:01 +0100 Subject: [PATCH 012/759] Updated version number and ensured quoting consistency. --- server/php/upload.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 5c84f06b7..e290d1c1e 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ Date: Fri, 2 Nov 2012 08:52:59 +0100 Subject: [PATCH 013/759] Added Opera Mobile to the list of supported browsers. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a99438d30..4197bab50 100644 --- a/README.md +++ b/README.md @@ -83,9 +83,10 @@ The File Upload plugin is regularly tested with the latest browser versions and ### Mobile browsers The File Upload plugin has been tested with and supports the following mobile browsers: -* Apple Safari Mobile on iOS 6.0+ +* Apple Safari on iOS 6.0+ * Google Chrome on iOS 6.0+ * Default Browser on Android 2.3+ +* Opera Mobile 12.0+ ### Supported features For a detailed overview of the features supported by each browser version please have a look at the [Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support). From 1b9824aeeccf3dd3b7fe8b09800c670390d66a68 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 8 Nov 2012 11:10:09 +0100 Subject: [PATCH 014/759] Handle errors in loadImage call. Fixes #1836. --- js/jquery.fileupload-fp.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/jquery.fileupload-fp.js b/js/jquery.fileupload-fp.js index 2102b8b52..fdf18fb5d 100644 --- a/js/jquery.fileupload-fp.js +++ b/js/jquery.fileupload-fp.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload File Processing Plugin 1.2 + * jQuery File Upload File Processing Plugin 1.2.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -86,6 +86,9 @@ loadImage( file, function (img) { + if (!img.src) { + return dfd.rejectWith(that, [data]); + } data.img = img; dfd.resolveWith(that, [data]); } From 541aa7e928eca90d8220a2b58c9b57673ea11871 Mon Sep 17 00:00:00 2001 From: J Cobb Date: Sun, 11 Nov 2012 17:09:18 -0700 Subject: [PATCH 015/759] Fixes #1844 by adding recursive=true to the mkdir() to allow creation of nested directories --- server/php/upload.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index e290d1c1e..4de62035f 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -482,7 +482,7 @@ protected function handle_file_upload($uploaded_file, $name, $size, $type, $erro $this->handle_form_data($file, $index); $upload_dir = $this->get_upload_path(); if (!is_dir($upload_dir)) { - mkdir($upload_dir, $this->options['mkdir_mode']); + mkdir($upload_dir, $this->options['mkdir_mode'], true); } $file_path = $this->get_upload_path($file->name); $append_file = $content_range && is_file($file_path) && From 4896697edfad56b135aa8cf3099a7af502fea42f Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 12 Nov 2012 09:46:00 +0100 Subject: [PATCH 016/759] Allow recursive directory creation for all mkdir calls. --- server/php/upload.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 4de62035f..8ecfa74b2 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ get_upload_path(); if (!is_dir($upload_dir)) { - mkdir($upload_dir, $this->options['mkdir_mode']); + mkdir($upload_dir, $this->options['mkdir_mode'], true); } return array_values(array_filter(array_map( array($this, $iteration_method), @@ -258,7 +258,7 @@ protected function create_scaled_image($file_name, $version, $options) { if (!empty($version)) { $version_dir = $this->get_upload_path(null, $version); if (!is_dir($version_dir)) { - mkdir($version_dir, $this->options['mkdir_mode']); + mkdir($version_dir, $this->options['mkdir_mode'], true); } $new_file_path = $version_dir.'/'.$file_name; } else { From b9728e3c6a70f09d7d0df8f1a4e419f2fb0ea09b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 12 Nov 2012 15:23:03 +0100 Subject: [PATCH 017/759] Added a check to see if exif_read_data function is available. Thanks to J Cobb for the contribution: https://github.com/blueimp/jQuery-File-Upload/pull/1847 --- server/php/upload.class.php | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 8ecfa74b2..12825827b 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ Date: Wed, 14 Nov 2012 10:10:45 +0100 Subject: [PATCH 018/759] Update to jQuery version 1.8.3. --- cors/postmessage.html | 2 +- index.html | 2 +- test/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cors/postmessage.html b/cors/postmessage.html index 13cf191bd..b0b2cce08 100644 --- a/cors/postmessage.html +++ b/cors/postmessage.html @@ -15,7 +15,7 @@ jQuery File Upload Plugin postMessage API - + - + diff --git a/test/index.html b/test/index.html index cac027f4a..debd1c2aa 100644 --- a/test/index.html +++ b/test/index.html @@ -129,7 +129,7 @@

    {% } %} - + From 9b7ac2624e98fadac83da018935cfcaab9825d95 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 14 Nov 2012 15:20:05 +0100 Subject: [PATCH 019/759] Don't create upload directories when retrieving files - Fixes #1857. --- server/php/upload.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 12825827b..d3efc043e 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ get_upload_path(); if (!is_dir($upload_dir)) { - mkdir($upload_dir, $this->options['mkdir_mode'], true); + return array(); } return array_values(array_filter(array_map( array($this, $iteration_method), From 57a8d4199db6c71fc5c6e893c2de2ffed2d3e9aa Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 17 Nov 2012 20:38:34 +0100 Subject: [PATCH 020/759] Allow PATCH and PUT methods for file uploads. Fixed switch case intendation inside of the image orientation method. --- server/php/upload.class.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index d3efc043e..9d7c4f6e3 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -53,6 +53,7 @@ function __construct($options = null, $initialize = true) { 'GET', 'POST', 'PUT', + 'PATCH', 'DELETE' ), 'access_control_allow_headers' => array( @@ -123,6 +124,8 @@ protected function initialize() { case 'GET': $this->get(); break; + case 'PATCH': + case 'PUT': case 'POST': $this->post(); break; @@ -458,16 +461,16 @@ protected function orient_image($file_path) { $image = @imagecreatefromjpeg($file_path); switch ($orientation) { case 3: - $image = @imagerotate($image, 180, 0); - break; + $image = @imagerotate($image, 180, 0); + break; case 6: - $image = @imagerotate($image, 270, 0); - break; + $image = @imagerotate($image, 270, 0); + break; case 8: - $image = @imagerotate($image, 90, 0); - break; + $image = @imagerotate($image, 90, 0); + break; default: - return false; + return false; } $success = imagejpeg($image, $file_path); // Free up memory (imagedestroy does not delete files): From c380e3be420ab92b2fc2731889aa27dbc9ce2192 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 17 Nov 2012 20:49:50 +0100 Subject: [PATCH 021/759] Updated version number. --- server/php/upload.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 9d7c4f6e3..4d53c8eaf 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ Date: Sat, 17 Nov 2012 21:01:26 +0100 Subject: [PATCH 022/759] Fixed intendation. --- server/php/upload.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 4d53c8eaf..46415496f 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -635,7 +635,7 @@ public function head() { // Prevent Internet Explorer from MIME-sniffing the content-type: header('X-Content-Type-Options: nosniff'); if ($this->options['access_control_allow_origin']) { - $this->send_access_control_headers(); + $this->send_access_control_headers(); } $this->send_content_type_header(); } From a706781bd6b4abd8c0be36c356c99169d76ba758 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 17 Nov 2012 21:44:53 +0100 Subject: [PATCH 023/759] Wrapped header, echo and readfile calls in object methods. This allows extending classes to handle the response. --- server/php/upload.class.php | 66 ++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/server/php/upload.class.php b/server/php/upload.class.php index 46415496f..1a4ae0664 100644 --- a/server/php/upload.class.php +++ b/server/php/upload.class.php @@ -1,6 +1,6 @@ delete(); break; default: - header('HTTP/1.1 405 Method Not Allowed'); + $this->header('HTTP/1.1 405 Method Not Allowed'); } } @@ -540,21 +540,33 @@ protected function handle_file_upload($uploaded_file, $name, $size, $type, $erro return $file; } + protected function readfile($file_path) { + return readfile($file_path); + } + + protected function body($str) { + echo $str; + } + + protected function header($str) { + header($str); + } + protected function generate_response($content, $print_response = true) { if ($print_response) { $json = json_encode($content); $redirect = isset($_REQUEST['redirect']) ? stripslashes($_REQUEST['redirect']) : null; if ($redirect) { - header('Location: '.sprintf($redirect, rawurlencode($json))); + $this->header('Location: '.sprintf($redirect, rawurlencode($json))); return; } $this->head(); if (isset($_SERVER['HTTP_CONTENT_RANGE']) && is_array($content) && is_object($content[0]) && $content[0]->size) { - header('Range: 0-'.($this->fix_integer_overflow(intval($content[0]->size)) - 1)); + $this->header('Range: 0-'.($this->fix_integer_overflow(intval($content[0]->size)) - 1)); } - echo $json; + $this->body($json); } return $content; } @@ -583,7 +595,7 @@ protected function get_file_type($file_path) { protected function download() { if (!$this->options['download_via_php']) { - header('HTTP/1.1 403 Forbidden'); + $this->header('HTTP/1.1 403 Forbidden'); return; } $file_name = $this->get_file_name_param(); @@ -591,49 +603,49 @@ protected function download() { $file_path = $this->get_upload_path($file_name, $this->get_version_param()); if (is_file($file_path)) { if (!preg_match($this->options['inline_file_types'], $file_name)) { - header('Content-Description: File Transfer'); - header('Content-Type: application/octet-stream'); - header('Content-Disposition: attachment; filename="'.$file_name.'"'); - header('Content-Transfer-Encoding: binary'); + $this->header('Content-Description: File Transfer'); + $this->header('Content-Type: application/octet-stream'); + $this->header('Content-Disposition: attachment; filename="'.$file_name.'"'); + $this->header('Content-Transfer-Encoding: binary'); } else { // Prevent Internet Explorer from MIME-sniffing the content-type: - header('X-Content-Type-Options: nosniff'); - header('Content-Type: '.$this->get_file_type($file_path)); - header('Content-Disposition: inline; filename="'.$file_name.'"'); + $this->header('X-Content-Type-Options: nosniff'); + $this->header('Content-Type: '.$this->get_file_type($file_path)); + $this->header('Content-Disposition: inline; filename="'.$file_name.'"'); } - header('Content-Length: '.$this->get_file_size($file_path)); - header('Last-Modified: '.gmdate('D, d M Y H:i:s T', filemtime($file_path))); - readfile($file_path); + $this->header('Content-Length: '.$this->get_file_size($file_path)); + $this->header('Last-Modified: '.gmdate('D, d M Y H:i:s T', filemtime($file_path))); + $this->readfile($file_path); } } } protected function send_content_type_header() { - header('Vary: Accept'); + $this->header('Vary: Accept'); if (isset($_SERVER['HTTP_ACCEPT']) && (strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) { - header('Content-type: application/json'); + $this->header('Content-type: application/json'); } else { - header('Content-type: text/plain'); + $this->header('Content-type: text/plain'); } } protected function send_access_control_headers() { - header('Access-Control-Allow-Origin: '.$this->options['access_control_allow_origin']); - header('Access-Control-Allow-Credentials: ' + $this->header('Access-Control-Allow-Origin: '.$this->options['access_control_allow_origin']); + $this->header('Access-Control-Allow-Credentials: ' .($this->options['access_control_allow_credentials'] ? 'true' : 'false')); - header('Access-Control-Allow-Methods: ' + $this->header('Access-Control-Allow-Methods: ' .implode(', ', $this->options['access_control_allow_methods'])); - header('Access-Control-Allow-Headers: ' + $this->header('Access-Control-Allow-Headers: ' .implode(', ', $this->options['access_control_allow_headers'])); } public function head() { - header('Pragma: no-cache'); - header('Cache-Control: no-store, no-cache, must-revalidate'); - header('Content-Disposition: inline; filename="files.json"'); + $this->header('Pragma: no-cache'); + $this->header('Cache-Control: no-store, no-cache, must-revalidate'); + $this->header('Content-Disposition: inline; filename="files.json"'); // Prevent Internet Explorer from MIME-sniffing the content-type: - header('X-Content-Type-Options: nosniff'); + $this->header('X-Content-Type-Options: nosniff'); if ($this->options['access_control_allow_origin']) { $this->send_access_control_headers(); } From 66b7e40b4ca08e5afbb6a2533cb1e371db8ebe3c Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 17 Nov 2012 22:28:52 +0100 Subject: [PATCH 024/759] Use the class name for the upload handler file name. --- server/php/{upload.class.php => UploadHandler.php} | 0 server/php/index.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename server/php/{upload.class.php => UploadHandler.php} (100%) diff --git a/server/php/upload.class.php b/server/php/UploadHandler.php similarity index 100% rename from server/php/upload.class.php rename to server/php/UploadHandler.php diff --git a/server/php/index.php b/server/php/index.php index bb206fff0..3ae1295ef 100644 --- a/server/php/index.php +++ b/server/php/index.php @@ -11,5 +11,5 @@ */ error_reporting(E_ALL | E_STRICT); -require('upload.class.php'); +require('UploadHandler.php'); $upload_handler = new UploadHandler(); From ce1202967ad55d26734f0a0e109eb3663469750a Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 19 Nov 2012 17:22:19 +0100 Subject: [PATCH 025/759] Added issue guidelines. --- CONTRIBUTING.md | 42 ++++++++++++++++++++++++++++++++++++++++++ README.md | 6 +----- 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..cc5fc5598 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,42 @@ +# Issue Guidelines + +The issues tracker should only be used for **bugs** or **feature requests**. + +Please post **support requests** and **general discussions** about this project to the [support forum](https://groups.google.com/d/forum/jquery-fileupload). + +## Bugs + +Please follow these guidelines before reporting a bug: + +1. **Update to the latest version** — Check if you can reproduce the issue with the latest version from the `master` branch. + +2. **Use the GitHub issue search** — check if the issue has already been reported. If it has been, please comment on the existing issue. + +3. **Isolate the demonstrable problem** — Try to reproduce the problem with the [Demo](http://blueimp.github.com/jQuery-File-Upload/) or with a reduced test case that includes the least amount of code necessary to reproduce the problem. + +4. **Provide a means to reproduce the problem** — Please provide as much details as possible, e.g. server information, browser and operating system versions, steps to reproduce the problem. If possible, provide a link to your reduced test case, e.g. via [JSFiddle](http://jsfiddle.net/). + + +## Feature requests + +Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for exising issues before posting a new request. + +Generally, feature requests might be accepted if the implementation would benefit a broader use case or the project could be considered incomplete without that feature. + +If you need help integrating this project into another framework, please post your request to the [support forum](https://groups.google.com/d/forum/jquery-fileupload). + +## Pull requests + +[Pull requests](https://help.github.com/articles/using-pull-requests) are welcome and the preferred way of accepting code contributions. + +However, if you add a server-side upload handler implementation for another framework, please continue to maintain this version in your own fork without sending a pull request. You are welcome to add a link and possibly documentation about your implementation to the [Wiki](https://github.com/blueimp/jQuery-File-Upload/wiki). + +Please follow these guidelines before sending a pull request: + +1. Update your fork to the latest upstream version. + +2. Follow the coding conventions of the original repository. Changes to one of the JavaScript source files are required to pass the [JSLint](http://jslint.com/) validation tool. + +3. Keep your commits as atomar as possible, i.e. create a new commit for every single bug fix or feature added. + +4. Always add meaningfull commit messages. diff --git a/README.md b/README.md index 4197bab50..9408d087f 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,7 @@ ## Support * **Support requests** and **general discussions** about the File Upload plugin can be posted to the official [support forum](https://groups.google.com/d/forum/jquery-fileupload). If your question is not directly related to the File Upload plugin, you might have a better chance to get a reply by posting to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload). -* **Bugs** in the File Upload plugin can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues). -Please try to reproduce the problem with the [Demo](http://blueimp.github.com/jQuery-File-Upload/) or with an unmodified setup. Problems with customizations should be posted to the [support forum](https://groups.google.com/d/forum/jquery-fileupload), especially for server-side problems. -Provide as much details about your test setup as possible (server information, browser and operating system versions). -Please also provide a [JSFiddle](http://jsfiddle.net/) to allow to reproduce the problem, if possible. -* **Feature requests** can also be posted to the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues) if the implementation would benefit a broader use case or the plugin could be considered incomplete without that feature. Else, please post your ideas to the [support forum](https://groups.google.com/d/forum/jquery-fileupload). +* **Bugs** and **Feature requests** can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues). Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before posting. ## Features * **Multiple file upload:** From 64a5f8b98536b73e46e299617b586a5fbdbf0f44 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 21 Nov 2012 10:04:37 +0100 Subject: [PATCH 026/759] Check for Blob and File objects to accomodate old Firefox versions. Fixed #1880. --- js/jquery.fileupload.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 6356012f3..fe0c5778a 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.19.3 + * jQuery File Upload Plugin 5.19.4 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -10,7 +10,7 @@ */ /*jslint nomen: true, unparam: true, regexp: true */ -/*global define, window, document, Blob, FormData, location */ +/*global define, window, document, File, Blob, FormData, location */ (function (factory) { 'use strict'; @@ -209,10 +209,10 @@ if (typeof options.formData === 'function') { return options.formData(options.form); } - if ($.isArray(options.formData)) { + if ($.isArray(options.formData)) { return options.formData; } - if (options.formData) { + if (options.formData) { formData = []; $.each(options.formData, function (name, value) { formData.push({name: name, value: value}); @@ -345,10 +345,12 @@ formData.append(paramName, options.blob, file.name); } else { $.each(options.files, function (index, file) { - // File objects are also Blob instances. + // Files are also Blob instances, but some browsers + // (Firefox 3.6) support the File API but not Blobs. // This check allows the tests to run with // dummy objects: - if (file instanceof Blob) { + if ((window.Blob && file instanceof Blob) || + (window.File && file instanceof File)) { formData.append( options.paramName[index] || paramName, file, @@ -758,7 +760,8 @@ that._onSend(e, this); return this.jqXHR; }; - return (result = that._trigger('add', e, newData)); + result = that._trigger('add', e, newData); + return result; }); return result; }, From ab0c11f2beb55bb8e703298575f3e3fec1bcf63b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 21 Nov 2012 10:31:12 +0100 Subject: [PATCH 027/759] Replace tabs with spaces. --- server/php/UploadHandler.php | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 1a4ae0664..3dbc31008 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -53,7 +53,7 @@ function __construct($options = null, $initialize = true) { 'GET', 'POST', 'PUT', - 'PATCH', + 'PATCH', 'DELETE' ), 'access_control_allow_headers' => array( @@ -124,8 +124,8 @@ protected function initialize() { case 'GET': $this->get(); break; - case 'PATCH': - case 'PUT': + case 'PATCH': + case 'PUT': case 'POST': $this->post(); break; @@ -461,16 +461,16 @@ protected function orient_image($file_path) { $image = @imagecreatefromjpeg($file_path); switch ($orientation) { case 3: - $image = @imagerotate($image, 180, 0); - break; + $image = @imagerotate($image, 180, 0); + break; case 6: - $image = @imagerotate($image, 270, 0); - break; + $image = @imagerotate($image, 270, 0); + break; case 8: - $image = @imagerotate($image, 90, 0); - break; + $image = @imagerotate($image, 90, 0); + break; default: - return false; + return false; } $success = imagejpeg($image, $file_path); // Free up memory (imagedestroy does not delete files): @@ -540,17 +540,17 @@ protected function handle_file_upload($uploaded_file, $name, $size, $type, $erro return $file; } - protected function readfile($file_path) { - return readfile($file_path); - } + protected function readfile($file_path) { + return readfile($file_path); + } - protected function body($str) { - echo $str; - } - - protected function header($str) { - header($str); - } + protected function body($str) { + echo $str; + } + + protected function header($str) { + header($str); + } protected function generate_response($content, $print_response = true) { if ($print_response) { From d33a91e3876b1d9b2926aaf68834ef319815888e Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 21 Nov 2012 11:32:42 +0100 Subject: [PATCH 028/759] Define Opera 11 as minimal supported version. Closes #1881. Versions prior to Opera 11 fire the "load" callback for iframes before the DOM is ready and before the file upload request can complete. See http://stackoverflow.com/questions/7614658/opera-wont-recognize-iframe-l oad#answer-7614901 A workaround would be possible using setTimeout callbacks to check if the DOM is accessible, but since Opera 12 is stable this seems unnecessary. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9408d087f..65b6ab4fe 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ The File Upload plugin is regularly tested with the latest browser versions and * Google Chrome * Apple Safari 4.0+ * Mozilla Firefox 3.0+ -* Opera 10.0+ +* Opera 11.0+ * Microsoft Internet Explorer 6.0+ ### Mobile browsers From d766e2f226e58ffa3d838e4c23a2035d9d659b9a Mon Sep 17 00:00:00 2001 From: Pedro Faustino Date: Thu, 22 Nov 2012 13:06:18 +0100 Subject: [PATCH 029/759] Fixes display of bitrate with long decimal numbers. --- js/jquery.fileupload-ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index ad7f2f8aa..385ccddb1 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -361,7 +361,7 @@ if (bits >= 1000) { return (bits / 1000).toFixed(2) + ' kbit/s'; } - return bits + ' bit/s'; + return bits.toFixed(2) + ' bit/s'; }, _formatTime: function (seconds) { From 1fd38f212bf5ece8497e5008a9d79a4d1bd6a34a Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 22 Nov 2012 16:06:17 +0100 Subject: [PATCH 030/759] Updated version number. --- js/jquery.fileupload-ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index 385ccddb1..9a6619977 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 6.11 + * jQuery File Upload User Interface Plugin 6.11.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan From 712b5218c62b404b9ed1b42529de00f7e1b690a6 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 28 Nov 2012 11:33:22 +0100 Subject: [PATCH 031/759] Prevent default action only when dragging/dropping files - Fixes #1897. Thanks to Ville Lautanala (lautis) for his contribution. --- js/jquery.fileupload.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index fe0c5778a..08dd0892d 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.19.4 + * jQuery File Upload Plugin 5.19.5 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -952,10 +952,12 @@ }, _onDrop: function (e) { - e.preventDefault(); var that = this, dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer, data = {}; + if (dataTransfer && dataTransfer.files && dataTransfer.files.length) { + e.preventDefault(); + } this._getDroppedFiles(dataTransfer).always(function (files) { data.files = files; if (that._trigger('drop', e, data) !== false) { @@ -969,10 +971,10 @@ if (this._trigger('dragover', e) === false) { return false; } - if (dataTransfer) { + if (dataTransfer && dataTransfer.files && dataTransfer.files.length) { dataTransfer.dropEffect = 'copy'; + e.preventDefault(); } - e.preventDefault(); }, _initEventHandlers: function () { From 54d82436c4b160d21a4313040a26fe3d9b434fce Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 29 Nov 2012 21:27:36 +0100 Subject: [PATCH 032/759] Fixed regression drag&drop regression in Firefox - Closes #1901. --- js/jquery.fileupload.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 08dd0892d..40aa4c1a5 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.19.5 + * jQuery File Upload Plugin 5.19.6 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -971,7 +971,7 @@ if (this._trigger('dragover', e) === false) { return false; } - if (dataTransfer && dataTransfer.files && dataTransfer.files.length) { + if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1) { dataTransfer.dropEffect = 'copy'; e.preventDefault(); } From 7a77673e38dcf1fa92e2e735dabfe7df94ece315 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 4 Dec 2012 07:44:34 +0100 Subject: [PATCH 033/759] Pass the file type as contentType argument to the Blob.slice call. Remove the obsolete Content-Description header, which isn't necessary anymore to transfer the file type for Blob uploads. --- js/jquery.fileupload.js | 6 +++--- server/php/UploadHandler.php | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 40aa4c1a5..bc96a07ed 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.19.6 + * jQuery File Upload Plugin 5.19.7 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -341,7 +341,6 @@ if (options.blob) { options.headers['Content-Disposition'] = 'attachment; filename="' + encodeURI(file.name) + '"'; - options.headers['Content-Description'] = encodeURI(file.type); formData.append(paramName, options.blob, file.name); } else { $.each(options.files, function (index, file) { @@ -527,7 +526,8 @@ o.blob = slice.call( file, ub, - ub + mcs + ub + mcs, + file.type ); // Store the current chunk size, as the blob itself // will be dereferenced after data processing: diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 3dbc31008..3fc81ec86 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ array( 'Content-Type', 'Content-Range', - 'Content-Disposition', - 'Content-Description' + 'Content-Disposition' ), // Enable to provide file downloads via GET requests to the PHP script: 'download_via_php' => false, @@ -678,8 +677,6 @@ public function post($print_response = true) { '', $_SERVER['HTTP_CONTENT_DISPOSITION'] )) : null; - $file_type = isset($_SERVER['HTTP_CONTENT_DESCRIPTION']) ? - $_SERVER['HTTP_CONTENT_DESCRIPTION'] : null; // Parse the Content-Range header, which has the following form: // Content-Range: bytes 0-524287/2000000 $content_range = isset($_SERVER['HTTP_CONTENT_RANGE']) ? @@ -694,7 +691,7 @@ public function post($print_response = true) { $upload['tmp_name'][$index], $file_name ? $file_name : $upload['name'][$index], $size ? $size : $upload['size'][$index], - $file_type ? $file_type : $upload['type'][$index], + $upload['type'][$index], $upload['error'][$index], $index, $content_range @@ -709,8 +706,8 @@ public function post($print_response = true) { $upload['name'] : null), $size ? $size : (isset($upload['size']) ? $upload['size'] : $_SERVER['CONTENT_LENGTH']), - $file_type ? $file_type : (isset($upload['type']) ? - $upload['type'] : $_SERVER['CONTENT_TYPE']), + isset($upload['type']) ? + $upload['type'] : $_SERVER['CONTENT_TYPE'], isset($upload['error']) ? $upload['error'] : null, null, $content_range From 41d7d6107b9721c9656c6ce942b0c6045a2a78a4 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 4 Dec 2012 17:30:02 +0100 Subject: [PATCH 034/759] Clear the realpath and stat cache only for the specified filename. Closes #1911. --- server/php/UploadHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 3fc81ec86..4b6bf9086 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ fix_integer_overflow(filesize($file_path)); From fb455d8fe8365b0f4e8df84d7d6bdd6b739e0660 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Dec 2012 11:27:30 +0100 Subject: [PATCH 035/759] Wrap files array in an object for the JSON response. Sample response: {"files":[{"name":"cat.jpg","size":464885,"url":"http:\/\/example.org\/f iles\/cat.jpg","thumbnail_url":"http:\/\/example.org\/files\/thumbnail\/ cat.jpg","delete_url":"http:\/\/example.org\/files\/cat.jpg","delete_typ e":"DELETE"}]} --- js/jquery.fileupload-ui.js | 21 ++++++++++++++------- js/main.js | 8 +++----- server/gae-go/app/main.go | 6 ++++-- server/gae-python/main.py | 5 +++-- server/node/server.js | 10 +++++----- server/php/UploadHandler.php | 18 +++++++++--------- test/test.js | 6 +++--- 7 files changed, 41 insertions(+), 33 deletions(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index 9a6619977..bdd5465fd 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 6.11.1 + * jQuery File Upload User Interface Plugin 7.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -139,12 +139,12 @@ // Callback for successful uploads: done: function (e, data) { var that = $(this).data('fileupload'), + files = that._getFilesFromResponse(data), template; if (data.context) { data.context.each(function (index) { - var file = ($.isArray(data.result) && - data.result[index]) || - {error: 'Empty file upload result'}; + var file = files[index] || + {error: 'Empty file upload result'}; if (file.error) { that._adjustMaxNumberOfFiles(1); } @@ -164,8 +164,8 @@ ); }); } else { - if ($.isArray(data.result)) { - $.each(data.result, function (index, file) { + if (files.length) { + $.each(files, function (index, file) { if (data.maxNumberOfFilesAdjusted && file.error) { that._adjustMaxNumberOfFiles(1); } else if (!data.maxNumberOfFilesAdjusted && @@ -175,7 +175,7 @@ }); data.maxNumberOfFilesAdjusted = true; } - template = that._renderDownload(data.result) + template = that._renderDownload(files) .appendTo(that.options.filesContainer); that._forceReflow(template); that._transition(template).done( @@ -307,6 +307,13 @@ } }, + _getFilesFromResponse: function (data) { + if (data.result && $.isArray(data.result.files)) { + return data.result.files; + } + return []; + }, + // Link handler, that allows to download files // by drag & drop of the links to the desktop: _enableDragToDesktop: function () { diff --git a/js/main.js b/js/main.js index 394814516..dbabd8ff6 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin JS Example 6.11 + * jQuery File Upload Plugin JS Example 7.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -75,10 +75,8 @@ $(function () { dataType: 'json', context: $('#fileupload')[0] }).done(function (result) { - if (result && result.length) { - $(this).fileupload('option', 'done') - .call(this, null, {result: result}); - } + $(this).fileupload('option', 'done') + .call(this, null, {result: result}); }); } diff --git a/server/gae-go/app/main.go b/server/gae-go/app/main.go index 711cac20b..56b92da2a 100644 --- a/server/gae-go/app/main.go +++ b/server/gae-go/app/main.go @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin GAE Go Example 2.1.3 + * jQuery File Upload Plugin GAE Go Example 3.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2011, Sebastian Tschan @@ -216,7 +216,9 @@ func get(w http.ResponseWriter, r *http.Request) { } func post(w http.ResponseWriter, r *http.Request) { - b, err := json.Marshal(handleUploads(r)) + result := make(map[string][]*FileInfo, 1) + result["files"] = handleUploads(r) + b, err := json.Marshal(result) check(err) if redirect := r.FormValue("redirect"); redirect != "" { if strings.Contains(redirect, "%s") { diff --git a/server/gae-python/main.py b/server/gae-python/main.py index 169366bee..c3c1a5c3b 100644 --- a/server/gae-python/main.py +++ b/server/gae-python/main.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# jQuery File Upload Plugin GAE Python Example 1.1.5 +# jQuery File Upload Plugin GAE Python Example 2.0 # https://github.com/blueimp/jQuery-File-Upload # # Copyright 2011, Sebastian Tschan @@ -117,7 +117,8 @@ def get(self): def post(self): if (self.request.get('_method') == 'DELETE'): return self.delete() - s = json.dumps(self.handle_upload(), separators=(',',':')) + result = {'files': self.handle_upload()} + s = json.dumps(result, separators=(',',':')) redirect = self.request.get('redirect') if redirect: return self.redirect(str( diff --git a/server/node/server.js b/server/node/server.js index faf26f845..d426dc0b5 100755 --- a/server/node/server.js +++ b/server/node/server.js @@ -1,6 +1,6 @@ #!/usr/bin/env node /* - * jQuery File Upload Plugin Node.js Example 1.0.4 + * jQuery File Upload Plugin Node.js Example 2.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -200,7 +200,7 @@ files.push(fileInfo); } }); - handler.callback(files); + handler.callback({files: files}); }); }; UploadHandler.prototype.post = function () { @@ -217,7 +217,7 @@ files.forEach(function (fileInfo) { fileInfo.initUrls(handler.req); }); - handler.callback(files, redirect); + handler.callback({files: files}, redirect); } }; form.uploadDir = options.tmpDir; @@ -273,10 +273,10 @@ Object.keys(options.imageVersions).forEach(function (version) { fs.unlink(options.uploadDir + '/' + version + '/' + fileName); }); - handler.callback(!ex); + handler.callback({success: !ex}); }); } else { - handler.callback(false); + handler.callback({success: false}); } }; if (options.ssl) { diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 4b6bf9086..1592394b4 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ get_file_name_param(); if ($file_name) { - $info = $this->get_file_object($file_name); + $response = array('file' => $this->get_file_object($file_name)); } else { - $info = $this->get_file_objects(); + $response = array('files' => $this->get_file_objects()); } - return $this->generate_response($info, $print_response); + return $this->generate_response($response, $print_response); } public function post($print_response = true) { @@ -682,12 +682,12 @@ public function post($print_response = true) { $content_range = isset($_SERVER['HTTP_CONTENT_RANGE']) ? preg_split('/[^0-9]+/', $_SERVER['HTTP_CONTENT_RANGE']) : null; $size = $content_range ? $content_range[3] : null; - $info = array(); + $files = array(); if ($upload && is_array($upload['tmp_name'])) { // param_name is an array identifier like "files[]", // $_FILES is a multi-dimensional array: foreach ($upload['tmp_name'] as $index => $value) { - $info[] = $this->handle_file_upload( + $files[] = $this->handle_file_upload( $upload['tmp_name'][$index], $file_name ? $file_name : $upload['name'][$index], $size ? $size : $upload['size'][$index], @@ -700,7 +700,7 @@ public function post($print_response = true) { } else { // param_name is a single object identifier like "file", // $_FILES is a one-dimensional array: - $info[] = $this->handle_file_upload( + $files[] = $this->handle_file_upload( isset($upload['tmp_name']) ? $upload['tmp_name'] : null, $file_name ? $file_name : (isset($upload['name']) ? $upload['name'] : null), @@ -713,7 +713,7 @@ public function post($print_response = true) { $content_range ); } - return $this->generate_response($info, $print_response); + return $this->generate_response(array('files' => $files), $print_response); } public function delete($print_response = true) { @@ -730,7 +730,7 @@ public function delete($print_response = true) { } } } - return $this->generate_response($success, $print_response); + return $this->generate_response(array('success' => $success), $print_response); } } diff --git a/test/test.js b/test/test.js index 82cdb5eb7..2d0e2563f 100644 --- a/test/test.js +++ b/test/test.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin Test 6.11 + * jQuery File Upload Plugin Test 7.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -18,8 +18,8 @@ $(function () { QUnit.done = function () { // Delete all uploaded files: var url = $('#fileupload').prop('action'); - $.getJSON(url, function (files) { - $.each(files, function (index, file) { + $.getJSON(url, function (result) { + $.each(result.files, function (index, file) { $.ajax({ url: url + '?file=' + encodeURIComponent(file.name), type: 'DELETE' From 6d61a7899a7c95b64a816a0f56ef5af64b3b85e7 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 17 Dec 2012 10:54:40 +0100 Subject: [PATCH 036/759] Content-range header fix for response content wrapped as object. Fixes #1942. --- server/php/UploadHandler.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 1592394b4..9fc5d3a58 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ head(); - if (isset($_SERVER['HTTP_CONTENT_RANGE']) && is_array($content) && - is_object($content[0]) && $content[0]->size) { - $this->header('Range: 0-'.($this->fix_integer_overflow(intval($content[0]->size)) - 1)); + $files = $content[$this->options['param_name']]; + if (isset($_SERVER['HTTP_CONTENT_RANGE']) && is_array($files) && + is_object($files[0]) && $files[0]->size) { + $this->header('Range: 0-'.($this->fix_integer_overflow(intval($files[0]->size)) - 1)); } $this->body($json); } @@ -657,9 +658,13 @@ public function get($print_response = true) { } $file_name = $this->get_file_name_param(); if ($file_name) { - $response = array('file' => $this->get_file_object($file_name)); + $response = array( + substr($this->options['param_name'], 0, -1) => $this->get_file_object($file_name) + ); } else { - $response = array('files' => $this->get_file_objects()); + $response = array( + $this->options['param_name'] => $this->get_file_objects() + ); } return $this->generate_response($response, $print_response); } @@ -713,7 +718,10 @@ public function post($print_response = true) { $content_range ); } - return $this->generate_response(array('files' => $files), $print_response); + return $this->generate_response( + array($this->options['param_name'] => $files), + $print_response + ); } public function delete($print_response = true) { From d2ff11d11304ab4b9b7ce66c08ce10681266d658 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 17 Dec 2012 11:13:05 +0100 Subject: [PATCH 037/759] Use a timestamp for empty filenames. --- server/php/UploadHandler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 9fc5d3a58..b6c6b5504 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ Date: Mon, 17 Dec 2012 13:55:08 +0100 Subject: [PATCH 038/759] PHP throws an error if the parameter to is_array is null or undefined. --- server/php/UploadHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index b6c6b5504..66d88f6e7 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ head(); $files = $content[$this->options['param_name']]; - if (isset($_SERVER['HTTP_CONTENT_RANGE']) && is_array($files) && + if (isset($_SERVER['HTTP_CONTENT_RANGE']) && $files && is_array($files) && is_object($files[0]) && $files[0]->size) { $this->header('Range: 0-'.($this->fix_integer_overflow(intval($files[0]->size)) - 1)); } From 713f5dc8d4082f3f2038e059d3abde2a7fc466b0 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 17 Dec 2012 14:53:28 +0100 Subject: [PATCH 039/759] Avoid undefined index error. --- server/php/UploadHandler.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 66d88f6e7..87c3304ee 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ head(); - $files = $content[$this->options['param_name']]; - if (isset($_SERVER['HTTP_CONTENT_RANGE']) && $files && is_array($files) && - is_object($files[0]) && $files[0]->size) { - $this->header('Range: 0-'.($this->fix_integer_overflow(intval($files[0]->size)) - 1)); + if (isset($_SERVER['HTTP_CONTENT_RANGE'])) { + $files = isset($content[$this->options['param_name']]) ? + $content[$this->options['param_name']] : null; + if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) { + $this->header('Range: 0-'.($this->fix_integer_overflow(intval($files[0]->size)) - 1)); + } } $this->body($json); } From 798a88a08e5857a233600d91013daa80a329d2c4 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 18 Dec 2012 15:52:54 +0100 Subject: [PATCH 040/759] Added download section to the README. --- README.md | 4 ++++ index.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65b6ab4fe..d1001a86e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,10 @@ ## Demo [Demo File Upload](http://blueimp.github.com/jQuery-File-Upload/) +## Download +* [Master branch (Bootstrap UI)](https://github.com/blueimp/jQuery-File-Upload/archive/master.zip) +* [jQuery UI branch](https://github.com/blueimp/jQuery-File-Upload/archive/jquery-ui.zip) + ## Setup * [How to setup the plugin on your website](https://github.com/blueimp/jQuery-File-Upload/wiki/Setup) * [How to use only the basic plugin (minimal setup guide).](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin) diff --git a/index.html b/index.html index 457976157..6e0cd04eb 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ diff --git a/test/index.html b/test/index.html index 525150567..70cb4b4bc 100644 --- a/test/index.html +++ b/test/index.html @@ -1,7 +1,7 @@ diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 6746c0c11..e11bdb483 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.21.2 + * jQuery File Upload Plugin 5.21.3 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -33,21 +33,6 @@ $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader); $.support.xhrFormDataFileUpload = !!window.FormData; - // The form.elements propHook is added to filter serialized elements - // to not include file inputs in jQuery 1.9.0. - // This hooks directly into jQuery.fn.serializeArray. - // For more info, see http://bugs.jquery.com/ticket/13306 - $.propHooks.elements = { - get: function (form) { - if ($.nodeName(form, 'form')) { - return $.grep(form.elements, function (elem) { - return !$.nodeName(elem, 'input') || elem.type !== 'file'; - }); - } - return null; - } - }; - // The fileupload widget listens for change events on file input fields defined // via fileInput setting and paste or drop events of the given dropZone. // In addition to the default jQuery Widget methods, the fileupload widget diff --git a/test/index.html b/test/index.html index 70cb4b4bc..97e707583 100644 --- a/test/index.html +++ b/test/index.html @@ -129,7 +129,7 @@

    {% } %} - + From 11f8ab7e17a2859dc5fe4236e276f0a8581072f6 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sun, 3 Mar 2013 16:45:55 +0100 Subject: [PATCH 068/759] Upgraded jQuery UI widget factory (only version change). --- js/vendor/jquery.ui.widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/vendor/jquery.ui.widget.js b/js/vendor/jquery.ui.widget.js index f5d71a19f..fd2948f50 100644 --- a/js/vendor/jquery.ui.widget.js +++ b/js/vendor/jquery.ui.widget.js @@ -1,5 +1,5 @@ /* - * jQuery UI Widget 1.10.0+amd + * jQuery UI Widget 1.10.1+amd * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013 jQuery Foundation and other contributors From 56ef024f8cee127de8490dc2e9b37c75352568dc Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sun, 3 Mar 2013 17:40:26 +0100 Subject: [PATCH 069/759] Updated download and support information. --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d1001a86e..30f9ba41d 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [Demo File Upload](http://blueimp.github.com/jQuery-File-Upload/) ## Download +* [Releases (all versions)](https://github.com/blueimp/jQuery-File-Upload/tags) * [Master branch (Bootstrap UI)](https://github.com/blueimp/jQuery-File-Upload/archive/master.zip) * [jQuery UI branch](https://github.com/blueimp/jQuery-File-Upload/archive/jquery-ui.zip) @@ -12,9 +13,15 @@ * [How to use only the basic plugin (minimal setup guide).](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin) ## Support -* **Support requests** and **general discussions** about the File Upload plugin can be posted to the official [support forum](https://groups.google.com/d/forum/jquery-fileupload). -If your question is not directly related to the File Upload plugin, you might have a better chance to get a reply by posting to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload). -* **Bugs** and **Feature requests** can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues). Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before posting. + +* **[Support Forum](https://groups.google.com/d/forum/jquery-fileupload)** +**Support requests** and **general discussions** about the File Upload plugin can be posted to the official +[Support Forum](https://groups.google.com/d/forum/jquery-fileupload). +If your question is not directly related to the File Upload plugin, you might have a better chance to get a reply by posting to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload). + +* Bugs and Feature requests +**Bugs** and **Feature requests** can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues). +Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before posting. ## Features * **Multiple file upload:** From 160cd0ee5406b5689f614b6ccc203dfff633cfde Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sun, 3 Mar 2013 19:51:44 +0100 Subject: [PATCH 070/759] Skip transitions for invisible nodes. Fixes #2105. This is not only more efficient, but also required since it seems transition events are not fired for invisible elements. --- js/jquery.fileupload-ui.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index 31cc932ba..5f8d96086 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 7.3.1 + * jQuery File Upload User Interface Plugin 7.3.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -613,7 +613,7 @@ _transition: function (node) { var dfd = $.Deferred(); - if ($.support.transition && node.hasClass('fade')) { + if ($.support.transition && node.hasClass('fade') && node.is(':visible')) { node.bind( $.support.transition.end, function (e) { From 0c415e8bc6a8d8666be1c9eda5f99285aa483bba Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sun, 3 Mar 2013 21:39:19 +0100 Subject: [PATCH 071/759] Simplify click event handler selectors. Closes #2122. --- css/jquery.fileupload-ui.css | 7 +++---- index.html | 16 ++++++++-------- js/jquery.fileupload-ui.js | 22 ++++++++++++---------- test/index.html | 16 ++++++++-------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/css/jquery.fileupload-ui.css b/css/jquery.fileupload-ui.css index 0ef4f8745..4f994f241 100644 --- a/css/jquery.fileupload-ui.css +++ b/css/jquery.fileupload-ui.css @@ -1,6 +1,6 @@ @charset "UTF-8"; /* - * jQuery File Upload UI Plugin CSS 6.10 + * jQuery File Upload UI Plugin CSS 7.4 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -64,6 +64,8 @@ } @media (max-width: 767px) { + .fileupload-buttonbar .toggle, + .files .toggle, .files .btn span { display: none; } @@ -78,7 +80,4 @@ .files .progress { width: 20px; } - .files .delete { - width: 60px; - } } diff --git a/index.html b/index.html index a9ed43e0b..e50a8d2da 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ @@ -33,8 +33,6 @@ - -
    @@ -95,6 +93,8 @@

    jQuery File Upload Demo

    Delete + +
    @@ -106,9 +106,6 @@

    jQuery File Upload Demo

     
    - -
    -
    @@ -155,30 +152,35 @@

    @@ -186,21 +188,24 @@

    - - + + + + + + diff --git a/js/jquery.fileupload-fp.js b/js/jquery.fileupload-fp.js deleted file mode 100644 index c782f1e90..000000000 --- a/js/jquery.fileupload-fp.js +++ /dev/null @@ -1,227 +0,0 @@ -/* - * jQuery File Upload File Processing Plugin 1.2.3 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2012, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*jslint nomen: true, unparam: true, regexp: true */ -/*global define, window, document */ - -(function (factory) { - 'use strict'; - if (typeof define === 'function' && define.amd) { - // Register as an anonymous AMD module: - define([ - 'jquery', - 'load-image', - 'canvas-to-blob', - './jquery.fileupload' - ], factory); - } else { - // Browser globals: - factory( - window.jQuery, - window.loadImage - ); - } -}(function ($, loadImage) { - 'use strict'; - - // The File Upload FP version extends the fileupload widget - // with file processing functionality: - $.widget('blueimp.fileupload', $.blueimp.fileupload, { - - options: { - // The list of file processing actions: - process: [ - /* - { - action: 'load', - fileTypes: /^image\/(gif|jpeg|png)$/, - maxFileSize: 20000000 // 20MB - }, - { - action: 'resize', - maxWidth: 1920, - maxHeight: 1200, - minWidth: 800, - minHeight: 600 - }, - { - action: 'save' - } - */ - ], - - // The add callback is invoked as soon as files are added to the - // fileupload widget (via file input selection, drag & drop or add - // API call). See the basic file upload widget for more information: - add: function (e, data) { - if (data.autoUpload || (data.autoUpload !== false && - ($(this).data('blueimp-fileupload') || - $(this).data('fileupload')).options.autoUpload)) { - $(this).fileupload('process', data).done(function () { - data.submit(); - }); - } - } - }, - - processActions: { - // Loads the image given via data.files and data.index - // as img element if the browser supports canvas. - // Accepts the options fileTypes (regular expression) - // and maxFileSize (integer) to limit the files to load: - load: function (data, options) { - var that = this, - file = data.files[data.index], - dfd = $.Deferred(); - if (window.HTMLCanvasElement && - window.HTMLCanvasElement.prototype.toBlob && - ($.type(options.maxFileSize) !== 'number' || - file.size < options.maxFileSize) && - (!options.fileTypes || - options.fileTypes.test(file.type))) { - loadImage( - file, - function (img) { - if (!img.src) { - return dfd.rejectWith(that, [data]); - } - data.img = img; - dfd.resolveWith(that, [data]); - } - ); - } else { - dfd.rejectWith(that, [data]); - } - return dfd.promise(); - }, - // Resizes the image given as data.img and updates - // data.canvas with the resized image as canvas element. - // Accepts the options maxWidth, maxHeight, minWidth and - // minHeight to scale the given image: - resize: function (data, options) { - var img = data.img, - canvas; - options = $.extend({canvas: true}, options); - if (img) { - canvas = loadImage.scale(img, options); - if (canvas.width !== img.width || - canvas.height !== img.height) { - data.canvas = canvas; - } - } - return data; - }, - // Saves the processed image given as data.canvas - // inplace at data.index of data.files: - save: function (data, options) { - // Do nothing if no processing has happened: - if (!data.canvas) { - return data; - } - var that = this, - file = data.files[data.index], - name = file.name, - dfd = $.Deferred(), - callback = function (blob) { - if (!blob.name) { - if (file.type === blob.type) { - blob.name = file.name; - } else if (file.name) { - blob.name = file.name.replace( - /\..+$/, - '.' + blob.type.substr(6) - ); - } - } - // Store the created blob at the position - // of the original file in the files list: - data.files[data.index] = blob; - dfd.resolveWith(that, [data]); - }; - // Use canvas.mozGetAsFile directly, to retain the filename, as - // Gecko doesn't support the filename option for FormData.append: - if (data.canvas.mozGetAsFile) { - callback(data.canvas.mozGetAsFile( - (/^image\/(jpeg|png)$/.test(file.type) && name) || - ((name && name.replace(/\..+$/, '')) || - 'blob') + '.png', - file.type - )); - } else { - data.canvas.toBlob(callback, file.type); - } - return dfd.promise(); - } - }, - - // Resizes the file at the given index and stores the created blob at - // the original position of the files list, returns a Promise object: - _processFile: function (files, index, options) { - var that = this, - dfd = $.Deferred().resolveWith(that, [{ - files: files, - index: index - }]), - chain = dfd.promise(); - that._processing += 1; - $.each(options.process, function (i, settings) { - chain = chain.pipe(function (data) { - return that.processActions[settings.action] - .call(this, data, settings); - }); - }); - chain.always(function () { - that._processing -= 1; - if (that._processing === 0) { - that.element - .removeClass('fileupload-processing'); - } - }); - if (that._processing === 1) { - that.element.addClass('fileupload-processing'); - } - return chain; - }, - - // Processes the files given as files property of the data parameter, - // returns a Promise object that allows to bind a done handler, which - // will be invoked after processing all files (inplace) is done: - process: function (data) { - var that = this, - options = $.extend({}, this.options, data); - if (options.process && options.process.length && - this._isXHRUpload(options)) { - $.each(data.files, function (index, file) { - that._processingQueue = that._processingQueue.pipe( - function () { - var dfd = $.Deferred(); - that._processFile(data.files, index, options) - .always(function () { - dfd.resolveWith(that); - }); - return dfd.promise(); - } - ); - }); - } - return this._processingQueue; - }, - - _create: function () { - this._super(); - this._processing = 0; - this._processingQueue = $.Deferred().resolveWith(this) - .promise(); - } - - }); - -})); diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index 863a091e1..f4074d289 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 7.4.4 + * jQuery File Upload User Interface Plugin 8.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -19,15 +19,14 @@ define([ 'jquery', 'tmpl', - 'load-image', - './jquery.fileupload-fp' + './jquery.fileupload-resize', + './jquery.fileupload-validate' ], factory); } else { // Browser globals: factory( window.jQuery, - window.tmpl, - window.loadImage + window.tmpl ); } }(function ($, tmpl, loadImage) { @@ -42,29 +41,6 @@ // as the user clicks on the start buttons. To enable automatic // uploads, set the following option to true: autoUpload: false, - // The following option limits the number of files that are - // allowed to be uploaded using this widget: - maxNumberOfFiles: undefined, - // The maximum allowed file size: - maxFileSize: undefined, - // The minimum allowed file size: - minFileSize: undefined, - // The regular expression for allowed file types, matches - // against either file type or file name: - acceptFileTypes: /.+$/i, - // The regular expression to define for which files a preview - // image is shown, matched against the file type: - previewSourceFileTypes: /^image\/(gif|jpeg|png)$/, - // The maximum file size of images that are to be displayed as preview: - previewSourceMaxFileSize: 5000000, // 5MB - // The maximum width of the preview images: - previewMaxWidth: 80, - // The maximum height of the preview images: - previewMaxHeight: 80, - // By default, preview images are displayed as canvas elements - // if supported by the browser. Set the following option to false - // to always display preview images as img elements: - previewAsCanvas: true, // The ID of the upload template: uploadTemplateId: 'template-upload', // The ID of the download template: @@ -79,29 +55,35 @@ // option of the $.ajax upload requests: dataType: 'json', + // Function returning the current number of files, + // used by the maxNumberOfFiles validation: + getNumberOfFiles: function () { + return this.filesContainer.children().length; + }, + // The add callback is invoked as soon as files are added to the fileupload // widget (via file input selection, drag & drop or add API call). // See the basic file upload widget for more information: add: function (e, data) { - var that = $(this).data('blueimp-fileupload') || - $(this).data('fileupload'), + var $this = $(this), + that = $this.data('blueimp-fileupload') || + $this.data('fileupload'), options = that.options, files = data.files; - $(this).fileupload('process', data).done(function () { - that._adjustMaxNumberOfFiles(-files.length); - data.maxNumberOfFilesAdjusted = true; - data.files.valid = data.isValidated = that._validate(files); + data.process(function () { + return $this.fileupload('process', data); + }).always(function () { data.context = that._renderUpload(files).data('data', data); + that._renderPreviews(data); options.filesContainer[ options.prependFiles ? 'prepend' : 'append' ](data.context); - that._renderPreviews(data); that._forceReflow(data.context); that._transition(data.context).done( function () { if ((that._trigger('added', e, data) !== false) && (options.autoUpload || data.autoUpload) && - data.autoUpload !== false && data.isValidated) { + data.autoUpload !== false && !data.files.error) { data.submit(); } } @@ -112,15 +94,6 @@ send: function (e, data) { var that = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); - if (!data.isValidated) { - if (!data.maxNumberOfFilesAdjusted) { - that._adjustMaxNumberOfFiles(-data.files.length); - data.maxNumberOfFilesAdjusted = true; - } - if (!that._validate(data.files)) { - return false; - } - } if (data.context && data.dataType && data.dataType.substr(0, 6) === 'iframe') { // Iframe Transport does not support progress events. @@ -150,9 +123,6 @@ var file = files[index] || {error: 'Empty file upload result'}, deferred = that._addFinishedDeferreds(); - if (file.error) { - that._adjustMaxNumberOfFiles(1); - } that._transition($(this)).done( function () { var node = $(this); @@ -171,17 +141,6 @@ ); }); } else { - if (files.length) { - $.each(files, function (index, file) { - if (data.maxNumberOfFilesAdjusted && file.error) { - that._adjustMaxNumberOfFiles(1); - } else if (!data.maxNumberOfFilesAdjusted && - !file.error) { - that._adjustMaxNumberOfFiles(-1); - } - }); - data.maxNumberOfFilesAdjusted = true; - } template = that._renderDownload(files) .appendTo(that.options.filesContainer); that._forceReflow(template); @@ -202,9 +161,6 @@ $(this).data('fileupload'), template, deferred; - if (data.maxNumberOfFilesAdjusted) { - that._adjustMaxNumberOfFiles(data.files.length); - } if (data.context) { data.context.each(function (index) { if (data.errorThrown !== 'abort') { @@ -323,6 +279,12 @@ } ); }, + processstart: function () { + $(this).addClass('fileupload-processing'); + }, + processstop: function () { + $(this).removeClass('fileupload-processing'); + }, // Callback for file deletion: destroy: function (e, data) { var that = $(this).data('blueimp-fileupload') || @@ -332,7 +294,6 @@ that._transition(data.context).done( function () { $(this).remove(); - that._adjustMaxNumberOfFiles(1); that._trigger('destroyed', e, data); } ); @@ -381,17 +342,6 @@ }); }, - _adjustMaxNumberOfFiles: function (operand) { - if (typeof this.options.maxNumberOfFiles === 'number') { - this.options.maxNumberOfFiles += operand; - if (this.options.maxNumberOfFiles < 1) { - this._disableFileInputButton(); - } else { - this._enableFileInputButton(); - } - } - }, - _formatFileSize: function (bytes) { if (typeof bytes !== 'number') { return ''; @@ -447,46 +397,6 @@ this._formatFileSize(data.total); }, - _hasError: function (file) { - if (file.error) { - return file.error; - } - // The number of added files is subtracted from - // maxNumberOfFiles before validation, so we check if - // maxNumberOfFiles is below 0 (instead of below 1): - if (this.options.maxNumberOfFiles < 0) { - return 'Maximum number of files exceeded'; - } - // Files are accepted if either the file type or the file name - // matches against the acceptFileTypes regular expression, as - // only browsers with support for the File API report the type: - if (!(this.options.acceptFileTypes.test(file.type) || - this.options.acceptFileTypes.test(file.name))) { - return 'Filetype not allowed'; - } - if (this.options.maxFileSize && - file.size > this.options.maxFileSize) { - return 'File is too big'; - } - if (typeof file.size === 'number' && - file.size < this.options.minFileSize) { - return 'File is too small'; - } - return null; - }, - - _validate: function (files) { - var that = this, - valid = !!files.length; - $.each(files, function (index, file) { - file.error = that._hasError(file); - if (file.error) { - valid = false; - } - }); - return valid; - }, - _renderTemplate: function (func, files) { if (!func) { return $(); @@ -502,63 +412,10 @@ return $(this.options.templatesContainer).html(result).children(); }, - _renderPreview: function (file, node) { - var that = this, - options = this.options, - dfd = $.Deferred(); - return ((loadImage && loadImage( - file, - function (img) { - node.append(img); - that._forceReflow(node); - that._transition(node).done(function () { - dfd.resolveWith(node); - }); - if (!$.contains(that.document[0].body, node[0])) { - // If the element is not part of the DOM, - // transition events are not triggered, - // so we have to resolve manually: - dfd.resolveWith(node); - } - node.on('remove', function () { - // If the element is removed before the - // transition finishes, transition events are - // not triggered, resolve manually: - dfd.resolveWith(node); - }); - }, - { - maxWidth: options.previewMaxWidth, - maxHeight: options.previewMaxHeight, - canvas: options.previewAsCanvas - } - )) || dfd.resolveWith(node)) && dfd; - }, - _renderPreviews: function (data) { - var that = this, - options = this.options; - data.context.find('.preview span').each(function (index, element) { - var file = data.files[index]; - if (options.previewSourceFileTypes.test(file.type) && - ($.type(options.previewSourceMaxFileSize) !== 'number' || - file.size < options.previewSourceMaxFileSize)) { - that._processingQueue = that._processingQueue.pipe(function () { - var dfd = $.Deferred(), - ev = $.Event('previewdone', { - target: element - }); - that._renderPreview(file, $(element)).done( - function () { - that._trigger(ev.type, ev, data); - dfd.resolveWith(that); - } - ); - return dfd.promise(); - }); - } + data.context.find('.preview').each(function (index, elm) { + $(elm).append(data.files[index].preview); }); - return this._processingQueue; }, _renderUpload: function (files) { @@ -731,39 +588,10 @@ } }, - _stringToRegExp: function (str) { - var parts = str.split('/'), - modifiers = parts.pop(); - parts.shift(); - return new RegExp(parts.join('/'), modifiers); - }, - - _initRegExpOptions: function () { - var options = this.options; - if ($.type(options.acceptFileTypes) === 'string') { - options.acceptFileTypes = this._stringToRegExp( - options.acceptFileTypes - ); - } - if ($.type(options.previewSourceFileTypes) === 'string') { - options.previewSourceFileTypes = this._stringToRegExp( - options.previewSourceFileTypes - ); - } - }, - _initSpecialOptions: function () { this._super(); this._initFilesContainer(); this._initTemplates(); - this._initRegExpOptions(); - }, - - _setOption: function (key, value) { - this._super(key, value); - if (key === 'maxNumberOfFiles') { - this._adjustMaxNumberOfFiles(0); - } }, _create: function () { @@ -773,12 +601,6 @@ 'uploadTemplateId', 'downloadTemplateId' ); - if (!this._processingQueue) { - this._processingQueue = $.Deferred().resolveWith(this).promise(); - this.process = function () { - return this._processingQueue; - }; - } this._resetFinishedDeferreds(); }, diff --git a/js/main.js b/js/main.js index 7893195d2..a291435b1 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin JS Example 7.1.1 + * jQuery File Upload Plugin JS Example 8.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -37,23 +37,9 @@ $(function () { // Demo settings: $('#fileupload').fileupload('option', { url: '//jquery-file-upload.appspot.com/', + disableImageResize: false, maxFileSize: 5000000, - acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, - process: [ - { - action: 'load', - fileTypes: /^image\/(gif|jpeg|png)$/, - maxFileSize: 20000000 // 20MB - }, - { - action: 'resize', - maxWidth: 1440, - maxHeight: 900 - }, - { - action: 'save' - } - ] + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i }); // Upload server status check for browsers with CORS support: if ($.support.cors) { diff --git a/test/index.html b/test/index.html index ba7b73591..5e01cd4eb 100644 --- a/test/index.html +++ b/test/index.html @@ -1,7 +1,7 @@ jQuery File Upload Plugin Test - + @@ -51,6 +51,8 @@

    Delete + +
    @@ -62,9 +64,6 @@

     
    - -
    -
    @@ -73,30 +72,35 @@

    @@ -104,21 +108,24 @@

    - + + + diff --git a/test/test.js b/test/test.js index c52671a5f..ecdea0e20 100644 --- a/test/test.js +++ b/test/test.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin Test 7.4.2 + * jQuery File Upload Plugin Test 8.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -1092,13 +1092,13 @@ $(function () { }); test('maxNumberOfFiles', function () { - expect(4); + expect(3); var addIndex = 0, sendIndex = 0; $('#fileupload') .fileupload({ autoUpload: true, - maxNumberOfFiles: 1, + maxNumberOfFiles: 3, singleFileUploads: false, send: function (e, data) { strictEqual( @@ -1112,36 +1112,13 @@ $(function () { stop: $.noop }) .fileupload('add', {files: [{name: (addIndex += 1)}]}) - .fileupload('add', {files: [{name: 'test'}]}) - .fileupload('option', 'maxNumberOfFiles', 1) - .fileupload('add', {files: [{name: 1}, {name: 2}]}) - .fileupload({ - maxNumberOfFiles: 1, - send: function (e, data) { - strictEqual( - sendIndex += 1, - addIndex - ); - return false; - } - }) .fileupload('add', {files: [{name: (addIndex += 1)}]}) .fileupload('add', {files: [{name: (addIndex += 1)}]}) - .fileupload({ - maxNumberOfFiles: 0, - send: function (e, data) { - ok( - !$.blueimp.fileupload.prototype.options - .send.call(this, e, data) - ); - return false; - } - }) - .fileupload('send', {files: [{name: 'test'}]}); + .fileupload('add', {files: [{name: 'test'}]}); }); test('maxFileSize', function () { - expect(3); + expect(2); var addIndex = 0, sendIndex = 0; $('#fileupload') @@ -1175,15 +1152,11 @@ $(function () { ); return false; } - }) - .fileupload('send', {files: [{ - name: 'test', - size: 1001 - }]}); + }); }); test('minFileSize', function () { - expect(3); + expect(2); var addIndex = 0, sendIndex = 0; $('#fileupload') @@ -1217,15 +1190,11 @@ $(function () { ); return false; } - }) - .fileupload('send', {files: [{ - name: 'test', - size: 999 - }]}); + }); }); test('acceptFileTypes', function () { - expect(3); + expect(2); var addIndex = 0, sendIndex = 0; $('#fileupload') @@ -1260,11 +1229,7 @@ $(function () { ); return false; } - }) - .fileupload('send', {files: [{ - name: 'test.txt', - type: 'text/plain' - }]}); + }); }); test('acceptFileTypes as HTML5 data attribute', function () { From a858e93f88c7ed0334f6076aaecd0e4028d54495 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 26 Apr 2013 23:20:08 +0200 Subject: [PATCH 119/759] Added Angular JS and basic example versions. --- README.md | 2 +- angularjs.html | 209 +++++++++++++++++++ basic.html | 125 ++++++++++++ css/style.css | 10 +- index.html | 17 +- js/app.js | 78 ++++++++ js/jquery.fileupload-angular.js | 343 ++++++++++++++++++++++++++++++++ 7 files changed, 774 insertions(+), 10 deletions(-) create mode 100644 angularjs.html create mode 100644 basic.html create mode 100644 js/app.js create mode 100644 js/jquery.fileupload-angular.js diff --git a/README.md b/README.md index f6673c55e..0a881af10 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload * [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.1.0+ (optional) * [JavaScript Load Image function](https://github.com/blueimp/JavaScript-Load-Image) v. 1.5.0+ (optional) * [JavaScript Canvas to Blob function](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.0.5+ (optional) -* [Bootstrap CSS Toolkit](https://github.com/twitter/bootstrap/) v. 2.1+ (optional) +* [Bootstrap CSS Toolkit](https://github.com/twitter/bootstrap/) v. 2.3+ (optional) The jQuery UI widget factory is a requirement for the basic File Upload plugin, but very lightweight without any other dependencies. The jQuery Iframe Transport is required for [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support). diff --git a/angularjs.html b/angularjs.html new file mode 100644 index 000000000..ab41adc5d --- /dev/null +++ b/angularjs.html @@ -0,0 +1,209 @@ + + + + + + + +jQuery File Upload Demo - AngularJS version + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + jQuery File Upload +
    + +
    +
    +
    +
    +
    +
    +

    jQuery File Upload Demo

    +

    AngularJS version

    + +
    +

    File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
    + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    +
    +
    + +
    + + + +
    +
    + + + + Add files... + + + + + +
    +
    + +
    + +
    + +
     
    +
    +
    + + + + + + + + +
    +
    + +
    +
    +     		+

    + {{file.name}} + {{file.name}} +

    +
    Error {{file.error}}
    +     		+

    {{file.size | formatFileSize}}

    +
    +     		+ + + +
    +
    +
    +
    +

    Demo Notes

    +
      +
    • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
      • +
    • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
      • +
    • Uploaded files will be deleted automatically after 5 minutes (demo setting).
      • +
    • You can drag & drop files from your desktop on this webpage with Google Chrome, Mozilla Firefox and Apple Safari.
      • +
    • Please refer to the project website and documentation for more information.
      • +
    • Built with Twitter's Bootstrap toolkit and Icons from Glyphicons.
      • +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/basic.html b/basic.html new file mode 100644 index 000000000..089e4da54 --- /dev/null +++ b/basic.html @@ -0,0 +1,125 @@ + + + + + + + +jQuery File Upload Demo - Basic version + + + + + + + + + + + + +
    +
    +
    + + + + + + jQuery File Upload +
    + +
    +
    +
    +
    +
    +
    +

    jQuery File Upload Demo

    +

    Basic version

    + +
    +

    File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
    + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    +
    +
    + + + +
    +
    +
    + +
    +
    +
    +

    Demo Notes

    +
      +
    • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
      • +
    • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
      • +
    • Uploaded files will be deleted automatically after 5 minutes (demo setting).
      • +
    • You can drag & drop files from your desktop on this webpage with Google Chrome, Mozilla Firefox and Apple Safari.
      • +
    • Please refer to the project website and documentation for more information.
      • +
    • Built with Twitter's Bootstrap toolkit and Icons from Glyphicons.
      • +
    +
    +
    + + + + + + + + + + diff --git a/css/style.css b/css/style.css index 87244e46d..01c0fc2db 100644 --- a/css/style.css +++ b/css/style.css @@ -1,15 +1,19 @@ @charset "UTF-8"; /* - * jQuery File Upload Plugin CSS Example 1.0.1 + * jQuery File Upload Plugin CSS Example 8.0 * https://github.com/blueimp/jQuery-File-Upload * - * Copyright 2012, Sebastian Tschan + * Copyright 2013, Sebastian Tschan * https://blueimp.net * * Licensed under the MIT license: * http://www.opensource.org/licenses/MIT */ -body{ +body { padding-top: 60px; } + +.ng-cloak { + display: none; +} diff --git a/index.html b/index.html index 4324d7228..470609676 100644 --- a/index.html +++ b/index.html @@ -60,13 +60,18 @@

    jQuery File Upload Demo

    +

    Default version

    + +
    +

    File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
    + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    +
    -
    -

    File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
    - Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    - Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    -
    -
    diff --git a/js/app.js b/js/app.js new file mode 100644 index 000000000..ba4a7d036 --- /dev/null +++ b/js/app.js @@ -0,0 +1,78 @@ +/* + * jQuery File Upload Plugin Angular JS Example 1.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*global window, angular */ + +(function () { + 'use strict'; + + var isOnGitHub = window.location.hostname === 'blueimp.github.com' || + window.location.hostname === 'blueimp.github.io', + url = isOnGitHub ? '//jquery-file-upload.appspot.com/' : 'server/php/'; + + angular.module('demo', [ + 'blueimp.fileupload' + ]) + .config([ + 'fileUploadProvider', + function (fileUploadProvider) { + if (isOnGitHub) { + // Demo settings: + angular.extend(fileUploadProvider.defaults, { + disableImageResize: false, + maxFileSize: 5000000, + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i + }); + } + } + ]) + + .controller('DemoFileUploadController', [ + '$scope', '$http', + function ($scope, $http) { + $scope.loadingFiles = true; + $http.get(url) + .then(function (response) { + $scope.loadingFiles = false; + $scope.queue = response.data.files; + }); + } + ]) + + .controller('FileDestroyController', [ + '$scope', '$http', + function ($scope, $http) { + var file = $scope.file, + state; + if (file.url) { + file.$state = function () { + return state; + }; + file.$destroy = function () { + state = 'pending'; + return $http({ + url: file.delete_url, + method: file.delete_type + }).then( + function () { + state = 'resolved'; + $scope.clear(file); + }, + function () { + state = 'rejected'; + } + ); + }; + } + } + ]); + +}()); diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js new file mode 100644 index 000000000..bc3fdba21 --- /dev/null +++ b/js/jquery.fileupload-angular.js @@ -0,0 +1,343 @@ +/* + * jQuery File Upload AngularJS Plugin 1.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true */ +/*global angular */ + +(function () { + 'use strict'; + + angular.module('blueimp.fileupload', []) + + .provider('fileUpload', function () { + var scopeApply = function () { + var scope = angular.element(this) + .fileupload('option', 'scope')(); + if (!scope.$$phase) { + scope.$apply(); + } + }, + $config; + $config = this.defaults = { + handleResponse: function (e, data) { + var files = data.result && data.result.files; + if (files) { + data.scope().replace(data.files, files); + } + }, + add: function (e, data) { + var scope = data.scope(); + data.process(function () { + return scope.process(data); + }).always( + function () { + var file = data.files[0], + submit = function () { + return data.submit(); + }; + file.$cancel = function () { + scope.clear(data.files); + return data.abort(); + }; + file.$state = function () { + return data.state(); + }; + file.$progress = function () { + return data.progress(); + }; + file.$response = function () { + return data.response(); + }; + if (file.$state() === 'rejected') { + file._$submit = submit; + } else { + file.$submit = submit; + } + scope.$apply(function () { + var method = scope.option('prependFiles') ? + 'unshift' : 'push'; + Array.prototype[method].apply( + scope.queue, + data.files + ); + if (file.$submit && + (scope.option('autoUpload') || + data.autoUpload) && + data.autoUpload !== false) { + file.$submit(); + } + }); + } + ); + }, + progress: function (e, data) { + data.scope().$apply(); + }, + done: function (e, data) { + var that = this; + data.scope().$apply(function () { + data.handleResponse.call(that, e, data); + }); + }, + fail: function (e, data) { + var that = this; + if (data.errorThrown === 'abort') { + return; + } + if (data.dataType.indexOf('json') === data.dataType.length - 4) { + try { + data.result = angular.fromJson(data.jqXHR.responseText); + } catch (err) {} + } + data.scope().$apply(function () { + data.handleResponse.call(that, e, data); + }); + }, + stop: scopeApply, + processstart: scopeApply, + processstop: scopeApply, + getNumberOfFiles: function () { + return this.scope().queue.length; + }, + dataType: 'json', + prependFiles: true, + autoUpload: false + }; + this.$get = [ + function () { + return { + defaults: $config + }; + } + ]; + }) + + .provider('formatFileSizeFilter', function () { + var $config = this.defaults = { + // Byte units following the IEC format + // http://en.wikipedia.org/wiki/Kilobyte + units: [ + {size: 1000000000, suffix: ' GB'}, + {size: 1000000, suffix: ' MB'}, + {size: 1000, suffix: ' KB'} + ] + }; + this.$get = function () { + return function (bytes) { + if (!angular.isNumber(bytes)) { + return ''; + } + var unit = true, + i = -1; + while (unit) { + unit = $config.units[i += 1]; + if (i === $config.units.length - 1 || bytes >= unit.size) { + return (bytes / unit.size).toFixed(2) + unit.suffix; + } + } + }; + }; + }) + + .controller('FileUploadController', [ + '$scope', '$element', '$attrs', 'fileUpload', + function ($scope, $element, $attrs, fileUpload) { + $scope.disabled = angular.element('') + .prop('disabled'); + $scope.queue = $scope.queue || []; + $scope.clear = function (files) { + var queue = this.queue, + i = queue.length, + file = files, + length = 1; + if (angular.isArray(files)) { + file = files[0]; + length = files.length; + } + while (i) { + if (queue[i -= 1] === file) { + return queue.splice(i, length); + } + } + }; + $scope.replace = function (oldFiles, newFiles) { + var queue = this.queue, + file = oldFiles[0], + i, + j; + for (i = 0; i < queue.length; i += 1) { + if (queue[i] === file) { + for (j = 0; j < newFiles.length; j += 1) { + queue[i + j] = newFiles[j]; + } + return; + } + } + }; + $scope.progress = function () { + return $element.fileupload('progress'); + }; + $scope.active = function () { + return $element.fileupload('active'); + }; + $scope.option = function (option, data) { + return $element.fileupload('option', option, data); + }; + $scope.add = function (data) { + return $element.fileupload('add', data); + }; + $scope.send = function (data) { + return $element.fileupload('send', data); + }; + $scope.process = function (data) { + return $element.fileupload('process', data); + }; + $scope.processing = function (data) { + return $element.fileupload('processing', data); + }; + $scope.applyOnQueue = function (method) { + var list = this.queue.slice(0), + i, + file; + for (i = 0; i < list.length; i += 1) { + file = list[i]; + if (file[method]) { + file[method](); + } + } + }; + $scope.submit = function () { + this.applyOnQueue('$submit'); + }; + $scope.cancel = function () { + this.applyOnQueue('$cancel'); + }; + // The fileupload widget will initialize with + // the options provided via "data-"-parameters, + // as well as those given via options object: + $element.fileupload(angular.extend( + {scope: function () { + return $scope; + }}, + fileUpload.defaults + )).on('fileuploadadd', function (e, data) { + data.scope = $scope.option('scope'); + }).on([ + 'fileuploadadd', + 'fileuploadsubmit', + 'fileuploadsend', + 'fileuploaddone', + 'fileuploadfail', + 'fileuploadalways', + 'fileuploadprogress', + 'fileuploadprogressall', + 'fileuploadstart', + 'fileuploadstop', + 'fileuploadchange', + 'fileuploadpaste', + 'fileuploaddrop', + 'fileuploaddragover', + 'fileuploadchunksend', + 'fileuploadchunkdone', + 'fileuploadchunkfail', + 'fileuploadchunkalways', + 'fileuploadprocessstart', + 'fileuploadprocess', + 'fileuploadprocessdone', + 'fileuploadprocessfail', + 'fileuploadprocessalways', + 'fileuploadprocessstop' + ].join(' '), function (e, data) { + $scope.$emit(e.type, data); + }); + // Observe option changes: + $scope.$watch( + $attrs.fileupload, + function (newOptions, oldOptions) { + if (newOptions) { + $element.fileupload('option', newOptions); + } + } + ); + } + ]) + + .controller('FileUploadProgressController', [ + '$scope', '$attrs', '$parse', + function ($scope, $attrs, $parse) { + var fn = $parse($attrs.progress), + update = function () { + var progress = fn($scope); + if (!progress) { + return; + } + $scope.num = Math.floor( + progress.loaded / progress.total * 100 + ); + }; + $scope.$watch( + $attrs.progress + '.loaded', + function (newValue, oldValue) { + if (newValue !== oldValue) { + update(); + } + } + ); + } + ]) + + .controller('FileUploadPreviewController', [ + '$scope', '$element', '$attrs', '$parse', + function ($scope, $element, $attrs, $parse) { + var fn = $parse($attrs.preview), + file = fn($scope); + if (file.preview) { + $element.append(file.preview); + } + } + ]) + + .directive('fileupload', function () { + return { + controller: 'FileUploadController' + }; + }) + + .directive('progress', function () { + return { + controller: 'FileUploadProgressController' + }; + }) + + .directive('preview', function () { + return { + controller: 'FileUploadPreviewController' + }; + }) + + .directive('download', function () { + return function (scope, elm, attrs) { + elm.on('dragstart', function (e) { + try { + e.originalEvent.dataTransfer.setData( + 'DownloadURL', + [ + 'application/octet-stream', + elm.prop('download'), + elm.prop('href') + ].join(':') + ); + } catch (err) {} + }); + }; + }); + +}()); From 255f56d40574c369baf7e7a5a9d0b36b28419ad5 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 26 Apr 2013 23:23:18 +0200 Subject: [PATCH 120/759] Updated package version. --- blueimp-file-upload.jquery.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blueimp-file-upload.jquery.json b/blueimp-file-upload.jquery.json index d3a65ef37..f86787b9b 100644 --- a/blueimp-file-upload.jquery.json +++ b/blueimp-file-upload.jquery.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "7.2.1", + "version": "8.0.0", "title": "jQuery File Upload", "author": { "name": "Sebastian Tschan", @@ -14,7 +14,7 @@ ], "dependencies": { "jquery": ">=1.6", - "jquery.ui.widget": ">=1.8" + "jquery.ui.widget": ">=1.9" }, "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", "keywords": [ diff --git a/package.json b/package.json index c27be8846..514d3a560 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "7.4.1", + "version": "8.0.0", "title": "jQuery File Upload", "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", "keywords": [ @@ -48,7 +48,7 @@ ], "dependencies": { "jquery": ">=1.6", - "jquery.ui.widget": ">=1.8", + "jquery.ui.widget": ">=1.9", "blueimp-tmpl": ">=2.1.0", "blueimp-load-image": ">=1.5.0", "blueimp-canvas-to-blob": ">=2.0.5" From f55fd6e053dde390e2539ecf6cef9922ee3ef7ca Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 26 Apr 2013 23:26:37 +0200 Subject: [PATCH 121/759] Set loadingFiles to false if loading files failed. --- js/app.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/js/app.js b/js/app.js index ba4a7d036..2c256206a 100644 --- a/js/app.js +++ b/js/app.js @@ -40,10 +40,15 @@ function ($scope, $http) { $scope.loadingFiles = true; $http.get(url) - .then(function (response) { - $scope.loadingFiles = false; - $scope.queue = response.data.files; - }); + .then( + function (response) { + $scope.loadingFiles = false; + $scope.queue = response.data.files; + }, + function () { + $scope.loadingFiles = false; + } + ); } ]) From 929e2801dda3895f5b5065ea8c9e444569db38d3 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 26 Apr 2013 23:39:45 +0200 Subject: [PATCH 122/759] Set HTTP error as file error. --- js/jquery.fileupload-angular.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js index bc3fdba21..f0d237e2a 100644 --- a/js/jquery.fileupload-angular.js +++ b/js/jquery.fileupload-angular.js @@ -31,6 +31,10 @@ var files = data.result && data.result.files; if (files) { data.scope().replace(data.files, files); + } else if (data.errorThrown || + data.textStatus === 'error') { + data.files[0].error = data.errorThrown || + data.textStatus; } }, add: function (e, data) { From c192574f0a918d20a5c0628edc15064119de2ceb Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 26 Apr 2013 23:47:30 +0200 Subject: [PATCH 123/759] Fixed AngularJS demo settings. --- angularjs.html | 2 +- js/app.js | 34 ++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/angularjs.html b/angularjs.html index ab41adc5d..48956084d 100644 --- a/angularjs.html +++ b/angularjs.html @@ -73,7 +73,7 @@

    AngularJS version

    - + diff --git a/js/app.js b/js/app.js index 2c256206a..5e66c2f59 100644 --- a/js/app.js +++ b/js/app.js @@ -15,17 +15,18 @@ 'use strict'; var isOnGitHub = window.location.hostname === 'blueimp.github.com' || - window.location.hostname === 'blueimp.github.io', + window.location.hostname === 'blueimp.github.io', url = isOnGitHub ? '//jquery-file-upload.appspot.com/' : 'server/php/'; angular.module('demo', [ 'blueimp.fileupload' ]) .config([ - 'fileUploadProvider', - function (fileUploadProvider) { + '$httpProvider', 'fileUploadProvider', + function ($httpProvider, fileUploadProvider) { if (isOnGitHub) { // Demo settings: + delete $httpProvider.defaults.headers.common['X-Requested-With']; angular.extend(fileUploadProvider.defaults, { disableImageResize: false, maxFileSize: 5000000, @@ -38,17 +39,22 @@ .controller('DemoFileUploadController', [ '$scope', '$http', function ($scope, $http) { - $scope.loadingFiles = true; - $http.get(url) - .then( - function (response) { - $scope.loadingFiles = false; - $scope.queue = response.data.files; - }, - function () { - $scope.loadingFiles = false; - } - ); + if (!isOnGitHub) { + $scope.loadingFiles = true; + $scope.options = { + url: url + }; + $http.get(url) + .then( + function (response) { + $scope.loadingFiles = false; + $scope.queue = response.data.files; + }, + function () { + $scope.loadingFiles = false; + } + ); + } } ]) From 18ac1d3c7fe4889d6d283ceb7db572a10f2670c9 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Apr 2013 00:46:38 +0200 Subject: [PATCH 124/759] Allow Content-headers for cross domain requests. --- server/gae-go/app/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/gae-go/app/main.go b/server/gae-go/app/main.go index 56b92da2a..2b5d5c690 100644 --- a/server/gae-go/app/main.go +++ b/server/gae-go/app/main.go @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin GAE Go Example 3.0 + * jQuery File Upload Plugin GAE Go Example 3.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2011, Sebastian Tschan @@ -261,6 +261,10 @@ func handle(w http.ResponseWriter, r *http.Request) { "Access-Control-Allow-Methods", "OPTIONS, HEAD, GET, POST, PUT, DELETE", ) + w.Header().Add( + "Access-Control-Allow-Headers", + "Content-Type, Content-Range, Content-Disposition", + ) switch r.Method { case "OPTIONS": case "HEAD": From 2f43b1c67f5241e24301f39054ab53ea908a360d Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Apr 2013 00:49:32 +0200 Subject: [PATCH 125/759] Allow Content-headers for cross domain requests. --- server/gae-python/main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/gae-python/main.py b/server/gae-python/main.py index c3c1a5c3b..1efbb0adb 100644 --- a/server/gae-python/main.py +++ b/server/gae-python/main.py @@ -35,6 +35,9 @@ def initialize(self, request, response): self.response.headers[ 'Access-Control-Allow-Methods' ] = 'OPTIONS, HEAD, GET, POST, PUT, DELETE' + self.response.headers[ + 'Access-Control-Allow-Headers' + ] = 'Content-Type, Content-Range, Content-Disposition' def validate(self, file): if file['size'] < MIN_FILE_SIZE: From 60d18bea95e6a2baec787b9a10d33408ce2a9ef2 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Apr 2013 00:52:49 +0200 Subject: [PATCH 126/759] Conform to the Python linter. --- server/gae-python/main.py | 58 +++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/server/gae-python/main.py b/server/gae-python/main.py index 1efbb0adb..893d28afa 100644 --- a/server/gae-python/main.py +++ b/server/gae-python/main.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# jQuery File Upload Plugin GAE Python Example 2.0 +# jQuery File Upload Plugin GAE Python Example 2.0.1 # https://github.com/blueimp/jQuery-File-Upload # # Copyright 2011, Sebastian Tschan @@ -14,19 +14,24 @@ from google.appengine.api import files, images from google.appengine.ext import blobstore, deferred from google.appengine.ext.webapp import blobstore_handlers -import json, re, urllib, webapp2 +import json +import re +import urllib +import webapp2 WEBSITE = 'http://blueimp.github.com/jQuery-File-Upload/' -MIN_FILE_SIZE = 1 # bytes -MAX_FILE_SIZE = 5000000 # bytes +MIN_FILE_SIZE = 1 # bytes +MAX_FILE_SIZE = 5000000 # bytes IMAGE_TYPES = re.compile('image/(gif|p?jpeg|(x-)?png)') ACCEPT_FILE_TYPES = IMAGE_TYPES -THUMBNAIL_MODIFICATOR = '=s80' # max width / height -EXPIRATION_TIME = 300 # seconds +THUMBNAIL_MODIFICATOR = '=s80' # max width / height +EXPIRATION_TIME = 300 # seconds + def cleanup(blob_keys): blobstore.delete(blob_keys) + class UploadHandler(webapp2.RequestHandler): def initialize(self, request, response): @@ -38,7 +43,7 @@ def initialize(self, request, response): self.response.headers[ 'Access-Control-Allow-Headers' ] = 'Content-Type, Content-Range, Content-Disposition' - + def validate(self, file): if file['size'] < MIN_FILE_SIZE: file['error'] = 'File is too small' @@ -49,13 +54,13 @@ def validate(self, file): else: return True return False - + def get_file_size(self, file): - file.seek(0, 2) # Seek to the end of the file - size = file.tell() # Get the position of EOF - file.seek(0) # Reset the file position to the beginning + file.seek(0, 2) # Seek to the end of the file + size = file.tell() # Get the position of EOF + file.seek(0) # Reset the file position to the beginning return size - + def write_blob(self, data, info): blob = files.blobstore.create( mime_type=info['type'], @@ -65,7 +70,7 @@ def write_blob(self, data, info): f.write(data) files.finalize(blob) return files.blobstore.get_blob_key(blob) - + def handle_upload(self): results = [] blob_keys = [] @@ -73,8 +78,11 @@ def handle_upload(self): if type(fieldStorage) is unicode: continue result = {} - result['name'] = re.sub(r'^.*\\', '', - fieldStorage.filename) + result['name'] = re.sub( + r'^.*\\', + '', + fieldStorage.filename + ) result['type'] = fieldStorage.type result['size'] = self.get_file_size(fieldStorage.file) if self.validate(result): @@ -89,12 +97,13 @@ def handle_upload(self): try: result['url'] = images.get_serving_url( blob_key, - secure_url=self.request.host_url\ - .startswith('https') + secure_url=self.request.host_url.startswith( + 'https' + ) ) result['thumbnail_url'] = result['url'] +\ THUMBNAIL_MODIFICATOR - except: # Could not get an image serving url + except: # Could not get an image serving url pass if not 'url' in result: result['url'] = self.request.host_url +\ @@ -107,21 +116,21 @@ def handle_upload(self): _countdown=EXPIRATION_TIME ) return results - + def options(self): pass - + def head(self): pass - + def get(self): self.redirect(WEBSITE) - + def post(self): if (self.request.get('_method') == 'DELETE'): return self.delete() result = {'files': self.handle_upload()} - s = json.dumps(result, separators=(',',':')) + s = json.dumps(result, separators=(',', ':')) redirect = self.request.get('redirect') if redirect: return self.redirect(str( @@ -134,6 +143,7 @@ def post(self): def delete(self): blobstore.delete(self.request.get('key') or '') + class DownloadHandler(blobstore_handlers.BlobstoreDownloadHandler): def get(self, key, filename): if not blobstore.get(key): @@ -150,4 +160,4 @@ def get(self, key, filename): ('/([^/]+)/([^/]+)', DownloadHandler) ], debug=True -) \ No newline at end of file +) From d518a7a2475c8cd94daceaa054a5ce1e479a589a Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sat, 27 Apr 2013 00:54:35 +0200 Subject: [PATCH 127/759] Allow Content-headers for cross domain requests. --- server/node/server.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/node/server.js b/server/node/server.js index d426dc0b5..c25826d97 100755 --- a/server/node/server.js +++ b/server/node/server.js @@ -1,6 +1,6 @@ #!/usr/bin/env node /* - * jQuery File Upload Plugin Node.js Example 2.0 + * jQuery File Upload Plugin Node.js Example 2.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -43,7 +43,8 @@ }, accessControl: { allowOrigin: '*', - allowMethods: 'OPTIONS, HEAD, GET, POST, PUT, DELETE' + allowMethods: 'OPTIONS, HEAD, GET, POST, PUT, DELETE', + allowHeaders: 'Content-Type, Content-Range, Content-Disposition' }, /* Uncomment and edit this section to provide the service via HTTPS: ssl: { @@ -83,6 +84,10 @@ 'Access-Control-Allow-Methods', options.accessControl.allowMethods ); + res.setHeader( + 'Access-Control-Allow-Headers', + options.accessControl.allowHeaders + ); var handleResult = function (result, redirect) { if (redirect) { res.writeHead(302, { From 155f917f0f148eb885a67dfe5bd7a7c21e1ee2a7 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Sun, 28 Apr 2013 17:21:05 +0200 Subject: [PATCH 128/759] Added the previewAsCanvas option (default: true). Pass noRevoke option to loadImage. Crop resized images if global option imageCrop is true. Use minWidth/minHeight for resized images and previews from global options. --- js/jquery.fileupload-resize.js | 45 +++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/js/jquery.fileupload-resize.js b/js/jquery.fileupload-resize.js index be18a186e..f63966658 100644 --- a/js/jquery.fileupload-resize.js +++ b/js/jquery.fileupload-resize.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Resize Plugin 1.0 + * jQuery File Upload Image Resize Plugin 1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -37,12 +37,16 @@ { action: 'loadImage', fileTypes: '@loadImageFileTypes', - maxFileSize: '@loadImageMaxFileSize' + maxFileSize: '@loadImageMaxFileSize', + noRevoke: '@loadImageNoRevoke' }, { action: 'resizeImage', maxWidth: '@imageMaxWidth', maxHeight: '@imageMaxHeight', + minWidth: '@imageMinWidth', + minHeight: '@imageMinHeight', + crop: '@imageCrop', disabled: '@disableImageResize' }, { @@ -53,7 +57,10 @@ action: 'resizeImage', maxWidth: '@previewMaxWidth', maxHeight: '@previewMaxHeight', + minWidth: '@previewMinWidth', + minHeight: '@previewMinHeight', crop: '@previewCrop', + canvas: '@previewAsCanvas', disabled: '@disableImagePreview' }, { @@ -79,14 +86,18 @@ imageMaxWidth: 1920, // The maximum height of resized images: imageMaxHeight: 1080, + // Define if resized images should be cropped or only scaled: + imageCrop: false, // Disable the resize image functionality by default: disableImageResize: true, // The maximum width of the preview images: previewMaxWidth: 80, // The maximum height of the preview images: previewMaxHeight: 80, - // Define if prewiew images should be cropped or only scaled: - previewCrop: false + // Define if preview images should be cropped or only scaled: + previewCrop: false, + // Define if preview images should be resized as canvas elements: + previewAsCanvas: true }, processActions: { @@ -114,7 +125,8 @@ } data.img = img; dfd.resolveWith(that, [data]); - } + }, + options ); } else { dfd.rejectWith(that, [data]); @@ -122,21 +134,19 @@ return dfd.promise(); }, - // Resizes the image given as data.img and updates - // data.canvas with the resized image as canvas element. - // Accepts the options maxWidth, maxHeight, minWidth and - // minHeight to scale the given image: + // Resizes the image given as data.canvas or data.img + // and updates data.canvas or data.img with the resized image. + // Accepts the options maxWidth, maxHeight, minWidth, + // minHeight, canvas and crop: resizeImage: function (data, options) { - var img = data.canvas || data.img, + options = $.extend({canvas: true}, options); + var img = (options.canvas && data.canvas) || data.img, canvas; if (img && !options.disabled) { - canvas = loadImage.scale( - img, - $.extend({canvas: true}, options) - ); + canvas = loadImage.scale(img, options); if (canvas && (canvas.width !== img.width || canvas.height !== img.height)) { - data.canvas = canvas; + data[canvas.getContext ? 'canvas' : 'img'] = canvas; } } return data; @@ -186,8 +196,9 @@ // Sets the resized version of the image as a property of the // file object, must be called after "saveImage": setImage: function (data, options) { - if (data.canvas && !options.disabled) { - data.files[data.index][options.name] = data.canvas; + var img = data.canvas || data.img; + if (img && !options.disabled) { + data.files[data.index][options.name] = img; } return data; } From 73509ecaaff30824619977a76f5cc24cb58c1575 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 30 Apr 2013 14:32:36 +0200 Subject: [PATCH 129/759] Use a stricter approach to detect regular expressions in HTML data attributes. --- js/jquery.fileupload.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 7c8e8b170..951d98260 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.30 + * jQuery File Upload Plugin 5.30.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -1184,6 +1184,11 @@ return new RegExp(parts.join('/'), modifiers); }, + _isRegExpOption: function (key, value) { + return key !== 'url' && $.type(value) === 'string' && + /^\/.*\/[igm]{0,3}$/.test(value); + }, + _initDataAttributes: function () { var that = this, options = this.options; @@ -1191,9 +1196,7 @@ $.each( $(this.element[0].cloneNode(false)).data(), function (key, value) { - // Initialize RegExp options: - if ($.type(value) === 'string' && - value.charAt(0) === '/') { + if (that._isRegExpOption(key, value)) { value = that._getRegExp(value); } options[key] = value; From 3b2cb231f07a78ccb2d9c94b34334a67f5914488 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 30 Apr 2013 14:38:36 +0200 Subject: [PATCH 130/759] Refactor special options handling. --- js/jquery.fileupload-ui.js | 13 +++++++------ js/jquery.fileupload.js | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index f4074d289..02f8bb505 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 8.0 + * jQuery File Upload User Interface Plugin 8.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -32,6 +32,12 @@ }(function ($, tmpl, loadImage) { 'use strict'; + $.blueimp.fileupload.prototype._specialOptions.push( + 'filesContainer', + 'uploadTemplateId', + 'downloadTemplateId' + ); + // The UI version extends the file upload widget // and adds complete user interface interaction: $.widget('blueimp.fileupload', $.blueimp.fileupload, { @@ -596,11 +602,6 @@ _create: function () { this._super(); - this._refreshOptionsList.push( - 'filesContainer', - 'uploadTemplateId', - 'downloadTemplateId' - ); this._resetFinishedDeferreds(); }, diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 951d98260..79a6c3ff9 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.30.1 + * jQuery File Upload Plugin 5.31 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -223,8 +223,9 @@ cache: false }, - // A list of options that require a refresh after assigning a new value: - _refreshOptionsList: [ + // A list of options that require reinitializing event listeners and/or + // special initialization code: + _specialOptions: [ 'fileInput', 'dropZone', 'pasteZone', @@ -1150,12 +1151,12 @@ }, _setOption: function (key, value) { - var refresh = $.inArray(key, this._refreshOptionsList) !== -1; - if (refresh) { + var reinit = $.inArray(key, this._specialOptions) !== -1; + if (reinit) { this._destroyEventHandlers(); } this._super(key, value); - if (refresh) { + if (reinit) { this._initSpecialOptions(); this._initEventHandlers(); } From e841cdc63f2ef9653497e7b03ab33683365a2947 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 30 Apr 2013 15:30:17 +0200 Subject: [PATCH 131/759] Make use of global options to disable Image Load and Validation. --- js/jquery.fileupload-resize.js | 5 +++-- js/jquery.fileupload-validate.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/js/jquery.fileupload-resize.js b/js/jquery.fileupload-resize.js index f63966658..c17014192 100644 --- a/js/jquery.fileupload-resize.js +++ b/js/jquery.fileupload-resize.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Resize Plugin 1.1 + * jQuery File Upload Image Resize Plugin 1.1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -38,7 +38,8 @@ action: 'loadImage', fileTypes: '@loadImageFileTypes', maxFileSize: '@loadImageMaxFileSize', - noRevoke: '@loadImageNoRevoke' + noRevoke: '@loadImageNoRevoke', + disabled: '@disableImageLoad' }, { action: 'resizeImage', diff --git a/js/jquery.fileupload-validate.js b/js/jquery.fileupload-validate.js index eb75d6aa7..19cfeee74 100644 --- a/js/jquery.fileupload-validate.js +++ b/js/jquery.fileupload-validate.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Validation Plugin 1.0 + * jQuery File Upload Validation Plugin 1.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -40,7 +40,8 @@ acceptFileTypes: '@acceptFileTypes', maxFileSize: '@maxFileSize', minFileSize: '@minFileSize', - maxNumberOfFiles: '@maxNumberOfFiles' + maxNumberOfFiles: '@maxNumberOfFiles', + disabled: '@disableValidation' } ); From e8258908c93fb8830d23e8e0f18ef2f6838ae213 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 30 Apr 2013 15:48:49 +0200 Subject: [PATCH 132/759] Fixed loadImage process action keeping in pending state instead of rejecting the deferred if image cannot be loaded. Return the data parameter for the saveImage action if no canvas.toBlob method is available. --- js/jquery.fileupload-resize.js | 39 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/js/jquery.fileupload-resize.js b/js/jquery.fileupload-resize.js index c17014192..ae5c5beb0 100644 --- a/js/jquery.fileupload-resize.js +++ b/js/jquery.fileupload-resize.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Resize Plugin 1.1.1 + * jQuery File Upload Image Resize Plugin 1.1.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -113,23 +113,22 @@ } var that = this, file = data.files[data.index], - dfd = $.Deferred(), - fileTypes = options.fileTypes; - if (($.type(options.maxFileSize) !== 'number' || - file.size < options.maxFileSize) && - (!fileTypes || fileTypes.test(file.type))) { - loadImage( - file, - function (img) { - if (!img.src) { - return dfd.rejectWith(that, [data]); - } - data.img = img; - dfd.resolveWith(that, [data]); - }, - options - ); - } else { + dfd = $.Deferred(); + if (($.type(options.maxFileSize) === 'number' && + file.size > options.maxFileSize) || + (options.fileTypes && + !options.fileTypes.test(file.type)) || + !loadImage( + file, + function (img) { + if (!img.src) { + return dfd.rejectWith(that, [data]); + } + data.img = img; + dfd.resolveWith(that, [data]); + }, + options + )) { dfd.rejectWith(that, [data]); } return dfd.promise(); @@ -188,8 +187,10 @@ 'blob') + '.png', file.type )); - } else { + } else if (data.canvas.toBlob) { data.canvas.toBlob(callback, file.type); + } else { + return data; } return dfd.promise(); }, From e0b252bab8e62e0e57b4a19a4e024a394f4d9977 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 2 May 2013 15:07:44 +0200 Subject: [PATCH 133/759] Update progress number on directive initialization. --- js/jquery.fileupload-angular.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js index f0d237e2a..e7ba784aa 100644 --- a/js/jquery.fileupload-angular.js +++ b/js/jquery.fileupload-angular.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload AngularJS Plugin 1.0 + * jQuery File Upload AngularJS Plugin 1.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -280,13 +280,14 @@ var fn = $parse($attrs.progress), update = function () { var progress = fn($scope); - if (!progress) { + if (!progress || !progress.total) { return; } $scope.num = Math.floor( progress.loaded / progress.total * 100 ); }; + update(); $scope.$watch( $attrs.progress + '.loaded', function (newValue, oldValue) { From db27359e78ede78bd044f4a09941184642c16ff2 Mon Sep 17 00:00:00 2001 From: Han Lin Yap Date: Fri, 3 May 2013 09:40:36 +0300 Subject: [PATCH 134/759] Fix broken link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a881af10..9b5e7c7e7 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload ## Requirements * [jQuery](http://jquery.com/) v. 1.6+ * [jQuery UI widget factory](http://api.jqueryui.com/jQuery.widget/) v. 1.9+ (included) -* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/jquery.iframe-transport.js) (included) +* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) (included) * [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.1.0+ (optional) * [JavaScript Load Image function](https://github.com/blueimp/JavaScript-Load-Image) v. 1.5.0+ (optional) * [JavaScript Canvas to Blob function](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.0.5+ (optional) From f9e2c95f6bf9f21071b9a81bc0a04ecfa6af263d Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 3 May 2013 17:26:19 +0200 Subject: [PATCH 135/759] Pass a full copy of the data argument to the processing event handlers. --- js/jquery.fileupload-process.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/js/jquery.fileupload-process.js b/js/jquery.fileupload-process.js index 5fe04428c..2f9eeed2c 100644 --- a/js/jquery.fileupload-process.js +++ b/js/jquery.fileupload-process.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Processing Plugin 1.0 + * jQuery File Upload Processing Plugin 1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -64,17 +64,12 @@ */ }, - _processFile: function (files, index, options) { + _processFile: function (data) { var that = this, - data = { - files: files, - index: index, - options: options - }, dfd = $.Deferred().resolveWith(that, [data]), chain = dfd.promise(); this._trigger('process', null, data); - $.each(options.processQueue, function (i, settings) { + $.each(data.processQueue, function (i, settings) { var func = function (data) { return that.processActions[settings.action].call( that, @@ -133,10 +128,12 @@ this._trigger('processstart'); } $.each(data.files, function (index, file) { + var opts = index ? $.extend({}, options) : options, + func = function () { + return that._processFile(opts); + }; + opts.index = index; that._processing += 1; - var func = function () { - return that._processFile(data.files, index, options); - }; that._processingQueue = that._processingQueue.pipe(func, func) .always(function () { that._processing -= 1; From 2eb31c686e84c6d24066782664d1b51de2c68e1e Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 3 May 2013 17:26:55 +0200 Subject: [PATCH 136/759] Reject if one file in the given files list has an error. --- js/jquery.fileupload-validate.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/jquery.fileupload-validate.js b/js/jquery.fileupload-validate.js index 19cfeee74..2599da82a 100644 --- a/js/jquery.fileupload-validate.js +++ b/js/jquery.fileupload-validate.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Validation Plugin 1.0.1 + * jQuery File Upload Validation Plugin 1.0.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -55,7 +55,7 @@ // against either file type or file name: acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, // The maximum allowed file size in bytes: - maxFileSize: 10000000, // 10 MB, + maxFileSize: 10000000, // 10 MB // The minimum allowed file size in bytes: minFileSize: undefined, // No minimal file size // The limit of files to be uploaded: @@ -100,7 +100,7 @@ } else { delete file.error; } - if (file.error) { + if (file.error || data.files.error) { data.files.error = true; dfd.rejectWith(this, [data]); } else { From 4bc1572aaa5f91a4ac6790777e0cc0abf45da895 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 3 May 2013 17:29:11 +0200 Subject: [PATCH 137/759] Added Basic Plus example implementation. Basic Plus adds Image Previews and Resizing as well as Validation to the Basic plugin. --- angularjs.html | 9 ++- basic-plus.html | 211 ++++++++++++++++++++++++++++++++++++++++++++++++ basic.html | 24 ++++-- index.html | 11 +-- 4 files changed, 239 insertions(+), 16 deletions(-) create mode 100644 basic-plus.html diff --git a/angularjs.html b/angularjs.html index 48956084d..1edf81e5c 100644 --- a/angularjs.html +++ b/angularjs.html @@ -17,7 +17,7 @@ jQuery File Upload Demo - AngularJS version - + @@ -62,12 +62,13 @@

    jQuery File Upload Demo

    AngularJS version

    -

    File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
    +

    File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images for AngularJS.
    Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    diff --git a/basic-plus.html b/basic-plus.html new file mode 100644 index 000000000..52f79005e --- /dev/null +++ b/basic-plus.html @@ -0,0 +1,211 @@ + + + + + + + +jQuery File Upload Demo - Basic Plus version + + + + + + + + + + + + + + +
    +
    +
    + + + + + + jQuery File Upload +
    + +
    +
    +
    +
    +
    +
    +

    jQuery File Upload Demo

    +

    Basic Plus version

    + +
    +

    File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images for jQuery.
    + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    +
    +
    + + + + Add files... + + + +
    +
    + +
    +
    +
    + +
    +
    +
    +

    Demo Notes

    +
      +
    • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
      • +
    • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
      • +
    • Uploaded files will be deleted automatically after 5 minutes (demo setting).
      • +
    • You can drag & drop files from your desktop on this webpage with Google Chrome, Mozilla Firefox and Apple Safari.
      • +
    • Please refer to the project website and documentation for more information.
      • +
    • Built with Twitter's Bootstrap toolkit and Icons from Glyphicons.
      • +
    +
    +
    + + + + + + + + + + + + + + + + + + + + diff --git a/basic.html b/basic.html index 089e4da54..4fac16e2f 100644 --- a/basic.html +++ b/basic.html @@ -17,7 +17,7 @@ jQuery File Upload Demo - Basic version - + @@ -27,6 +27,8 @@ + +
    @@ -56,18 +58,26 @@

    jQuery File Upload Demo

    Basic version

    -

    File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
    - Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    +

    File Upload widget with multiple file selection, drag&drop support and progress bar for jQuery.
    + Supports cross-domain, chunked and resumable file uploads.
    Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    - - + + + + Select files... + + + +
    +
    diff --git a/index.html b/index.html index 470609676..83bbf3a8d 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@ jQuery File Upload Demo - + @@ -60,14 +60,15 @@

    jQuery File Upload Demo

    -

    Default version

    +

    Basic Plus UI version

    -

    File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
    +

    File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images for jQuery.
    Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    From cb17b19aac305271ffd50eaa69207bff2c6553c1 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 7 May 2013 12:28:04 +0200 Subject: [PATCH 138/759] Added Google Chrome on Android to supported browsers. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9b5e7c7e7..26f2a5771 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ The File Upload plugin has been tested with and supports the following mobile br * Apple Safari on iOS 6.0+ * Google Chrome on iOS 6.0+ +* Google Chrome on Android 4.0+ * Default Browser on Android 2.3+ * Opera Mobile 12.0+ From 442027a0fe8d483687596ee72da83c58ce293f1b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 9 May 2013 16:44:06 +0200 Subject: [PATCH 139/759] Updated package version. --- blueimp-file-upload.jquery.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blueimp-file-upload.jquery.json b/blueimp-file-upload.jquery.json index f86787b9b..bb68f82e1 100644 --- a/blueimp-file-upload.jquery.json +++ b/blueimp-file-upload.jquery.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "8.0.0", + "version": "8.1.0", "title": "jQuery File Upload", "author": { "name": "Sebastian Tschan", diff --git a/package.json b/package.json index 514d3a560..01ab2f2e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "8.0.0", + "version": "8.1.0", "title": "jQuery File Upload", "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", "keywords": [ From d6a19ff3c507cf7998859f6154a7ed9345049e19 Mon Sep 17 00:00:00 2001 From: David Hollifield Date: Mon, 13 May 2013 13:27:51 -0400 Subject: [PATCH 140/759] Added getFilesFromResponse option method This new overridable option method allows server responses to be refactored into a compatible files array. --- js/jquery.fileupload-ui.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index 02f8bb505..e8e78a896 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -121,7 +121,7 @@ done: function (e, data) { var that = $(this).data('blueimp-fileupload') || $(this).data('fileupload'), - files = that._getFilesFromResponse(data), + files = that.options.getFilesFromResponse(data), template, deferred; if (data.context) { @@ -161,6 +161,13 @@ ); } }, + // Callback to retrieve the list of files from an upload + getFilesFromResponse: function (data) { + if (data.result && $.isArray(data.result.files)) { + return data.result.files; + } + return []; + }, // Callback for failed (abort or error) uploads: fail: function (e, data) { var that = $(this).data('blueimp-fileupload') || @@ -324,13 +331,6 @@ return this._finishedUploads; }, - _getFilesFromResponse: function (data) { - if (data.result && $.isArray(data.result.files)) { - return data.result.files; - } - return []; - }, - // Link handler, that allows to download files // by drag & drop of the links to the desktop: _enableDragToDesktop: function () { From 88cd2e1f64b7a8c343e63c11ec2c2fc0a2f57840 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 13 May 2013 15:49:48 -0500 Subject: [PATCH 141/759] Remove the temporay upload form in a setTimeout call. Closes #2267. Fixed JSLint validity. --- js/jquery.iframe-transport.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/js/jquery.iframe-transport.js b/js/jquery.iframe-transport.js index ed2589506..e04e7a0cf 100644 --- a/js/jquery.iframe-transport.js +++ b/js/jquery.iframe-transport.js @@ -1,5 +1,5 @@ /* - * jQuery Iframe Transport Plugin 1.6.1 + * jQuery Iframe Transport Plugin 1.6.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2011, Sebastian Tschan @@ -61,9 +61,10 @@ // IE versions below IE8 cannot set the name property of // elements that have already been added to the DOM, // so we set the name along with the iframe HTML markup: + counter += 1; iframe = $( '' + counter + '">' ).bind('load', function () { var fileInputClones, paramNames = $.isArray(options.paramName) ? @@ -96,7 +97,12 @@ // (happens on form submits to iframe targets): $('') .appendTo(form); - form.remove(); + window.setTimeout(function () { + // Removing the form in a setTimeout call + // allows Chrome's developer tools to display + // the response result + form.remove(); + }, 0); }); form .prop('target', iframe.prop('name')) From 0e3ad02a54134adac4c2a6d88f2ac85601695a15 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 13 May 2013 16:20:45 -0500 Subject: [PATCH 142/759] Prevent reporting 200% progress for chunked uploads on Firefox - Closes #2269. --- js/jquery.fileupload.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 79a6c3ff9..03678f3eb 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.31 + * jQuery File Upload Plugin 5.31.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -681,7 +681,7 @@ // Create a progress event if no final progress event // with loaded equaling total has been triggered // for this chunk: - if (o._progress.loaded === currentLoaded) { + if (currentLoaded + o.chunkSize - o._progress.loaded) { that._onProgress($.Event('progress', { lengthComputable: true, loaded: ub - o.uploadedBytes, From 7b7fa6a0ebcec34efecfb7b1ed6223b9ae33eb88 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 13 May 2013 16:33:41 -0500 Subject: [PATCH 143/759] Refactored last merge and updated version number. --- js/jquery.fileupload-ui.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index e8e78a896..f0cb1b7e2 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 8.1 + * jQuery File Upload User Interface Plugin 8.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -67,6 +67,14 @@ return this.filesContainer.children().length; }, + // Callback to retrieve the list of files from the server response: + getFilesFromResponse: function (data) { + if (data.result && $.isArray(data.result.files)) { + return data.result.files; + } + return []; + }, + // The add callback is invoked as soon as files are added to the fileupload // widget (via file input selection, drag & drop or add API call). // See the basic file upload widget for more information: @@ -121,7 +129,7 @@ done: function (e, data) { var that = $(this).data('blueimp-fileupload') || $(this).data('fileupload'), - files = that.options.getFilesFromResponse(data), + files = data.getFilesFromResponse(data), template, deferred; if (data.context) { @@ -161,13 +169,6 @@ ); } }, - // Callback to retrieve the list of files from an upload - getFilesFromResponse: function (data) { - if (data.result && $.isArray(data.result.files)) { - return data.result.files; - } - return []; - }, // Callback for failed (abort or error) uploads: fail: function (e, data) { var that = $(this).data('blueimp-fileupload') || @@ -344,7 +345,7 @@ 'DownloadURL', [type, name, url].join(':') ); - } catch (err) {} + } catch (ignore) {} }); }, From 5052c2d3f53249f46eb681bc60896232a4619e5e Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 14 May 2013 11:58:07 -0500 Subject: [PATCH 144/759] Use getFilesFromResponse from options if not available as data property. Fixes #2273. --- js/jquery.fileupload-ui.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index f0cb1b7e2..5d22346de 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 8.2 + * jQuery File Upload User Interface Plugin 8.2.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -129,7 +129,9 @@ done: function (e, data) { var that = $(this).data('blueimp-fileupload') || $(this).data('fileupload'), - files = data.getFilesFromResponse(data), + getFilesFromResponse = data.getFilesFromResponse || + that.options.getFilesFromResponse, + files = getFilesFromResponse(data), template, deferred; if (data.context) { From 86dc08cd16e6753d469c049844a09702733cc3ac Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 16 May 2013 13:28:32 -0500 Subject: [PATCH 145/759] Updated package version. --- blueimp-file-upload.jquery.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blueimp-file-upload.jquery.json b/blueimp-file-upload.jquery.json index bb68f82e1..c81b4cbe6 100644 --- a/blueimp-file-upload.jquery.json +++ b/blueimp-file-upload.jquery.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "8.1.0", + "version": "8.2.1", "title": "jQuery File Upload", "author": { "name": "Sebastian Tschan", diff --git a/package.json b/package.json index 01ab2f2e9..59dba5072 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "8.1.0", + "version": "8.2.1", "title": "jQuery File Upload", "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", "keywords": [ From 8f598e6dd5e97beda753ab0faa10a3b13bea3b7c Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 17 May 2013 18:21:51 -0500 Subject: [PATCH 146/759] Fixed CORS check when target host property is empty. --- js/jquery.fileupload.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js index 03678f3eb..6956da52c 100644 --- a/js/jquery.fileupload.js +++ b/js/jquery.fileupload.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin 5.31.1 + * jQuery File Upload Plugin 5.31.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -439,13 +439,13 @@ }, _initIframeSettings: function (options) { + var targetHost = $('').prop('href', options.url).prop('host'); // Setting the dataType to iframe enables the iframe transport: options.dataType = 'iframe ' + (options.dataType || ''); // The iframe transport accepts a serialized array as form data: options.formData = this._getFormData(options); // Add redirect url to form data on cross-domain uploads: - if (options.redirect && $('').prop('href', options.url) - .prop('host') !== location.host) { + if (options.redirect && targetHost && targetHost !== location.host) { options.formData.push({ name: options.redirectParamName || 'redirect', value: options.redirect From e8d46e2be2e58f30c69d7917b6a5104d14eca01b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 17 May 2013 20:06:14 -0500 Subject: [PATCH 147/759] Added iframe to xml converter. Closes #2286. --- js/jquery.iframe-transport.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/js/jquery.iframe-transport.js b/js/jquery.iframe-transport.js index e04e7a0cf..073c5fbe7 100644 --- a/js/jquery.iframe-transport.js +++ b/js/jquery.iframe-transport.js @@ -1,5 +1,5 @@ /* - * jQuery Iframe Transport Plugin 1.6.2 + * jQuery Iframe Transport Plugin 1.7 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2011, Sebastian Tschan @@ -170,7 +170,15 @@ }); // The iframe transport returns the iframe content document as response. - // The following adds converters from iframe to text, json, html, and script: + // The following adds converters from iframe to text, json, html, xml + // and script. + // Please note that the Content-Type for JSON responses has to be text/plain + // or text/html, if the browser doesn't include application/json in the + // Accept header, else IE will show a download dialog. + // The Content-Type for XML responses on the other hand has to be always + // application/xml or text/xml, so IE properly parses the XML response. + // See also + // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation $.ajaxSetup({ converters: { 'iframe text': function (iframe) { @@ -182,6 +190,12 @@ 'iframe html': function (iframe) { return iframe && $(iframe[0].body).html(); }, + 'iframe xml': function (iframe) { + var xmlDoc = iframe && iframe[0]; + return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc : + $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) || + $(xmlDoc.body).html()); + }, 'iframe script': function (iframe) { return iframe && $.globalEval($(iframe[0].body).text()); } From 0f7973016c6ae5edb9742c24d27f5ed78b94b6fd Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 21 May 2013 13:46:58 -0500 Subject: [PATCH 148/759] Added AMD module loader support to the Angular module. Closes #2293. --- js/jquery.fileupload-angular.js | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js index e7ba784aa..38b00e4c4 100644 --- a/js/jquery.fileupload-angular.js +++ b/js/jquery.fileupload-angular.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload AngularJS Plugin 1.0.1 + * jQuery File Upload AngularJS Plugin 1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -10,9 +10,22 @@ */ /*jslint nomen: true, unparam: true */ -/*global angular */ +/*global define, angular */ -(function () { +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'angular', + './jquery.fileupload-resize', + './jquery.fileupload-validate' + ], factory); + } else { + factory(); + } +}(function () { 'use strict'; angular.module('blueimp.fileupload', []) @@ -99,7 +112,7 @@ if (data.dataType.indexOf('json') === data.dataType.length - 4) { try { data.result = angular.fromJson(data.jqXHR.responseText); - } catch (err) {} + } catch (ignore) {} } data.scope().$apply(function () { data.handleResponse.call(that, e, data); @@ -340,9 +353,9 @@ elm.prop('href') ].join(':') ); - } catch (err) {} + } catch (ignore) {} }); }; }); -}()); +})); From 6f9ec79f23133264082778c603cf82d4e7a7478b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 27 May 2013 14:46:48 -0500 Subject: [PATCH 149/759] Refactored set_file_delete_properties to set_additional_file_properties. --- server/php/UploadHandler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index b92c23c79..bf733fed2 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ delete_url = $this->options['script_url'] .$this->get_query_separator($this->options['script_url']) .'file='.rawurlencode($file->name); @@ -247,7 +247,7 @@ protected function get_file_object($file_name) { } } } - $this->set_file_delete_properties($file); + $this->set_additional_file_properties($file); return $file; } return null; @@ -619,7 +619,7 @@ protected function handle_file_upload($uploaded_file, $name, $size, $type, $erro $file->error = 'abort'; } } - $this->set_file_delete_properties($file); + $this->set_additional_file_properties($file); } return $file; } From 93a0fc88481593b488f8d7269046544cd043e290 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 27 May 2013 15:12:52 -0500 Subject: [PATCH 150/759] Make file name methods usable with the file name as only argument. --- server/php/UploadHandler.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index bf733fed2..bb2ee2192 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ get_upload_path($name))) { $name = $this->upcount_name($name); } @@ -477,7 +478,8 @@ protected function get_unique_filename($name, $type, $index, $content_range) { return $name; } - protected function trim_file_name($name, $type, $index, $content_range) { + protected function trim_file_name($name, + $type = null, $index = null, $content_range = null) { // Remove path information and dots around the filename, to prevent uploading // into different directories or replacing hidden system files. // Also remove control characters and spaces (\x00..\x20) around the filename: @@ -494,7 +496,8 @@ protected function trim_file_name($name, $type, $index, $content_range) { return $name; } - protected function get_file_name($name, $type, $index, $content_range) { + protected function get_file_name($name, + $type = null, $index = null, $content_range = null) { return $this->get_unique_filename( $this->trim_file_name($name, $type, $index, $content_range), $type, From e4be3b5bb29559d95aada16d9dc9f88c6a226016 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 30 May 2013 09:39:45 -0500 Subject: [PATCH 151/759] Allow removing files that fail server-side validation. Closes #2319. --- js/app.js | 6 +++++- js/jquery.fileupload-ui.js | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/js/app.js b/js/app.js index 5e66c2f59..ee0213a06 100644 --- a/js/app.js +++ b/js/app.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin Angular JS Example 1.0 + * jQuery File Upload Plugin Angular JS Example 1.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -82,6 +82,10 @@ } ); }; + } else if (!file.$cancel) { + file.$cancel = function () { + $scope.clear(file); + }; } } ]); diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index 5d22346de..a12691d29 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 8.2.1 + * jQuery File Upload User Interface Plugin 8.2.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -304,16 +304,19 @@ // Callback for file deletion: destroy: function (e, data) { var that = $(this).data('blueimp-fileupload') || - $(this).data('fileupload'); - if (data.url) { - $.ajax(data).done(function () { + $(this).data('fileupload'), + removeNode = function () { that._transition(data.context).done( function () { $(this).remove(); that._trigger('destroyed', e, data); } ); - }); + }; + if (data.url) { + $.ajax(data).done(removeNode); + } else { + removeNode(); } } }, From 1b3bd536bfb345dace6c8d53c4c7c80b87b0e66a Mon Sep 17 00:00:00 2001 From: Thanasis Polychronakis Date: Fri, 31 May 2013 13:47:08 +0300 Subject: [PATCH 152/759] Added gitignore in server/php to ignore uploaded files --- server/php/files/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 server/php/files/.gitignore diff --git a/server/php/files/.gitignore b/server/php/files/.gitignore new file mode 100644 index 000000000..cb7328e19 --- /dev/null +++ b/server/php/files/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!.htaccess \ No newline at end of file From c7da355bdd590aa77a786c17403504664fc88225 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 31 May 2013 11:19:54 -0500 Subject: [PATCH 153/759] Added newline. --- server/php/files/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/php/files/.gitignore b/server/php/files/.gitignore index cb7328e19..e24a60fae 100644 --- a/server/php/files/.gitignore +++ b/server/php/files/.gitignore @@ -1,3 +1,3 @@ * !.gitignore -!.htaccess \ No newline at end of file +!.htaccess From 1dbb803e812df754bf20cb409c4a317433ef7391 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 31 May 2013 11:47:24 -0500 Subject: [PATCH 154/759] Added .gitignore to Node files directory to ignore uploaded files. --- server/node/public/files/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 server/node/public/files/.gitignore diff --git a/server/node/public/files/.gitignore b/server/node/public/files/.gitignore new file mode 100644 index 000000000..d6b7ef32c --- /dev/null +++ b/server/node/public/files/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From 10e1b220899bf106a78fba11f7a7af4a0a9f4a9c Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 31 May 2013 11:47:52 -0500 Subject: [PATCH 155/759] Don't list hidden files. --- server/node/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/node/server.js b/server/node/server.js index c25826d97..9647281b7 100755 --- a/server/node/server.js +++ b/server/node/server.js @@ -1,6 +1,6 @@ #!/usr/bin/env node /* - * jQuery File Upload Plugin Node.js Example 2.0.1 + * jQuery File Upload Plugin Node.js Example 2.0.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -196,7 +196,7 @@ list.forEach(function (name) { var stats = fs.statSync(options.uploadDir + '/' + name), fileInfo; - if (stats.isFile()) { + if (stats.isFile() && name[0] !== '.') { fileInfo = new FileInfo({ name: name, size: stats.size From 11a9be56e285e75c951a3a2c564ba756d9157e98 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Fri, 31 May 2013 11:53:41 -0500 Subject: [PATCH 156/759] Don't allow deletion of hidden files. --- server/node/server.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/server/node/server.js b/server/node/server.js index 9647281b7..667a058de 100755 --- a/server/node/server.js +++ b/server/node/server.js @@ -1,6 +1,6 @@ #!/usr/bin/env node /* - * jQuery File Upload Plugin Node.js Example 2.0.2 + * jQuery File Upload Plugin Node.js Example 2.0.3 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -274,15 +274,17 @@ fileName; if (handler.req.url.slice(0, options.uploadUrl.length) === options.uploadUrl) { fileName = path.basename(decodeURIComponent(handler.req.url)); - fs.unlink(options.uploadDir + '/' + fileName, function (ex) { - Object.keys(options.imageVersions).forEach(function (version) { - fs.unlink(options.uploadDir + '/' + version + '/' + fileName); + if (fileName[0] !== '.') { + fs.unlink(options.uploadDir + '/' + fileName, function (ex) { + Object.keys(options.imageVersions).forEach(function (version) { + fs.unlink(options.uploadDir + '/' + version + '/' + fileName); + }); + handler.callback({success: !ex}); }); - handler.callback({success: !ex}); - }); - } else { - handler.callback({success: false}); + return; + } } + handler.callback({success: false}); }; if (options.ssl) { require('https').createServer(options.ssl, serve).listen(port); From 2c41a25cd50af81502cdd05de0ba1317965eba40 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Mon, 3 Jun 2013 16:42:37 -0500 Subject: [PATCH 157/759] Don't silence imagerotate errors. --- server/php/UploadHandler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index bb2ee2192..972eb47af 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ Date: Wed, 5 Jun 2013 08:14:50 -0500 Subject: [PATCH 158/759] Handle failed uploads without a defined dataType. Fixes #2333. --- js/jquery.fileupload-angular.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js index 38b00e4c4..26c8d7abe 100644 --- a/js/jquery.fileupload-angular.js +++ b/js/jquery.fileupload-angular.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload AngularJS Plugin 1.1 + * jQuery File Upload AngularJS Plugin 1.1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -109,7 +109,8 @@ if (data.errorThrown === 'abort') { return; } - if (data.dataType.indexOf('json') === data.dataType.length - 4) { + if (data.dataType && + data.dataType.indexOf('json') === data.dataType.length - 4) { try { data.result = angular.fromJson(data.jqXHR.responseText); } catch (ignore) {} From 33f4a7fc0992cf5345a734ee411d962b764df13f Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 5 Jun 2013 09:20:21 -0500 Subject: [PATCH 159/759] Added back donation links. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 26f2a5771..eafe71731 100644 --- a/README.md +++ b/README.md @@ -101,3 +101,10 @@ For a detailed overview of the features supported by each browser version please ## License Released under the [MIT license](http://www.opensource.org/licenses/MIT). + +## Donations +jQuery File Upload is free software, but you can donate to support the developer, Sebastian Tschan: + +Flattr: [![Flattr](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/286433/jQuery-File-Upload-Plugin) + +PayPal: [![PayPal](https://www.paypalobjects.com/WEBSCR-640-20110429-1/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PYWYSYP77KL54) From b52e3cba98d6843dee49fba6529d45dbdeaa5ab8 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 5 Jun 2013 09:33:08 -0500 Subject: [PATCH 160/759] Make sure the files queue is set to a valid array. Fixes #2333. --- js/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/app.js b/js/app.js index ee0213a06..b442676b0 100644 --- a/js/app.js +++ b/js/app.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin Angular JS Example 1.0.1 + * jQuery File Upload Plugin Angular JS Example 1.0.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -48,7 +48,7 @@ .then( function (response) { $scope.loadingFiles = false; - $scope.queue = response.data.files; + $scope.queue = response.data.files || []; }, function () { $scope.loadingFiles = false; From 8c7b56fa1f5ba895a89b99c5b69c8444375dc6d6 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 5 Jun 2013 09:51:02 -0500 Subject: [PATCH 161/759] Allow to override the image preview name via global options. --- js/jquery.fileupload-resize.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/js/jquery.fileupload-resize.js b/js/jquery.fileupload-resize.js index ae5c5beb0..7279a58a8 100644 --- a/js/jquery.fileupload-resize.js +++ b/js/jquery.fileupload-resize.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Resize Plugin 1.1.2 + * jQuery File Upload Image Resize Plugin 1.1.3 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -66,9 +66,7 @@ }, { action: 'setImage', - // The name of the property the resized image - // is saved as on the associated file object: - name: 'preview', + name: '@imagePreviewName', disabled: '@disableImagePreview' } ); @@ -200,7 +198,7 @@ setImage: function (data, options) { var img = data.canvas || data.img; if (img && !options.disabled) { - data.files[data.index][options.name] = img; + data.files[data.index][options.name || 'preview'] = img; } return data; } From 9ad5b393d18b07baaa7be7bba4d20cc8bddf4484 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 5 Jun 2013 11:12:19 -0500 Subject: [PATCH 162/759] Refactored fileupload-resize.js to fileupload-image.js. --- angularjs.html | 6 +++--- basic-plus.html | 4 ++-- index.html | 6 +++--- js/jquery.fileupload-angular.js | 4 ++-- ...uery.fileupload-resize.js => jquery.fileupload-image.js} | 2 +- js/jquery.fileupload-ui.js | 4 ++-- test/index.html | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) rename js/{jquery.fileupload-resize.js => jquery.fileupload-image.js} (99%) diff --git a/angularjs.html b/angularjs.html index 1edf81e5c..cd38b5541 100644 --- a/angularjs.html +++ b/angularjs.html @@ -1,7 +1,7 @@ - - + + diff --git a/basic-plus.html b/basic-plus.html index 52f79005e..3bf71106d 100644 --- a/basic-plus.html +++ b/basic-plus.html @@ -110,8 +110,8 @@

    Demo Notes

    - - + + - - + + diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js index 26c8d7abe..b2f36bb8b 100644 --- a/js/jquery.fileupload-angular.js +++ b/js/jquery.fileupload-angular.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload AngularJS Plugin 1.1.1 + * jQuery File Upload AngularJS Plugin 1.1.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -19,7 +19,7 @@ define([ 'jquery', 'angular', - './jquery.fileupload-resize', + './jquery.fileupload-image', './jquery.fileupload-validate' ], factory); } else { diff --git a/js/jquery.fileupload-resize.js b/js/jquery.fileupload-image.js similarity index 99% rename from js/jquery.fileupload-resize.js rename to js/jquery.fileupload-image.js index 7279a58a8..efe87e5e4 100644 --- a/js/jquery.fileupload-resize.js +++ b/js/jquery.fileupload-image.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Resize Plugin 1.1.3 + * jQuery File Upload Image Preview & Resize Plugin 1.0 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index a12691d29..71fa3c422 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 8.2.2 + * jQuery File Upload User Interface Plugin 8.2.3 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -19,7 +19,7 @@ define([ 'jquery', 'tmpl', - './jquery.fileupload-resize', + './jquery.fileupload-image', './jquery.fileupload-validate' ], factory); } else { diff --git a/test/index.html b/test/index.html index 5e01cd4eb..a4dd221bb 100644 --- a/test/index.html +++ b/test/index.html @@ -1,7 +1,7 @@ jQuery File Upload Demo - AngularJS version - + @@ -68,7 +68,7 @@

    AngularJS version

  • AngularJS
-

File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images for AngularJS.
+

File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for AngularJS.
Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

@@ -200,6 +200,10 @@

+ + + + diff --git a/basic-plus.html b/basic-plus.html index 3bf71106d..f6a6b4ae9 100644 --- a/basic-plus.html +++ b/basic-plus.html @@ -1,7 +1,7 @@ jQuery File Upload Demo - Basic Plus version - + @@ -64,7 +64,7 @@

Basic Plus version

  • AngularJS
    • -

    File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images for jQuery.
    +

    File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery.
    Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
    Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

    @@ -83,7 +83,7 @@

    Basic Plus version

    -
    +

    Demo Notes

    @@ -112,6 +112,10 @@

    Demo Notes

    + + + + + + + + diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js index b2f36bb8b..dec97a3dd 100644 --- a/js/jquery.fileupload-angular.js +++ b/js/jquery.fileupload-angular.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload AngularJS Plugin 1.1.2 + * jQuery File Upload AngularJS Plugin 1.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -20,6 +20,8 @@ 'jquery', 'angular', './jquery.fileupload-image', + './jquery.fileupload-audio', + './jquery.fileupload-video', './jquery.fileupload-validate' ], factory); } else { diff --git a/js/jquery.fileupload-audio.js b/js/jquery.fileupload-audio.js new file mode 100644 index 000000000..83b11c548 --- /dev/null +++ b/js/jquery.fileupload-audio.js @@ -0,0 +1,111 @@ +/* + * jQuery File Upload Audio Preview Plugin 1.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true, regexp: true */ +/*global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'load-image', + './jquery.fileupload-process' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.loadImage + ); + } +}(function ($, loadImage) { + 'use strict'; + + // Prepend to the default processQueue: + $.blueimp.fileupload.prototype.options.processQueue.unshift( + { + action: 'loadAudio', + // Always trigger this action, + // even if the previous action was rejected: + always: true, + fileTypes: '@loadAudioFileTypes', + maxFileSize: '@loadAudioMaxFileSize', + disabled: '@disableAudioLoad' + }, + { + action: 'setAudio', + name: '@audioPreviewName', + disabled: '@disableAudioPreview' + } + ); + + // The File Upload Audio Preview plugin extends the fileupload widget + // with audio preview functionality: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + // The regular expression for the types of audio files to load, + // matched against the file type: + loadAudioFileTypes: /^audio\/.*$/ + }, + + _audioElement: document.createElement('audio'), + + processActions: { + + // Loads the audio file given via data.files and data.index + // as audio element if the browser supports playing it. + // Accepts the options fileTypes (regular expression) + // and maxFileSize (integer) to limit the files to load: + loadAudio: function (data, options) { + if (options.disabled) { + return data; + } + var that = this, + file = data.files[data.index], + dfd = $.Deferred(), + url, + audio; + if (this._audioElement.canPlayType && + this._audioElement.canPlayType(file.type) && + ($.type(options.maxFileSize) !== 'number' || + file.size <= options.maxFileSize) && + (!options.fileTypes || + options.fileTypes.test(file.type))) { + url = loadImage.createObjectURL(file); + if (url) { + audio = this._audioElement.cloneNode(); + audio.src = url; + audio.controls = true; + data.audio = audio; + dfd.resolveWith(that, [data]); + return dfd.promise(); + } + } + dfd.rejectWith(that, [data]); + return dfd.promise(); + }, + + // Sets the audio element as a property of the file object: + setAudio: function (data, options) { + if (data.audio && !options.disabled) { + data.files[data.index][options.name || 'preview'] = data.audio; + } + return data; + } + + } + + }); + +})); diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js index 71fa3c422..fb3f13a53 100644 --- a/js/jquery.fileupload-ui.js +++ b/js/jquery.fileupload-ui.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload User Interface Plugin 8.2.3 + * jQuery File Upload User Interface Plugin 8.3 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -20,6 +20,8 @@ 'jquery', 'tmpl', './jquery.fileupload-image', + './jquery.fileupload-audio', + './jquery.fileupload-video', './jquery.fileupload-validate' ], factory); } else { diff --git a/js/jquery.fileupload-video.js b/js/jquery.fileupload-video.js new file mode 100644 index 000000000..5f11cd1ea --- /dev/null +++ b/js/jquery.fileupload-video.js @@ -0,0 +1,111 @@ +/* + * jQuery File Upload Video Preview Plugin 1.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true, regexp: true */ +/*global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'load-image', + './jquery.fileupload-process' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.loadImage + ); + } +}(function ($, loadImage) { + 'use strict'; + + // Prepend to the default processQueue: + $.blueimp.fileupload.prototype.options.processQueue.unshift( + { + action: 'loadVideo', + // Always trigger this action, + // even if the previous action was rejected: + always: true, + fileTypes: '@loadVideoFileTypes', + maxFileSize: '@loadVideoMaxFileSize', + disabled: '@disableVideoLoad' + }, + { + action: 'setVideo', + name: '@videoPreviewName', + disabled: '@disableVideoPreview' + } + ); + + // The File Upload Video Preview plugin extends the fileupload widget + // with video preview functionality: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + // The regular expression for the types of video files to load, + // matched against the file type: + loadVideoFileTypes: /^video\/.*$/ + }, + + _videoElement: document.createElement('video'), + + processActions: { + + // Loads the video file given via data.files and data.index + // as video element if the browser supports playing it. + // Accepts the options fileTypes (regular expression) + // and maxFileSize (integer) to limit the files to load: + loadVideo: function (data, options) { + if (options.disabled) { + return data; + } + var that = this, + file = data.files[data.index], + dfd = $.Deferred(), + url, + video; + if (this._videoElement.canPlayType && + this._videoElement.canPlayType(file.type) && + ($.type(options.maxFileSize) !== 'number' || + file.size <= options.maxFileSize) && + (!options.fileTypes || + options.fileTypes.test(file.type))) { + url = loadImage.createObjectURL(file); + if (url) { + video = this._videoElement.cloneNode(); + video.src = url; + video.controls = true; + data.video = video; + dfd.resolveWith(that, [data]); + return dfd.promise(); + } + } + dfd.rejectWith(that, [data]); + return dfd.promise(); + }, + + // Sets the video element as a property of the file object: + setVideo: function (data, options) { + if (data.video && !options.disabled) { + data.files[data.index][options.name || 'preview'] = data.video; + } + return data; + } + + } + + }); + +})); diff --git a/test/index.html b/test/index.html index a4dd221bb..38d52021d 100644 --- a/test/index.html +++ b/test/index.html @@ -1,7 +1,7 @@ diff --git a/basic-plus.html b/basic-plus.html index f6a6b4ae9..5cb586de0 100644 --- a/basic-plus.html +++ b/basic-plus.html @@ -1,7 +1,7 @@ diff --git a/basic.html b/basic.html index 8a53d41fb..c29b7ddce 100644 --- a/basic.html +++ b/basic.html @@ -1,7 +1,7 @@ diff --git a/cors/postmessage.html b/cors/postmessage.html index 6f3bede9d..3d1448f08 100644 --- a/cors/postmessage.html +++ b/cors/postmessage.html @@ -1,7 +1,7 @@ - + diff --git a/test/index.html b/test/index.html index 38d52021d..a43f3ea0b 100644 --- a/test/index.html +++ b/test/index.html @@ -1,7 +1,7 @@ - + From 921c81694e4d13744f8135541c11d959ca88881b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 11 Jun 2013 04:52:49 -0500 Subject: [PATCH 178/759] Retain EXIF and ICC headers with client-side image processing. Closes #1207. Use Exif data thumbnails if available, which increases UI performance largely when displaying thumbnails of large image files. --- js/jquery.fileupload-image.js | 91 +++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 9 deletions(-) diff --git a/js/jquery.fileupload-image.js b/js/jquery.fileupload-image.js index 561fc8b81..9df047c9f 100644 --- a/js/jquery.fileupload-image.js +++ b/js/jquery.fileupload-image.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Preview & Resize Plugin 1.0 + * jQuery File Upload Image Preview & Resize Plugin 1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -10,7 +10,7 @@ */ /*jslint nomen: true, unparam: true, regexp: true */ -/*global define, window */ +/*global define, window, document, DataView, Blob, Uint8Array */ (function (factory) { 'use strict'; @@ -44,6 +44,15 @@ noRevoke: '@loadImageNoRevoke', disabled: '@disableImageLoad' }, + { + action: 'loadImageMetaData', + disabled: '@disableImageMetaDataLoad', + disableImageHead: '@disableImageHead', + disableExif: '@disableExif', + disableExifThumbnail: '@disableExifThumbnail', + disableExifSub: '@disableExifSub', + disableExifGps: '@disableExifGps' + }, { action: 'resizeImage', maxWidth: '@imageMaxWidth', @@ -57,6 +66,10 @@ action: 'saveImage', disabled: '@disableImageResize' }, + { + action: 'saveImageMetaData', + disabled: '@disableImageMetaDataSave' + }, { action: 'resizeImage', maxWidth: '@previewMaxWidth', @@ -64,6 +77,8 @@ minWidth: '@previewMinWidth', minHeight: '@previewMinHeight', crop: '@previewCrop', + orientation: '@previewOrientation', + thumbnail: '@previewThumbnail', canvas: '@previewAsCanvas', disabled: '@disableImagePreview' }, @@ -96,6 +111,11 @@ previewMaxWidth: 80, // The maximum height of the preview images: previewMaxHeight: 80, + // Defines the preview orientation (1-8) or takes the orientation + // value from Exif data if set to true: + previewOrientation: true, + // Create the preview using the Exif data thumbnail: + previewThumbnail: true, // Define if preview images should be cropped or only scaled: previewCrop: false, // Define if preview images should be resized as canvas elements: @@ -140,14 +160,38 @@ // Accepts the options maxWidth, maxHeight, minWidth, // minHeight, canvas and crop: resizeImage: function (data, options) { + if (options.disabled) { + return data; + } + var that = this, + dfd = $.Deferred(), + resolve = function (newImg) { + data[newImg.getContext ? 'canvas' : 'img'] = newImg; + dfd.resolveWith(that, [data]); + }, + thumbnail, + img, + newImg; options = $.extend({canvas: true}, options); - var img = (options.canvas && data.canvas) || data.img, - canvas; - if (img && !options.disabled) { - canvas = loadImage.scale(img, options); - if (canvas && (canvas.width !== img.width || - canvas.height !== img.height)) { - data[canvas.getContext ? 'canvas' : 'img'] = canvas; + if (data.exif) { + if (options.orientation === true) { + options.orientation = data.exif.get('Orientation'); + } + if (options.thumbnail) { + thumbnail = data.exif.get('Thumbnail'); + if (thumbnail) { + loadImage(thumbnail, resolve, options); + return dfd.promise(); + } + } + } + img = (options.canvas && data.canvas) || data.img; + if (img) { + newImg = loadImage.scale(img, options); + if (newImg.width !== img.width || + newImg.height !== img.height) { + resolve(newImg); + return dfd.promise(); } } return data; @@ -196,6 +240,35 @@ return dfd.promise(); }, + loadImageMetaData: function (data, options) { + if (options.disabled) { + return data; + } + var that = this, + dfd = $.Deferred(); + loadImage.parseMetaData(data.files[data.index], function (result) { + $.extend(data, result); + dfd.resolveWith(that, [data]); + }, options); + return dfd.promise(); + }, + + saveImageMetaData: function (data, options) { + if (!data.imageHead || options.disabled) { + return data; + } + var file = data.files[data.index], + blob = new Blob([ + data.imageHead, + // Resized images always have a head size of 20, + // including the JPEG marker and a minimal JFIF header: + this._blobSlice.call(file, 20) + ], {type: file.type}); + blob.name = file.name; + data.files[data.index] = blob; + return data; + }, + // Sets the resized version of the image as a property of the // file object, must be called after "saveImage": setImage: function (data, options) { From c29e5cc2194b73114cfa7c7fc4fbaefdd7194c66 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 11 Jun 2013 05:50:41 -0500 Subject: [PATCH 179/759] Refactored @-options handling to save bytes. If an option is set to @, the global option of the same name as the key will be used, e.g.: acceptFileTypes: '@', // acceptFileTypes If the options set contains a property prefix, the global options key will be the prefix plus the option key, concatenated in camel-case spelling, e.g.: prefix: 'loadImage', acceptFileTypes: '@', // loadImageAcceptFileTypes If the prefix is set to true, the action of the options set will be used as key. --- js/jquery.fileupload-image.js | 65 ++++++++++++++++++-------------- js/jquery.fileupload-process.js | 11 ++++-- js/jquery.fileupload-validate.js | 10 ++--- 3 files changed, 50 insertions(+), 36 deletions(-) diff --git a/js/jquery.fileupload-image.js b/js/jquery.fileupload-image.js index 9df047c9f..723de13ac 100644 --- a/js/jquery.fileupload-image.js +++ b/js/jquery.fileupload-image.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Preview & Resize Plugin 1.1 + * jQuery File Upload Image Preview & Resize Plugin 1.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -35,31 +35,35 @@ // Prepend to the default processQueue: $.blueimp.fileupload.prototype.options.processQueue.unshift( { - action: 'loadImage', + action: 'loadImageMetaData', // Always trigger this action, // even if the previous action was rejected: always: true, - fileTypes: '@loadImageFileTypes', - maxFileSize: '@loadImageMaxFileSize', - noRevoke: '@loadImageNoRevoke', - disabled: '@disableImageLoad' + disableImageHead: '@', + disableExif: '@', + disableExifThumbnail: '@', + disableExifSub: '@', + disableExifGps: '@', + disabled: '@disableImageMetaDataLoad' }, { - action: 'loadImageMetaData', - disabled: '@disableImageMetaDataLoad', - disableImageHead: '@disableImageHead', - disableExif: '@disableExif', - disableExifThumbnail: '@disableExifThumbnail', - disableExifSub: '@disableExifSub', - disableExifGps: '@disableExifGps' + action: 'loadImage', + // Use the action as prefix for the "@" options: + prefix: true, + fileTypes: '@', + maxFileSize: '@', + noRevoke: '@', + disabled: '@disableImageLoad' }, { action: 'resizeImage', - maxWidth: '@imageMaxWidth', - maxHeight: '@imageMaxHeight', - minWidth: '@imageMinWidth', - minHeight: '@imageMinHeight', - crop: '@imageCrop', + // Use "image" as prefix for the "@" options: + prefix: 'image', + maxWidth: '@', + maxHeight: '@', + minWidth: '@', + minHeight: '@', + crop: '@', disabled: '@disableImageResize' }, { @@ -72,14 +76,19 @@ }, { action: 'resizeImage', - maxWidth: '@previewMaxWidth', - maxHeight: '@previewMaxHeight', - minWidth: '@previewMinWidth', - minHeight: '@previewMinHeight', - crop: '@previewCrop', - orientation: '@previewOrientation', - thumbnail: '@previewThumbnail', - canvas: '@previewAsCanvas', + // Always trigger this action, + // even if the previous action was rejected: + always: true, + // Use "preview" as prefix for the "@" options: + prefix: 'preview', + maxWidth: '@', + maxHeight: '@', + minWidth: '@', + minHeight: '@', + crop: '@', + orientation: '@', + thumbnail: '@', + canvas: '@', disabled: '@disableImagePreview' }, { @@ -98,7 +107,7 @@ // matched against the file type: loadImageFileTypes: /^image\/(gif|jpeg|png)$/, // The maximum file size of images to load: - loadImageMaxFileSize: 5000000, // 5MB + loadImageMaxFileSize: 10000000, // 10MB // The maximum width of resized images: imageMaxWidth: 1920, // The maximum height of resized images: @@ -119,7 +128,7 @@ // Define if preview images should be cropped or only scaled: previewCrop: false, // Define if preview images should be resized as canvas elements: - previewAsCanvas: true + previewCanvas: true }, processActions: { diff --git a/js/jquery.fileupload-process.js b/js/jquery.fileupload-process.js index 2f9eeed2c..c10c67832 100644 --- a/js/jquery.fileupload-process.js +++ b/js/jquery.fileupload-process.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Processing Plugin 1.1 + * jQuery File Upload Processing Plugin 1.2 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -98,11 +98,16 @@ _transformProcessQueue: function (options) { var processQueue = []; $.each(options.processQueue, function () { - var settings = {}; + 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)]; + settings[key] = options[ + value.slice(1) || prefix ? prefix + + key.charAt(0).toUpperCase() + key.slice(1) : key + ]; } else { settings[key] = value; } diff --git a/js/jquery.fileupload-validate.js b/js/jquery.fileupload-validate.js index 2599da82a..1cc4f1ebb 100644 --- a/js/jquery.fileupload-validate.js +++ b/js/jquery.fileupload-validate.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Validation Plugin 1.0.2 + * jQuery File Upload Validation Plugin 1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -37,10 +37,10 @@ // even if the previous action was rejected: always: true, // Options taken from the global options map: - acceptFileTypes: '@acceptFileTypes', - maxFileSize: '@maxFileSize', - minFileSize: '@minFileSize', - maxNumberOfFiles: '@maxNumberOfFiles', + acceptFileTypes: '@', + maxFileSize: '@', + minFileSize: '@', + maxNumberOfFiles: '@', disabled: '@disableValidation' } ); From f74f3395eb5a9cadae01c343985a2b34b81ea831 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 11 Jun 2013 17:40:23 -0500 Subject: [PATCH 180/759] Use the action as prefix for the "@" options. --- js/jquery.fileupload-audio.js | 8 +++++--- js/jquery.fileupload-video.js | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/jquery.fileupload-audio.js b/js/jquery.fileupload-audio.js index 83b11c548..41f0fdb93 100644 --- a/js/jquery.fileupload-audio.js +++ b/js/jquery.fileupload-audio.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Audio Preview Plugin 1.0 + * jQuery File Upload Audio Preview Plugin 1.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -38,8 +38,10 @@ // Always trigger this action, // even if the previous action was rejected: always: true, - fileTypes: '@loadAudioFileTypes', - maxFileSize: '@loadAudioMaxFileSize', + // Use the action as prefix for the "@" options: + prefix: true, + fileTypes: '@', + maxFileSize: '@', disabled: '@disableAudioLoad' }, { diff --git a/js/jquery.fileupload-video.js b/js/jquery.fileupload-video.js index 5f11cd1ea..44c659e1c 100644 --- a/js/jquery.fileupload-video.js +++ b/js/jquery.fileupload-video.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Video Preview Plugin 1.0 + * jQuery File Upload Video Preview Plugin 1.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -38,8 +38,10 @@ // Always trigger this action, // even if the previous action was rejected: always: true, - fileTypes: '@loadVideoFileTypes', - maxFileSize: '@loadVideoMaxFileSize', + // Use the action as prefix for the "@" options: + prefix: true, + fileTypes: '@', + maxFileSize: '@', disabled: '@disableVideoLoad' }, { From d9e411af36b361a27dce952ca75bf0e8a0d4fb5f Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 11 Jun 2013 17:48:55 -0500 Subject: [PATCH 181/759] Use the disable option for both loading and setting the preview element. --- js/jquery.fileupload-audio.js | 2 +- js/jquery.fileupload-video.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.fileupload-audio.js b/js/jquery.fileupload-audio.js index 41f0fdb93..92fd57b84 100644 --- a/js/jquery.fileupload-audio.js +++ b/js/jquery.fileupload-audio.js @@ -42,7 +42,7 @@ prefix: true, fileTypes: '@', maxFileSize: '@', - disabled: '@disableAudioLoad' + disabled: '@disableAudioPreview' }, { action: 'setAudio', diff --git a/js/jquery.fileupload-video.js b/js/jquery.fileupload-video.js index 44c659e1c..88c24d03d 100644 --- a/js/jquery.fileupload-video.js +++ b/js/jquery.fileupload-video.js @@ -42,7 +42,7 @@ prefix: true, fileTypes: '@', maxFileSize: '@', - disabled: '@disableVideoLoad' + disabled: '@disableVideoPreview' }, { action: 'setVideo', From 2d7e86acc1d7078d5bde6e54e3786f5e88e9a3e9 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 11 Jun 2013 18:58:56 -0500 Subject: [PATCH 182/759] Allow defining upload_dir/upload_url for each image version. Closes #2340. --- server/php/UploadHandler.php | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php index 7b42e9f26..60b08fac3 100644 --- a/server/php/UploadHandler.php +++ b/server/php/UploadHandler.php @@ -1,6 +1,6 @@ array( + // Uncomment the following to use a defined directory for the thumbnails + // instead of a subdirectory based on the version identifier. + // Make sure that this directory doesn't allow execution of files if you + // don't pose any restrictions on the type of uploaded files, e.g. by + // copying the .htaccess file from the files directory for Apache: + //'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/thumb/', + //'upload_url' => $this->get_full_url().'/thumb/', // Uncomment the following to force the max // dimensions and e.g. create square thumbnails: //'crop' => true, @@ -175,7 +182,15 @@ protected function get_user_path() { protected function get_upload_path($file_name = null, $version = null) { $file_name = $file_name ? $file_name : ''; - $version_path = empty($version) ? '' : $version.'/'; + if (empty($version)) { + $version_path = ''; + } else { + $version_dir = @$this->options['image_versions'][$version]['upload_dir']; + if ($version_dir) { + return $version_dir.$this->get_user_path().$file_name; + } + $version_path = $version.'/'; + } return $this->options['upload_dir'].$this->get_user_path() .$version_path.$file_name; } @@ -194,7 +209,15 @@ protected function get_download_url($file_name, $version = null, $direct = false } return $url.'&download=1'; } - $version_path = empty($version) ? '' : rawurlencode($version).'/'; + if (empty($version)) { + $version_path = ''; + } else { + $version_url = @$this->options['image_versions'][$version]['upload_url']; + if ($version_url) { + return $version_url.$this->get_user_path().rawurlencode($file_name); + } + $version_path = rawurlencode($version).'/'; + } return $this->options['upload_url'].$this->get_user_path() .$version_path.rawurlencode($file_name); } From 377652a472340b12b5404bf78e6aea3630081e57 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Tue, 11 Jun 2013 20:31:01 -0500 Subject: [PATCH 183/759] Updated package version. --- blueimp-file-upload.jquery.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blueimp-file-upload.jquery.json b/blueimp-file-upload.jquery.json index c81b4cbe6..4c020124c 100644 --- a/blueimp-file-upload.jquery.json +++ b/blueimp-file-upload.jquery.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "8.2.1", + "version": "8.3.0", "title": "jQuery File Upload", "author": { "name": "Sebastian Tschan", diff --git a/package.json b/package.json index 59dba5072..b6d7c5bae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blueimp-file-upload", - "version": "8.2.1", + "version": "8.3.0", "title": "jQuery File Upload", "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", "keywords": [ From cebdbfd1aafedff1766f17d58bb16e7040cf1ab5 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 02:14:24 -0500 Subject: [PATCH 184/759] Remove upload methods from the scope when the widget is removed. Fixes #2258. --- js/jquery.fileupload-angular.js | 57 ++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/js/jquery.fileupload-angular.js b/js/jquery.fileupload-angular.js index dec97a3dd..0f15ce61b 100644 --- a/js/jquery.fileupload-angular.js +++ b/js/jquery.fileupload-angular.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload AngularJS Plugin 1.2 + * jQuery File Upload AngularJS Plugin 1.2.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -170,6 +170,29 @@ .controller('FileUploadController', [ '$scope', '$element', '$attrs', 'fileUpload', function ($scope, $element, $attrs, fileUpload) { + var uploadMethods = { + progress: function () { + return $element.fileupload('progress'); + }, + active: function () { + return $element.fileupload('active'); + }, + option: function (option, data) { + return $element.fileupload('option', option, data); + }, + add: function (data) { + return $element.fileupload('add', data); + }, + send: function (data) { + return $element.fileupload('send', data); + }, + process: function (data) { + return $element.fileupload('process', data); + }, + processing: function (data) { + return $element.fileupload('processing', data); + } + }; $scope.disabled = angular.element('') .prop('disabled'); $scope.queue = $scope.queue || []; @@ -202,27 +225,6 @@ } } }; - $scope.progress = function () { - return $element.fileupload('progress'); - }; - $scope.active = function () { - return $element.fileupload('active'); - }; - $scope.option = function (option, data) { - return $element.fileupload('option', option, data); - }; - $scope.add = function (data) { - return $element.fileupload('add', data); - }; - $scope.send = function (data) { - return $element.fileupload('send', data); - }; - $scope.process = function (data) { - return $element.fileupload('process', data); - }; - $scope.processing = function (data) { - return $element.fileupload('processing', data); - }; $scope.applyOnQueue = function (method) { var list = this.queue.slice(0), i, @@ -240,6 +242,8 @@ $scope.cancel = function () { this.applyOnQueue('$cancel'); }; + // Add upload methods to the scope: + angular.extend($scope, uploadMethods); // The fileupload widget will initialize with // the options provided via "data-"-parameters, // as well as those given via options object: @@ -277,6 +281,15 @@ 'fileuploadprocessstop' ].join(' '), function (e, data) { $scope.$emit(e.type, data); + }).on('remove', function () { + // Remove upload methods from the scope, + // when the widget is removed: + var method; + for (method in uploadMethods) { + if (uploadMethods.hasOwnProperty(method)) { + delete $scope[method]; + } + } }); // Observe option changes: $scope.$watch( From 7709dbbb91bc0b2f7707ec7f31c3e55543594139 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 02:35:25 -0500 Subject: [PATCH 185/759] Updated required version of the Load Image library. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6d7c5bae..83f93d60b 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "jquery": ">=1.6", "jquery.ui.widget": ">=1.9", "blueimp-tmpl": ">=2.1.0", - "blueimp-load-image": ">=1.5.0", + "blueimp-load-image": ">=1.7.0", "blueimp-canvas-to-blob": ">=2.0.5" } } From 25075410b2fae2f018c7e992d0f6434442fd681b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 02:42:57 -0500 Subject: [PATCH 186/759] Updated the AMD module requirements. --- js/jquery.fileupload-image.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/jquery.fileupload-image.js b/js/jquery.fileupload-image.js index 723de13ac..b0acb93d4 100644 --- a/js/jquery.fileupload-image.js +++ b/js/jquery.fileupload-image.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Image Preview & Resize Plugin 1.2 + * jQuery File Upload Image Preview & Resize Plugin 1.2.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013, Sebastian Tschan @@ -19,6 +19,9 @@ define([ 'jquery', 'load-image', + 'load-image-meta', + 'load-image-exif', + 'load-image-ios', 'canvas-to-blob', './jquery.fileupload-process' ], factory); From afc995f62cb40826f1938cff0ebebf1ef727d68e Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 04:21:40 -0500 Subject: [PATCH 187/759] Updated package description. --- blueimp-file-upload.jquery.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blueimp-file-upload.jquery.json b/blueimp-file-upload.jquery.json index 4c020124c..a699dbce2 100644 --- a/blueimp-file-upload.jquery.json +++ b/blueimp-file-upload.jquery.json @@ -16,7 +16,7 @@ "jquery": ">=1.6", "jquery.ui.widget": ">=1.9" }, - "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", + "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", "keywords": [ "jquery", "file", diff --git a/package.json b/package.json index 83f93d60b..c58f5d4c9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "blueimp-file-upload", "version": "8.3.0", "title": "jQuery File Upload", - "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", + "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", "keywords": [ "jquery", "file", From e9d1728fddf62dfdce8cefac897511480acdfb60 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 04:47:54 -0500 Subject: [PATCH 188/759] Fixed "@" options handling. --- js/jquery.fileupload-process.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/jquery.fileupload-process.js b/js/jquery.fileupload-process.js index c10c67832..08ce86c56 100644 --- a/js/jquery.fileupload-process.js +++ b/js/jquery.fileupload-process.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Processing Plugin 1.2 + * jQuery File Upload Processing Plugin 1.2.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2012, Sebastian Tschan @@ -98,19 +98,21 @@ _transformProcessQueue: function (options) { var processQueue = []; $.each(options.processQueue, function () { - var settings = {}, + var that = this, + 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 + value.slice(1) || (prefix ? prefix + + key.charAt(0).toUpperCase() + key.slice(1) : key) ]; } else { settings[key] = value; } + }); processQueue.push(settings); }); From 851bc2bd3fa26c03809187f3a4da4ebbee722dfc Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 04:48:35 -0500 Subject: [PATCH 189/759] Don't try to parse meta data of the test dummy objects. --- test/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test.js b/test/test.js index ecdea0e20..e3dcab850 100644 --- a/test/test.js +++ b/test/test.js @@ -1201,7 +1201,7 @@ $(function () { .fileupload({ autoUpload: true, acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, - previewFileTypes: /none/, + disableImageMetaDataLoad: true, send: function (e, data) { strictEqual( sendIndex += 1, From 892ebaef7cf04014005e943d7be40ce94146c06b Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 05:35:50 -0500 Subject: [PATCH 190/759] Disable image resizing on the demo for Android and Opera. Android and Opera actually support image resizing, but fail to send Blob objects via XHR requests. --- js/main.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/js/main.js b/js/main.js index a291435b1..eee045c40 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin JS Example 8.0 + * jQuery File Upload Plugin JS Example 8.0.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -9,8 +9,8 @@ * http://www.opensource.org/licenses/MIT */ -/*jslint nomen: true, unparam: true, regexp: true */ -/*global $, window, document */ +/*jslint nomen: true, regexp: true */ +/*global $, window, navigator */ $(function () { 'use strict'; @@ -37,7 +37,11 @@ $(function () { // Demo settings: $('#fileupload').fileupload('option', { url: '//jquery-file-upload.appspot.com/', - disableImageResize: false, + // Enable image resizing, except for Android and Opera, + // which actually support image resizing, but fail to + // send Blob objects via XHR requests: + disableImageResize: /Android(?!.*Chrome)|Opera/ + .test(window.navigator && navigator.userAgent), maxFileSize: 5000000, acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i }); @@ -62,7 +66,7 @@ $(function () { url: $('#fileupload').fileupload('option', 'url'), dataType: 'json', context: $('#fileupload')[0] - }).always(function (result) { + }).always(function () { $(this).removeClass('fileupload-processing'); }).done(function (result) { $(this).fileupload('option', 'done') From 6d05e8ff0b9d9e6b37ae84e82fff530ba5800ed0 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 05:42:00 -0500 Subject: [PATCH 191/759] Updated jQuery UI widget version. --- js/vendor/jquery.ui.widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/vendor/jquery.ui.widget.js b/js/vendor/jquery.ui.widget.js index fd2948f50..2d370893a 100644 --- a/js/vendor/jquery.ui.widget.js +++ b/js/vendor/jquery.ui.widget.js @@ -1,5 +1,5 @@ /* - * jQuery UI Widget 1.10.1+amd + * jQuery UI Widget 1.10.3+amd * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2013 jQuery Foundation and other contributors From a470fdcff40f11e7b21d88b6d33fc4a18e2018d6 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Wed, 12 Jun 2013 06:03:59 -0500 Subject: [PATCH 192/759] Disable image resizing on the Basic Plus and AngularJS demo for Android and Opera. --- basic-plus.html | 10 +++++++--- js/app.js | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/basic-plus.html b/basic-plus.html index 5cb586de0..b7bea6fd0 100644 --- a/basic-plus.html +++ b/basic-plus.html @@ -1,7 +1,7 @@ - + - + - + - + @@ -46,7 +46,7 @@ jQuery File Upload
      -
    • Demo
      • +
    • Demo
    • Download
    • Source Code
    • Documentation
      • @@ -76,7 +76,7 @@

      AngularJS version

      - +
      @@ -186,12 +186,12 @@

      - + - + - - + + diff --git a/basic-plus.html b/basic-plus.html index 4b56c3a81..5ce6f275b 100644 --- a/basic-plus.html +++ b/basic-plus.html @@ -20,13 +20,13 @@ - + - + - + @@ -42,7 +42,7 @@ jQuery File Upload
        -
      • Demo
        • +
      • Demo
      • Download
      • Source Code
      • Documentation
        • @@ -101,9 +101,9 @@

        Demo Notes

        - + - + @@ -124,7 +124,7 @@

        Demo Notes

        $(function () { 'use strict'; // Change this to the location of your server-side upload handler: - var url = (window.location.hostname === 'blueimp.github.com' || + var url = (window.location.hostname === 'blueimp.github.io' || window.location.hostname === 'blueimp.github.io') ? '//jquery-file-upload.appspot.com/' : 'server/php/', uploadButton = $(' + {% } %} {% if (!i && !o.options.autoUpload) { %}