Repository: wicket Updated Branches: refs/heads/master 93d18f886 -> fc753218e
WICKET-5676 Double click causes internal error using AjaxFallbackDefaultDataTable (cherry picked from commit 64c8567fe1b97d19eac8222172e1bb2ccc4228de) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fc753218 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fc753218 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fc753218 Branch: refs/heads/master Commit: fc753218ebd5eaa1bec78195b9ed7f39a4ceb0c1 Parents: 93d18f8 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Aug 18 10:06:10 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Aug 18 10:07:19 2014 +0200 ---------------------------------------------------------------------- .../navigation/paging/AjaxPagingNavigationIncrementLink.java | 4 ++++ .../markup/html/navigation/paging/AjaxPagingNavigationLink.java | 4 ++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fc753218/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java index a9ea5d2..b03099d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.ajax.markup.html.navigation.paging; +import org.apache.wicket.ajax.AjaxChannel; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.IAjaxLink; @@ -50,6 +51,8 @@ public class AjaxPagingNavigationIncrementLink extends PagingNavigationIncrement { private static final long serialVersionUID = 1L; + public static final String PAGING_CHANNEL_NAME = "ajax-paging"; + /** * Constructor. * @@ -91,6 +94,7 @@ public class AjaxPagingNavigationIncrementLink extends PagingNavigationIncrement protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); + attributes.setChannel(new AjaxChannel(PAGING_CHANNEL_NAME, AjaxChannel.Type.ACTIVE)); AjaxPagingNavigationIncrementLink.this.updateAjaxAttributes(attributes); } }; http://git-wip-us.apache.org/repos/asf/wicket/blob/fc753218/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java index 6ae6c53..c8bcb47 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.ajax.markup.html.navigation.paging; +import static org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationIncrementLink.PAGING_CHANNEL_NAME; + +import org.apache.wicket.ajax.AjaxChannel; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.IAjaxLink; @@ -75,6 +78,7 @@ public class AjaxPagingNavigationLink extends PagingNavigationLink<Void> impleme protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); + attributes.setChannel(new AjaxChannel(PAGING_CHANNEL_NAME, AjaxChannel.Type.ACTIVE)); AjaxPagingNavigationLink.this.updateAjaxAttributes(attributes); } };
