You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/10/01 13:47:11 UTC
git commit: WICKET-4862 AjaxPagingNavigationLink and
AjaxPagingNavigationIncrementLink output inline onclick attributes in
addition to Wicket.Ajax.ajax event registration
Updated Branches:
refs/heads/master 599168c8f -> 25233c4cb
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/25233c4c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/25233c4c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/25233c4c
Branch: refs/heads/master
Commit: 25233c4cb5f77d7f376a4c651172ae69406c97de
Parents: 599168c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Oct 1 13:46:35 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Oct 1 13:47:01 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/25233c4c/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 cf6a47c..a9ea5d2 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;
@@ -123,4 +124,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/25233c4c/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");
+ }
}