Author: knopp
Date: Wed Jul 2 16:22:06 2008
New Revision: 673542
URL: http://svn.apache.org/viewvc?rev=673542&view=rev
Log:
tree fixes
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/res/tree.js
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=673542&r1=673541&r2=673542&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Wed Jul 2 16:22:06 2008
@@ -35,6 +35,7 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
@@ -190,8 +191,10 @@
{
// yes, write empty div with id
// this is necessary for createElement js to
work correctly
+ String tagName =
((ComponentTag)markupStream.get()).getName();
getResponse().write(
- "<div style=\"display:none\" id=\"" +
getMarkupId() + "\"></div>");
+ "<" + tagName + "
style=\"display:none\" id=\"" + getMarkupId() + "\"></" +
+ tagName + ">");
markupStream.skipComponent();
}
else
@@ -1229,6 +1232,26 @@
{
invalidateNode(node, false);
}
+
+ /**
+ * INTERNAL
+ *
+ * @param node
+ */
+ public final void markNodeChildrenDirty(TreeNode node)
+ {
+ TreeItem item = (TreeItem)nodeToItemMap.get(node);
+ if (item != null)
+ {
+ visitItemChildren(item, new IItemCallback()
+ {
+ public void visitItem(TreeItem item)
+ {
+
invalidateNode((TreeNode)item.getModelObject(), false);
+ }
+ });
+ }
+ }
/**
* Invalidates single node (without children). On the next render, this
node will be updated.
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/res/tree.js
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/res/tree.js?rev=673542&r1=673541&r2=673542&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/res/tree.js
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/res/tree.js
Wed Jul 2 16:22:06 2008
@@ -51,7 +51,7 @@
}
var after = document.getElementById(afterId);
- var newNode = document.createElement("script");
+ var newNode = document.createElement(after.tagName);
newNode.setAttribute("id", elementId);
var p = after.parentNode;