You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2017/04/13 10:45:14 UTC

wicket git commit: WICKET-6286 don't require attachment for blob download, inline won't work anyway

Repository: wicket
Updated Branches:
  refs/heads/master f295636ab -> 185539efc


WICKET-6286 don't require attachment for blob download, inline won't work anyway


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/185539ef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/185539ef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/185539ef

Branch: refs/heads/master
Commit: 185539efcfb38e9f9f16f5a97d2b29cbed0239bf
Parents: f295636
Author: Sven Meier <sv...@apache.org>
Authored: Thu Apr 13 12:45:00 2017 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Thu Apr 13 12:45:00 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/extensions/ajax/AjaxDownload.java | 3 +--
 .../java/org/apache/wicket/extensions/ajax/wicket-ajaxdownload.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/185539ef/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxDownload.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxDownload.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxDownload.java
index 7815121..370b77a 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxDownload.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxDownload.java
@@ -73,8 +73,7 @@ public class AjaxDownload extends AbstractDefaultAjaxBehavior
 
 	public enum Location {
 		/**
-		 * The resource will be downloaded into a blob, the resource has to be a
-		 * {@link ContentDisposition#ATTACHMENT}..
+		 * The resource will be downloaded into a {@code blob}.
 		 * <p>
 		 * This is recommended for modern browsers.
 		 */

http://git-wip-us.apache.org/repos/asf/wicket/blob/185539ef/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/wicket-ajaxdownload.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/wicket-ajaxdownload.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/wicket-ajaxdownload.js
index ec7ae62..f8452ae 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/wicket-ajaxdownload.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/wicket-ajaxdownload.js
@@ -106,7 +106,7 @@
 					if (this.status === 200) {
 						var filename = "";
 						var disposition = xhr.getResponseHeader("Content-Disposition");
-						if (disposition && disposition.indexOf("attachment") !== -1) {
+						if (disposition) {
 							var matches = /filename[^;=\n]*=(([""]).*?\2|[^;\n]*)/.exec(disposition);
 							if (matches != null && matches[1]) {
 								filename = matches[1].replace(/[""]/g, "");