Repository: wicket Updated Branches: refs/heads/wicket-6.x 45e0c9cdd -> ee3417134
WICKET-5857 PagingNavigator invalid HTML (rel attribute on span tag) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ee341713 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ee341713 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ee341713 Branch: refs/heads/wicket-6.x Commit: ee3417134ecdab1c17bfd67f6b9b11da35587d34 Parents: 45e0c9c Author: Andrea Del Bene <[email protected]> Authored: Mon Mar 16 22:43:59 2015 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Mon Mar 16 22:56:31 2015 +0100 ---------------------------------------------------------------------- .../paging/PagingNavigationIncrementLink.java | 19 +++++++++++++++++++ .../PagedTableNavigatorExpectedResult_1.html | 2 +- .../PagedTableNavigatorExpectedResult_3.html | 2 +- .../PagedTableNavigatorExpectedResult_4.html | 2 +- .../PagedTableNavigatorExpectedResult_5.html | 2 +- .../PagedTableNavigatorExpectedResult_8.html | 2 +- ...vigatorWithLabelProviderExpectedResult_1.html | 2 +- ...vigatorWithLabelProviderExpectedResult_3.html | 2 +- ...vigatorWithLabelProviderExpectedResult_4.html | 2 +- ...vigatorWithLabelProviderExpectedResult_5.html | 2 +- ...TableNavigatorWithMarginExpectedResult_1.html | 2 +- ...TableNavigatorWithMarginExpectedResult_3.html | 2 +- ...TableNavigatorWithMarginExpectedResult_4.html | 2 +- ...TableNavigatorWithMarginExpectedResult_5.html | 2 +- 14 files changed, 32 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java index 78cf7be..3a72dc8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java @@ -17,6 +17,7 @@ package org.apache.wicket.markup.html.navigation.paging; import org.apache.wicket.Page; +import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.link.Link; /** @@ -125,4 +126,22 @@ public class PagingNavigationIncrementLink<T> extends Link<T> pageable.getCurrentPage(); return ((increment < 0) && isFirst()) || ((increment > 0) && isLast()); } + + @Override + protected void onComponentTag(ComponentTag tag) + { + super.onComponentTag(tag); + + if (!isEnabledInHierarchy()) + { + // if the tag is an anchor proper + String tagName = tag.getName(); + + if (!(tagName.equalsIgnoreCase("a") || tagName.equalsIgnoreCase("link") || + tagName.equalsIgnoreCase("area"))) + { + tag.remove("rel"); + } + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html index 83369e6..e80428e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> </span><span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html index dbef282..d62d41a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> </span><span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html index f49dd3e..2fd3fac 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html @@ -29,7 +29,7 @@ </span><span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span> </span> - <span wicket:id="next" rel="next" class="next" title="Go to next page"><em>></em></span> + <span wicket:id="next" class="next" title="Go to next page"><em>></em></span> <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span> </wicket:panel></span> </body> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html index b7689bf..708bc03 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> </span><span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html index 04adea8..99d6a57 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> </span><span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html index 6a6330c..05fcb0c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span> </span><span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html index 0863d9e..5745407 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span> </span><span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html index 6833ea3..1285b77 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html @@ -35,7 +35,7 @@ </span><span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">13-14</span></em></span> </span> - <span wicket:id="next" rel="next" class="next" title="Go to next page"><em>></em></span> + <span wicket:id="next" class="next" title="Go to next page"><em>></em></span> <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span> </wicket:panel></span> </body> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html index 85d8d6d..9fcacbe 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span> </span><span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html index 1a9fccc..9332c3b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> </span>, <span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html index 5104728..f93aeb2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> </span>, <span wicket:id="navigation" class="goto"> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html index fdfa7c9..1425328 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html @@ -31,7 +31,7 @@ </span>, <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">7</span></em></span> </span> - <span wicket:id="next" rel="next" class="next" title="Go to next page"><em>></em></span> + <span wicket:id="next" class="next" title="Go to next page"><em>></em></span> <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span> </wicket:panel></span> </body> http://git-wip-us.apache.org/repos/asf/wicket/blob/ee341713/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html index d5ccd6d..4ba4578 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html @@ -19,7 +19,7 @@ <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul> <span wicket:id="navigator"><wicket:panel> <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" rel="prev" class="prev" title="Go to previous page"><em><</em></span> + <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> <span wicket:id="navigation" class="goto"> <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> </span>, <span wicket:id="navigation" class="goto">
