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 2012/03/02 10:44:14 UTC
[1/2] git commit: Simplify the code by re-using #getCallbackScript()
method.
Updated Branches:
refs/heads/master b62541426 -> a0185f231
Simplify the code by re-using #getCallbackScript() method.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a0185f23
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a0185f23
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a0185f23
Branch: refs/heads/master
Commit: a0185f23124d58227f43357249a5ef07f84ecaca
Parents: a36ae79
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 2 11:43:54 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 2 11:43:54 2012 +0200
----------------------------------------------------------------------
.../wicket/ajax/AbstractAjaxTimerBehavior.java | 4 ++--
.../ajax/markup/html/AjaxEditableLabel.java | 8 ++------
.../ajax/markup/html/AjaxLazyLoadPanel.java | 5 ++---
3 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a0185f23/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
index 27b5f7f..ef127e9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
@@ -101,11 +101,11 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
*/
protected final String getJsTimeoutCall(final Duration updateInterval)
{
- CharSequence ajaxAttributes = renderAjaxAttributes(getComponent());
+ CharSequence js = getCallbackScript();
String timeoutHandle = getTimeoutHandle();
// this might look strange, but it is necessary for IE not to leak :(
- return timeoutHandle+" = setTimeout('Wicket.Ajax.ajax(" + ajaxAttributes + ");', " +
+ return timeoutHandle+" = setTimeout('" + js + "', " +
updateInterval.getMilliseconds() + ")";
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a0185f23/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
index f4430ce..e35bfa5 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
@@ -98,12 +98,8 @@ public class AjaxEditableLabel<T> extends Panel
AjaxRequestTarget target = getRequestCycle().find(AjaxRequestTarget.class);
if (target != null)
{
- AjaxRequestAttributes attributes = getAttributes();
-
- CharSequence attributesJson = renderAjaxAttributes(component, attributes);
- String jsCall = "Wicket.Ajax.ajax(" + attributesJson + ");";
-
- target.appendJavaScript(jsCall);
+ CharSequence callbackScript = getCallbackScript(component);
+ target.appendJavaScript(callbackScript);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a0185f23/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 f2f6b4e..ea96d3f 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
@@ -105,8 +105,7 @@ public abstract class AjaxLazyLoadPanel extends Panel
super.renderHead(component, response);
if (state < 2)
{
- CharSequence attributesJson = renderAjaxAttributes(component);
- String js = "Wicket.Ajax.ajax(" + attributesJson + ")";
+ CharSequence js = getCallbackScript(component);
handleCallbackScript(response, js, component);
}
}
@@ -126,7 +125,7 @@ public abstract class AjaxLazyLoadPanel extends Panel
* @param component
*/
protected void handleCallbackScript(final IHeaderResponse response,
- final String callbackScript, final Component component)
+ final CharSequence callbackScript, final Component component)
{
response.render(JavaScriptHeaderItem.forScript(callbackScript, "lazy-load-" + component.getMarkupId()));
}