Updated Branches: refs/heads/master 8dd0dce11 -> 0ee7fab9b
WICKET-3367 Rewrite all JavaScript inline event handlers to be proper attached event handlers Add automatic migration of success and failure scripts Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0ee7fab9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0ee7fab9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0ee7fab9 Branch: refs/heads/master Commit: 0ee7fab9bc30554d8b3d8e77077bd20721caca79 Parents: 8dd0dce Author: martin-g <[email protected]> Authored: Thu Jan 5 18:40:40 2012 +0200 Committer: martin-g <[email protected]> Committed: Thu Jan 5 18:40:40 2012 +0200 ---------------------------------------------------------------------- .../wicket/ajax/AbstractDefaultAjaxBehavior.java | 24 +++++++++++++- 1 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0ee7fab9/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java index aa2381e..225b7e5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java @@ -18,6 +18,7 @@ package org.apache.wicket.ajax; import org.apache.wicket.Component; import org.apache.wicket.Page; +import org.apache.wicket.ajax.attributes.AjaxCallListener; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method; import org.apache.wicket.ajax.attributes.IAjaxCallListener; @@ -144,12 +145,27 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior private void updateAjaxAttributesBackwardCompatibility(AjaxRequestAttributes attributes) { CharSequence preconditionScript = getPreconditionScript(); - if (preconditionScript != null) + if (Strings.isEmpty(preconditionScript) == false) { JavaScriptPrecondition precondition = new JavaScriptPrecondition(preconditionScript); attributes.getPreconditions().add(precondition); } + AjaxCallListener backwardCompatibleAjaxCallListener = new AjaxCallListener() { + @Override + public CharSequence getSuccessHandler(Component component) + { + return AbstractDefaultAjaxBehavior.this.getSuccessScript(); + } + + @Override + public CharSequence getFailureHandler(Component component) + { + return AbstractDefaultAjaxBehavior.this.getFailureScript(); + } + }; + attributes.getAjaxCallListeners().add(backwardCompatibleAjaxCallListener); + AjaxChannel channel = getChannel(); if (channel != null) { @@ -270,7 +286,11 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior for (JavaScriptPrecondition pre : attributes.getPreconditions()) { - attributesJson.append("pre", pre); + String precondition = pre.toString(); + if (Strings.isEmpty(precondition) == false) + { + attributesJson.append("pre", precondition); + } } JSONObject extraParameters = new JSONObject();
