Updated Branches: refs/heads/wicket-1.5.x f2c13e046 -> ed638d451
WICKET-4520 Inline enclosure doesn't work if wicket:message attribute is used on the same tag Always add the auto id for InlineEnclosures Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed638d45 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed638d45 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed638d45 Branch: refs/heads/wicket-1.5.x Commit: ed638d45159aab3c8c365a488aeee135ddcba8a0 Parents: f2c13e0 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Apr 27 18:56:49 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Apr 27 18:56:49 2012 +0300 ---------------------------------------------------------------------- .../parser/filter/InlineEnclosureHandler.java | 6 +----- .../InlineEnclosurePageExpectedResult_1.html | 2 +- ...reWithWicketMessagePage_invisible_expected.html | 2 +- ...sureWithWicketMessagePage_visible_expected.html | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ed638d45/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java index 2ba54bb..e661ea2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java @@ -175,11 +175,7 @@ public final class InlineEnclosureHandler extends AbstractMarkupFilter String inlineEnclosureChildId = getInlineEnclosureAttribute(tag); if (Strings.isEmpty(inlineEnclosureChildId) == false) { - String id = tag.getId(); - if (id.equals(INLINE_ENCLOSURE_ID_PREFIX)) - { - id = id + container.getPage().getAutoIndex(); - } + String id = tag.getId() + container.getPage().getAutoIndex(); // Yes, we handled the tag return new InlineEnclosure(id, inlineEnclosureChildId); } http://git-wip-us.apache.org/repos/asf/wicket/blob/ed638d45/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html index 544d9ac..5b62b10 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html @@ -40,7 +40,7 @@ <div id="InlineEnclosure-6"><span>Test Label 9</span></div> -<div id="customInlineEnclosureId"><span>Test Label 10</span> +<div id="customInlineEnclosureId7"><span>Test Label 10</span> </div> http://git-wip-us.apache.org/repos/asf/wicket/blob/ed638d45/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html index 6252a42..8ea5093 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html @@ -21,6 +21,6 @@ <title>Wicket 4520</title> </head> <body> - <div id="_message_attr_" style="display:none"></div> + <div id="_message_attr_1" style="display:none"></div> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/ed638d45/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html index 62d9d09..d0bc411 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html @@ -21,7 +21,7 @@ <title>Wicket 4520</title> </head> <body> - <div id="_message_attr_" title="Some title"> + <div id="_message_attr_1" title="Some title"> <div>Inner div <span>A Label</span> </div>
