Updated Branches: refs/heads/master 141fb6f25 -> 803064915
WICKET-4661 done() not called for named channel Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/80306491 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/80306491 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/80306491 Branch: refs/heads/master Commit: 803064915735867bd7c5cd21d7b919a926ee00cd Parents: 141fb6f Author: svenmeier <[email protected]> Authored: Fri Jul 20 08:21:53 2012 +0200 Committer: svenmeier <[email protected]> Committed: Fri Jul 20 08:21:53 2012 +0200 ---------------------------------------------------------------------- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 3 ++ .../wicket/examples/ajax/builtin/EffectsPage.java | 18 +++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/80306491/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js index 56e950e..3ea6e53 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js @@ -425,6 +425,9 @@ */ doAjax: function (attrs) { + // keep channel for done() + this.channel = attrs.ch; + var // the headers to use for each Ajax request headers = { http://git-wip-us.apache.org/repos/asf/wicket/blob/80306491/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java index 6330c42..c926347 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java @@ -16,7 +16,10 @@ */ package org.apache.wicket.examples.ajax.builtin; +import org.apache.wicket.ajax.AjaxChannel; +import org.apache.wicket.ajax.AjaxChannel.Type; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.head.IHeaderResponse; @@ -88,6 +91,14 @@ public class EffectsPage extends BasePage target.add(c1); target.appendJavaScript("new Effect.Shake($('" + c1.getMarkupId() + "'));"); } + + @Override + protected void updateAjaxAttributes(AjaxRequestAttributes attributes) + { + attributes.setChannel(new AjaxChannel("effects", Type.DROP)); + + super.updateAjaxAttributes(attributes); + } }); add(new AjaxFallbackLink<Void>("c2-link") @@ -103,6 +114,13 @@ public class EffectsPage extends BasePage } } + @Override + protected void updateAjaxAttributes(AjaxRequestAttributes attributes) + { + attributes.setChannel(new AjaxChannel("effects", Type.DROP)); + + super.updateAjaxAttributes(attributes); + } }); }
