Updated Branches: refs/heads/wicket-6.x 4a5d1220e -> 8808dd8f2
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/8808dd8f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8808dd8f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8808dd8f Branch: refs/heads/wicket-6.x Commit: 8808dd8f20bfed844ba9ea8c6ab57f24cd2c53c9 Parents: 4a5d122 Author: Igor Vaynberg <[email protected]> Authored: Tue Nov 26 08:03:31 2013 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Tue Nov 26 08:03:39 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/8808dd8f/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 bab2b9e..ecbe9c2 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) {
