Author: mgrigorov
Date: Fri Feb 11 16:27:22 2011
New Revision: 1069860
URL: http://svn.apache.org/viewvc?rev=1069860&view=rev
Log:
WICKET-3323 TreeTable should call attachUpdate javascript on domready event.
Render 'Wicket.TreeTable.attachUpdate()' when DOM is ready, because otherwise
wicket-ajax.js could not be available yet
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.html
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.html
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.html?rev=1069860&r1=1069859&r2=1069860&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.html
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.html
Fri Feb 11 16:27:22 2011
@@ -45,10 +45,6 @@
</div>
-<script type="text/javascript" wicket:id="attachJavascript">
- /* Will be replaced on runtime;
Wicket.TreeTable.attachUpdate("treeTable"); */
-</script>
-
</wicket:panel>
<wicket:fragment wicket:id="fragment">
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=1069860&r1=1069859&r2=1069860&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
Fri Feb 11 16:27:22 2011
@@ -27,13 +27,13 @@ import org.apache.wicket.behavior.Abstra
import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree;
import
org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.tree.AbstractTree;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
/**
@@ -422,15 +422,16 @@ public class TreeTable extends DefaultAb
// scroll together with body. The body contains vertical
scrollbar. The
// header width must be same as body content width, so that the
columns
// are properly aligned.
- add(new Label("attachJavascript", new Model<String>()
+ add(new AbstractBehavior()
{
private static final long serialVersionUID = 1L;
@Override
- public String getObject()
+ public void renderHead(final IHeaderResponse response)
{
- return "Wicket.TreeTable.attachUpdate(\"" +
getMarkupId() + "\");";
+
response.renderOnDomReadyJavascript("Wicket.TreeTable.attachUpdate(\"" +
+ getMarkupId() + "\");");
}
- }).setEscapeModelStrings(false));
+ });
}
}
\ No newline at end of file
