Updated Branches: refs/heads/master 841452ffa -> 64962c719
WICKET-4504 AjaxLazyLoadPanel not replaced within AjaxTabbedPanel Further simplify the header contribution - just use onDomReady (as in Wicket 1.5.x) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/64962c71 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/64962c71 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/64962c71 Branch: refs/heads/master Commit: 64962c71972d3a8b731263009085f94599ab3a4d Parents: 841452f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Apr 23 11:09:16 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Apr 23 11:09:16 2012 +0300 ---------------------------------------------------------------------- .../ajax/markup/html/AjaxLazyLoadPanel.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/64962c71/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java index 502baeb..a9f39ac 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java @@ -22,6 +22,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; @@ -86,7 +87,7 @@ public abstract class AjaxLazyLoadPanel extends Panel { Component component = getLazyLoadComponent(LAZY_LOAD_COMPONENT_ID); AjaxLazyLoadPanel.this.replace(component); - setState((byte)2); + setState((byte) 2); } target.add(AjaxLazyLoadPanel.this); @@ -120,14 +121,16 @@ public abstract class AjaxLazyLoadPanel extends Panel * Allows subclasses to change the callback script if needed. * * @param response + * the current response that writes to the header * @param callbackScript + * the JavaScript to write in the header * @param component + * the component which produced the callback script */ protected void handleCallbackScript(final IHeaderResponse response, final CharSequence callbackScript, final Component component) { - response.render(JavaScriptHeaderItem.forScript(callbackScript, - String.format("lazy-load-%s-%d", component.getMarkupId(), component.getPage().getAutoIndex()))); + response.render(OnDomReadyHeaderItem.forScript(callbackScript)); } /**
