Updated Branches: refs/heads/master 4a02776fe -> 62a1a94f8
tweak for WICKET-5411 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/62a1a94f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/62a1a94f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/62a1a94f Branch: refs/heads/master Commit: 62a1a94f854eb2e2ecba06092b77ee2668529ff3 Parents: 4a02776 Author: Igor Vaynberg <[email protected]> Authored: Tue Nov 26 08:03:31 2013 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Tue Nov 26 08:04:00 2013 -0800 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/form/AutoLabelResolver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/62a1a94f/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java index 481d025..eb31871 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java @@ -292,6 +292,9 @@ public class AutoLabelResolver implements IComponentResolver { super(id); component = fc; + + setMarkupId(getLabelIdFor(component)); + setOutputMarkupId(true); } @Override @@ -299,7 +302,6 @@ public class AutoLabelResolver implements IComponentResolver { super.onComponentTag(tag); tag.put("for", component.getMarkupId()); - tag.put("id", getLabelIdFor(component)); if (component instanceof FormComponent) {
