WICKET-6286 renamed url settings; explained cookie path
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0957a2b0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0957a2b0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0957a2b0 Branch: refs/heads/master Commit: 0957a2b0ec02b09312bfb9f8d5e8aaf9458edb6d Parents: 5578e69 Author: Sven Meier <svenme...@apache.org> Authored: Thu Jan 5 09:12:20 2017 +0100 Committer: Sven Meier <svenme...@apache.org> Committed: Tue Mar 21 23:23:16 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/extensions/ajax/AjaxDownload.java | 7 ++++++- .../org/apache/wicket/extensions/ajax/wicket-ajaxdownload.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0957a2b0/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 a879d5b..11c97d4 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 @@ -193,7 +193,7 @@ public class AjaxDownload extends AbstractDefaultAjaxBehavior JSONObject settings = new JSONObject(); settings.put("attributes", new JsonFunction(renderAjaxAttributes(getComponent()))); settings.put("name", getName()); - settings.put("url", url); + settings.put("downloadUrl", url); target.appendJavaScript(String.format("Wicket.AjaxDownload.initiate(%s);", settings)); @@ -289,7 +289,12 @@ public class AjaxDownload extends AbstractDefaultAjaxBehavior private static Cookie cookie(String name) { Cookie cookie = new Cookie(name, "complete"); + + // has to be on root, otherwise JavaScript will not be able to access the + // cookie when it is set from a different path - which is the case when a + // ResourceReference is used cookie.setPath("/"); + return cookie; } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0957a2b0/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 52471df..a383fa8 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 @@ -28,7 +28,7 @@ Wicket.AjaxDownload = { initiate : function(settings) { - var frame = jQuery("<iframe>").hide().prop("src", settings.url).appendTo("body"); + var frame = jQuery("<iframe>").hide().prop("src", settings.downloadUrl).appendTo("body"); var checkComplete = function() { var result;
