Updated Branches: refs/heads/master 12ee18a97 -> e8e7b9ca4
WICKET-3367 Rewrite all JavaScript inline event handlers to be proper attached event handlers Fix KittenCaptchaPanel by properly setting dynamic parameters for the callback url Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e8e7b9ca Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e8e7b9ca Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e8e7b9ca Branch: refs/heads/master Commit: e8e7b9ca4b289c2e3d1412a458c5e00d08fb13d4 Parents: 12ee18a Author: martin-g <[email protected]> Authored: Mon Jan 2 18:41:54 2012 +0200 Committer: martin-g <[email protected]> Committed: Mon Jan 2 18:41:54 2012 +0200 ---------------------------------------------------------------------- .../captcha/kittens/KittenCaptchaPanel.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e8e7b9ca/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java index facbad6..500aae0 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java @@ -35,6 +35,8 @@ import javax.imageio.stream.MemoryCacheImageInputStream; import org.apache.wicket.IResourceListener; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; +import org.apache.wicket.ajax.attributes.JavaScriptBeforeHandler; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.image.NonCachingImage; @@ -159,18 +161,17 @@ public class KittenCaptchaPanel extends Panel // Image referencing captcha image resource image = new NonCachingImage("image", imageResource = new CaptchaImageResource(animals)); - image.add(new AjaxEventBehavior("onclick") + image.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 7480352029955897654L; @Override - protected CharSequence getCallbackScript() + protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { - // Call-back script shows loading indicator and makes wicket - // ajax request passing in mouse co-ordinates - return generateCallbackScript("showLoadingIndicator(); Wicket.Ajax.get('" + - getCallbackUrl() + - "&x=' + getEventX(this, event) + '&y=' + getEventY(this, event)"); + super.updateAjaxAttributes(attributes); + attributes.getBeforeHandlers().add(new JavaScriptBeforeHandler("showLoadingIndicator();")); + List<CharSequence> dynamicExtraParameters = attributes.getDynamicExtraParameters(); + dynamicExtraParameters.add("return { x: getEventX(this, event), y: getEventY(this, event)}"); } @Override
