Updated Branches: refs/heads/master 1c2e55195 -> 4f7d2e474
WICKET-5067 modify tag to TagType.OPEN Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4f7d2e47 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4f7d2e47 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4f7d2e47 Branch: refs/heads/master Commit: 4f7d2e474036aff026fb0c7cc4d7f13265c66626 Parents: 1c2e551 Author: svenmeier <[email protected]> Authored: Thu Feb 28 16:11:49 2013 +0100 Committer: svenmeier <[email protected]> Committed: Thu Feb 28 16:11:49 2013 +0100 ---------------------------------------------------------------------- .../markup/html/form/select/SelectOptions.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/4f7d2e47/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java index 88a96f6..d5c2324 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java @@ -21,6 +21,7 @@ import java.util.Collection; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.parser.XmlTag.TagType; import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.IModel; import org.apache.wicket.model.util.WildcardCollectionModel; @@ -162,5 +163,18 @@ public class SelectOptions<T> extends RepeatingView { replaceComponentTagBody(markupStream, openTag, text); } + + /** + * {@inheritDoc} + */ + @Override + protected void onComponentTag(ComponentTag tag) + { + super.onComponentTag(tag); + + // always transform the tag to <label></label> so even markup defined as <label/> + // render + tag.setType(TagType.OPEN); + } } }
