Updated Branches: refs/heads/wicket-6.x 76b619d63 -> 721b1d458
WICKET-4862 AjaxPagingNavigationLink and AjaxPagingNavigationIncrementLink output inline onclick attributes in addition to Wicket.Ajax.ajax event registration Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/721b1d45 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/721b1d45 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/721b1d45 Branch: refs/heads/wicket-6.x Commit: 721b1d4581d3fb66ca959f97842ff6efac2c7ff9 Parents: 76b619d Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Oct 1 13:46:35 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Oct 1 13:46:35 2013 +0200 ---------------------------------------------------------------------- .../paging/AjaxPagingNavigationIncrementLink.java | 13 +++++++++++++ .../navigation/paging/AjaxPagingNavigationLink.java | 13 +++++++++++++ 2 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/721b1d45/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 e4bc726..760800c 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 @@ -19,6 +19,7 @@ package org.apache.wicket.ajax.markup.html.navigation.paging; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.IAjaxLink; +import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.navigation.paging.IPageable; import org.apache.wicket.markup.html.navigation.paging.PagingNavigationIncrementLink; @@ -143,4 +144,16 @@ public class AjaxPagingNavigationIncrementLink extends PagingNavigationIncrement // Tell the PageableListView which page to print next pageable.setCurrentPage(getPageNumber()); } + + @Override + protected void onComponentTag(ComponentTag tag) + { + super.onComponentTag(tag); + + // 'onclick' attribute would be set only if this component is attached + // to HTML element different than 'a'. This 'onclick' will break Ajax's + // event binding so here we remove it. + // AjaxFallback is supported only with 'a' HTML element. See WICKET-4862 + tag.remove("onclick"); + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/721b1d45/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 c0fab68..6ae6c53 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 @@ -19,6 +19,7 @@ package org.apache.wicket.ajax.markup.html.navigation.paging; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.IAjaxLink; +import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.navigation.paging.IPageable; import org.apache.wicket.markup.html.navigation.paging.PagingNavigationLink; @@ -106,4 +107,16 @@ public class AjaxPagingNavigationLink extends PagingNavigationLink<Void> impleme { pageable.setCurrentPage(getPageNumber()); } + + @Override + protected void onComponentTag(ComponentTag tag) + { + super.onComponentTag(tag); + + // 'onclick' attribute would be set only if this component is attached + // to HTML element different than 'a'. This 'onclick' will break Ajax's + // event binding so here we remove it. + // AjaxFallback is supported only with 'a' HTML element. See WICKET-4862 + tag.remove("onclick"); + } }
