From 98670fabbf4d686d58e6a5dcef3434d7a0e78eaf Mon Sep 17 00:00:00 2001
From: jbostoen
Date: Wed, 19 Jul 2017 19:50:13 +0200
Subject: [PATCH 001/230] Update UploadHandler.php
You actually have an implementation for a strip-parameter (and its used as stripImage) to remove EXIF tags (eg location). But if you want to retain the original file when it comes to anything else, you need a little change. Took some time to figure out.
---
server/php/UploadHandler.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
index 1380d4739..a6be171ae 100755
--- a/server/php/UploadHandler.php
+++ b/server/php/UploadHandler.php
@@ -871,7 +871,7 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
if (!empty($options['max_height'])) {
$new_height = $max_height = $options['max_height'];
}
- if (!($image_oriented || $max_width < $img_width || $max_height < $img_height)) {
+ if (!($image_oriented || $max_width < $img_width || $max_height < $img_height || $options['strip'] == TRUE )) {
if ($file_path !== $new_file_path) {
return copy($file_path, $new_file_path);
}
From 4366c0fe25ea1ed1f4eed5a61cbe0075cd187022 Mon Sep 17 00:00:00 2001
From: jbostoen
Date: Fri, 21 Jul 2017 10:54:14 +0200
Subject: [PATCH 002/230] Update UploadHandler.php
---
server/php/UploadHandler.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
index a6be171ae..68bd535f0 100755
--- a/server/php/UploadHandler.php
+++ b/server/php/UploadHandler.php
@@ -871,7 +871,7 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
if (!empty($options['max_height'])) {
$new_height = $max_height = $options['max_height'];
}
- if (!($image_oriented || $max_width < $img_width || $max_height < $img_height || $options['strip'] == TRUE )) {
+ if (!($image_oriented || $max_width < $img_width || $max_height < $img_height || !empty($options['strip']) )) {
if ($file_path !== $new_file_path) {
return copy($file_path, $new_file_path);
}
From 454265fefc1bada62fa9cb59f5ba3dd523bdec1a Mon Sep 17 00:00:00 2001
From: jbostoen
Date: Sat, 22 Jul 2017 19:29:29 +0200
Subject: [PATCH 003/230] Update UploadHandler.php
imagick_create_scaled_image:
- jpeg_quality was ignored if it was the only parameter set (similar to previous patch for 'strip' exif information)
- instead of a negative condition, turned it around: if dimensions are within limits and no changes required (strip exif, jpeg quality, orientation), then return original image
- added comment warning about the implications of setting options on the 'original' image ( version '' ). All other versions inherit those settings.
---
server/php/UploadHandler.php | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
index 68bd535f0..a0afe44c2 100755
--- a/server/php/UploadHandler.php
+++ b/server/php/UploadHandler.php
@@ -132,6 +132,7 @@ public function __construct($options = null, $initialize = true, $error_messages
'identify_bin' => 'identify',
'image_versions' => array(
// The empty image version key defines options for the original image:
+ // Keep in mind that these options are inherited by all other image versions!
'' => array(
// Automatically rotate images based on EXIF meta data:
'auto_orient' => true
@@ -871,7 +872,13 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
if (!empty($options['max_height'])) {
$new_height = $max_height = $options['max_height'];
}
- if (!($image_oriented || $max_width < $img_width || $max_height < $img_height || !empty($options['strip']) )) {
+
+ $image_strip = false;
+ if( !empty($options["strip"]) ) {
+ $image_strip = $options["strip"];
+ }
+
+ if ( !$image_oriented && ($max_width >= $img_width) && ($max_height >= $img_height) && !image_strip && empty($options["jpeg_quality"]) ) {
if ($file_path !== $new_file_path) {
return copy($file_path, $new_file_path);
}
@@ -917,7 +924,7 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
}
break;
}
- if (!empty($options['strip'])) {
+ if ( $image_strip ) {
$image->stripImage();
}
return $success && $image->writeImage($new_file_path);
From 7bfdf77a448e7f9c2cb26e19ffca8d5be36239f0 Mon Sep 17 00:00:00 2001
From: Sebastian Tschan
Date: Wed, 26 Jul 2017 16:15:51 +0200
Subject: [PATCH 004/230] Update license text.
---
LICENSE | 20 --------------------
LICENSE.txt | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 20 deletions(-)
delete mode 100644 LICENSE
create mode 100644 LICENSE.txt
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 0ecca3e8c..000000000
--- a/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 jQuery-File-Upload Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 000000000..87a644638
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright © 2010 Sebastian Tschan, https://blueimp.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
From 883241b59da45e0b61a255542dffea9635ee3dfe Mon Sep 17 00:00:00 2001
From: cubiclesoft
Date: Sun, 6 Aug 2017 19:49:16 -0700
Subject: [PATCH 005/230] Allow maxChunkSize to be a function for dynamic chunk
size support.
---
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 5ff151b53..f20bc6d06 100644
--- a/js/jquery.fileupload.js
+++ b/js/jquery.fileupload.js
@@ -730,7 +730,7 @@
promise = dfd.promise(),
jqXHR,
upload;
- if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
+ if (!(this._isXHRUpload(options) && slice && (ub || ($.type(mcs) === 'function' ? mcs(options) : mcs) < fs)) ||
options.data) {
return false;
}
@@ -753,7 +753,7 @@
o.blob = slice.call(
file,
ub,
- ub + mcs,
+ ub + ($.type(mcs) === 'function' ? mcs(o) : mcs),
file.type
);
// Store the current chunk size, as the blob itself
From b33184cd778df33873b4a2c7e58b4713e8f5ebe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Nikoli=C4=87?=
Date: Mon, 14 Aug 2017 16:35:31 +0200
Subject: [PATCH 006/230] Add CommonJS require for audio component
---
js/jquery.fileupload-ui.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js
index 83e7449e6..5058084b4 100644
--- a/js/jquery.fileupload-ui.js
+++ b/js/jquery.fileupload-ui.js
@@ -30,6 +30,7 @@
require('jquery'),
require('blueimp-tmpl'),
require('./jquery.fileupload-image'),
+ require('./jquery.fileupload-audio'),
require('./jquery.fileupload-video'),
require('./jquery.fileupload-validate')
);
From 25a1c48d757a9b08b7220584369d70dca543ab84 Mon Sep 17 00:00:00 2001
From: Sebastian Tschan
Date: Sun, 27 Aug 2017 10:56:54 +0200
Subject: [PATCH 007/230] Remove newlines in function body for consistency.
---
server/php/UploadHandler.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
index a0afe44c2..fdda7db17 100755
--- a/server/php/UploadHandler.php
+++ b/server/php/UploadHandler.php
@@ -872,12 +872,10 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
if (!empty($options['max_height'])) {
$new_height = $max_height = $options['max_height'];
}
-
$image_strip = false;
if( !empty($options["strip"]) ) {
$image_strip = $options["strip"];
}
-
if ( !$image_oriented && ($max_width >= $img_width) && ($max_height >= $img_height) && !image_strip && empty($options["jpeg_quality"]) ) {
if ($file_path !== $new_file_path) {
return copy($file_path, $new_file_path);
From 9459d1042a2e6b1d215c53a36d3fdc23150be04d Mon Sep 17 00:00:00 2001
From: Sebastian Tschan
Date: Sun, 27 Aug 2017 11:22:15 +0200
Subject: [PATCH 008/230] 9.19.0
---
bower.json | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bower.json b/bower.json
index 90c74c792..d4273502a 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "blueimp-file-upload",
- "version": "9.18.0",
+ "version": "9.19.0",
"title": "jQuery File Upload",
"description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images.",
"keywords": [
diff --git a/package.json b/package.json
index ed4d33681..7fe093acc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "blueimp-file-upload",
- "version": "9.18.0",
+ "version": "9.19.0",
"title": "jQuery File Upload",
"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": [
From 2d9f499cc6c1bf41f234bbffe024b2a6a88b7a26 Mon Sep 17 00:00:00 2001
From: PaulBehrendtVentoro
Date: Fri, 1 Sep 2017 16:04:23 +0200
Subject: [PATCH 009/230] Fix typo in php upload handler
---
server/php/UploadHandler.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
index fdda7db17..ccf73f9d0 100755
--- a/server/php/UploadHandler.php
+++ b/server/php/UploadHandler.php
@@ -876,7 +876,7 @@ protected function imagick_create_scaled_image($file_name, $version, $options) {
if( !empty($options["strip"]) ) {
$image_strip = $options["strip"];
}
- if ( !$image_oriented && ($max_width >= $img_width) && ($max_height >= $img_height) && !image_strip && empty($options["jpeg_quality"]) ) {
+ if ( !$image_oriented && ($max_width >= $img_width) && ($max_height >= $img_height) && !$image_strip && empty($options["jpeg_quality"]) ) {
if ($file_path !== $new_file_path) {
return copy($file_path, $new_file_path);
}
From fbf442f1a90fdab69f1159951a2308fac0164993 Mon Sep 17 00:00:00 2001
From: Sebastian Tschan
Date: Mon, 4 Sep 2017 21:36:34 +0200
Subject: [PATCH 010/230] 9.19.1
---
bower.json | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bower.json b/bower.json
index d4273502a..ac8742cab 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "blueimp-file-upload",
- "version": "9.19.0",
+ "version": "9.19.1",
"title": "jQuery File Upload",
"description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images.",
"keywords": [
diff --git a/package.json b/package.json
index 7fe093acc..e2f75dbc2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "blueimp-file-upload",
- "version": "9.19.0",
+ "version": "9.19.1",
"title": "jQuery File Upload",
"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": [
From 4f6e256aea735a41e833b7a1f0d7f969ab4af396 Mon Sep 17 00:00:00 2001
From: Sebastian Tschan
Date: Wed, 11 Oct 2017 18:23:16 +0200
Subject: [PATCH 011/230] Properly label jQuery UI demo CSS files. Include
generic page styles in jQuery UI demo.
---
bower.json | 4 ++--
css/{demo-ie8.css => jquery-ui-demo-ie8.css} | 0
css/{demo.css => jquery-ui-demo.css} | 0
jquery-ui.html | 6 ++++--
4 files changed, 6 insertions(+), 4 deletions(-)
rename css/{demo-ie8.css => jquery-ui-demo-ie8.css} (100%)
rename css/{demo.css => jquery-ui-demo.css} (100%)
diff --git a/bower.json b/bower.json
index ac8742cab..ff8dd9fdb 100644
--- a/bower.json
+++ b/bower.json
@@ -53,8 +53,8 @@
"ignore": [
"/*.*",
"/cors",
- "css/demo-ie8.css",
- "css/demo.css",
+ "css/jquery-ui-demo-ie8.css",
+ "css/jquery-ui-demo.css",
"css/style.css",
"js/app.js",
"js/main.js",
diff --git a/css/demo-ie8.css b/css/jquery-ui-demo-ie8.css
similarity index 100%
rename from css/demo-ie8.css
rename to css/jquery-ui-demo-ie8.css
diff --git a/css/demo.css b/css/jquery-ui-demo.css
similarity index 100%
rename from css/demo.css
rename to css/jquery-ui-demo.css
diff --git a/jquery-ui.html b/jquery-ui.html
index 83fe9acd1..6fb9e8a04 100644
--- a/jquery-ui.html
+++ b/jquery-ui.html
@@ -23,10 +23,12 @@
+
+
-
+
-
+
@@ -97,7 +97,7 @@ jQuery UI version
Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-