You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/03/12 11:05:47 UTC
[4/7] git commit: WICKET-5531 Create new placeholder tag to indicate
where header contributions should appear
WICKET-5531 Create new placeholder tag to indicate where header contributions should appear
Remove a method that is no more needed.
The addition of the closing tag for <wicket:header-items/> is now done in OpenCloseTagExpander
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b77ce257
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b77ce257
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b77ce257
Branch: refs/heads/5531-wicket-header-items
Commit: b77ce25776947005377cb6c9496954dc1b9be7f2
Parents: a3aec20
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 12 11:49:26 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 12 11:49:26 2014 +0200
----------------------------------------------------------------------
.../parser/filter/HtmlHeaderSectionHandler.java | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b77ce257/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
index 0536d95..9de69fe 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
@@ -104,6 +104,7 @@ public final class HtmlHeaderSectionHandler extends AbstractMarkupFilter
{
// revert the settings from above
ComponentTag headOpenTag = tag.getOpenTag();
+ // change the id because it is special. See HtmlHeaderResolver
headOpenTag.setId(HEADER_ID + "-Ignored");
headOpenTag.setAutoComponentTag(false);
headOpenTag.setModified(false);
@@ -166,23 +167,6 @@ public final class HtmlHeaderSectionHandler extends AbstractMarkupFilter
return tag;
}
- // temporary storage. Introduce into flow on next request
- private ComponentTag next = null;
-
- @Override
- public MarkupElement nextElement() throws ParseException
- {
- // Did we hold back an elem? Than return that first
- if (next != null)
- {
- MarkupElement rtn = next;
- next = null;
- return rtn;
- }
-
- return super.nextElement();
- }
-
/**
* Insert <head> open and close tag (with empty body) to the current position.
*/