Repository: wicket Updated Branches: refs/heads/wicket-7.x a23295bd9 -> 1fd0ba920
WICKET-6079 Problem with queued components and label Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1fd0ba92 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1fd0ba92 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1fd0ba92 Branch: refs/heads/wicket-7.x Commit: 1fd0ba920d0356a947bcda3266862d69e20754b5 Parents: a23295b Author: Andrea Del Bene <[email protected]> Authored: Tue Jan 19 13:32:08 2016 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Tue Jan 19 13:32:08 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/MarkupContainer.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1fd0ba92/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java index 69a9f1f..9a9fd4f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -38,6 +38,7 @@ import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.MarkupType; import org.apache.wicket.markup.WicketTag; import org.apache.wicket.markup.html.border.Border; +import org.apache.wicket.markup.html.form.AutoLabelResolver; import org.apache.wicket.markup.resolver.ComponentResolvers; import org.apache.wicket.model.IComponentInheritedModel; import org.apache.wicket.model.IModel; @@ -2265,6 +2266,14 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp return null; // don't know } } + + //if is a label tag, ignore it + if (tag.isAutoComponentTag() + && tag.getId().startsWith(AutoLabelResolver.LABEL_ATTR)) + { + return DequeueTagAction.IGNORE; + } + return DequeueTagAction.DEQUEUE; }
