You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/10/28 09:16:21 UTC
[05/47] git commit: WICKET-5334 KittenCaptcha example is broken in
IE10
WICKET-5334 KittenCaptcha example is broken in IE10
Parse the element coordinates as Int before sending them to the server because StringValue("3.1234").toInt(0) will fail with NumberFormatException and return the default - 0.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/05f15b51
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/05f15b51
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/05f15b51
Branch: refs/heads/wicket-4997
Commit: 05f15b51edc4d3967dd74910a074c4917090ae1b
Parents: 53d3284
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 2 12:06:48 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 2 12:09:12 2013 +0300
----------------------------------------------------------------------
.../wicket/examples/kittenCaptcha/HomePage.html | 1 +
.../captcha/kittens/KittenCaptchaPanel.html | 49 +++++++++++---------
.../captcha/kittens/KittenCaptchaPanel.java | 6 ++-
3 files changed, 32 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/05f15b51/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
index 4d6a592..abacd1b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
<title>Wicket Examples - Kitten-Captch</title>
http://git-wip-us.apache.org/repos/asf/wicket/blob/05f15b51/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.html
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.html b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.html
index e3eb2e8..3bf9184 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.html
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.html
@@ -19,42 +19,47 @@
<wicket:head>
<script type="text/javascript">
function getEventX(element, event) {
+ var result;
if (event.offsetX != null) {
- return event.offsetX;
+ result = event.offsetX;
+ } else {
+ result = event.pageX - element.offsetLeft;
}
- return event.pageX - element.offsetLeft;
+ return parseInt(result, 10);
}
function getEventY(element, event) {
+ var result;
if (event.offsetY != null) {
- return event.offsetY;
+ result = event.offsetY;
+ } else {
+ result = event.pageY - element.offsetTop;
}
- return event.pageY - element.offsetTop;
- }
- function getImage() {
- return Wicket.$("imageContainer").getElementsByTagName("img")[0];
-
- }
- function showLoadingIndicator() {
- Wicket.$('loading').style.visibility="visible";
- }
- function hideLoadingIndicator() {
- Wicket.$('loading').style.visibility="hidden";
+ return parseInt(result, 10);
+ }
+ function getImage() {
+ return Wicket.$("imageContainer").getElementsByTagName("img")[0];
+ }
+ function showLoadingIndicator() {
+ Wicket.$('loading').style.visibility="visible";
+ }
+ function hideLoadingIndicator() {
+ Wicket.$('loading').style.visibility="hidden";
}
</script>
</wicket:head>
<body>
<wicket:panel>
<div wicket:id="animalSelectionLabel"></div>
- <p/>
+ <p/>
<div id="imageContainer">
- <img src="" wicket:id="image"></img>
+ <img wicket:id="image"/>
<p/>
- <div id="loading">
- <wicket:message key="pleaseWait"></wicket:message>
- </div>
- </div>
- <script type="text/javascript">
- Wicket.Event.add(getImage(), "load", function() { hideLoadingIndicator(); } );
+ <div id="loading">
+ <wicket:message key="pleaseWait"></wicket:message>
+ </div>
+ </div>
+ <script type="text/javascript">
+ Wicket.Event.add(getImage(), "load", function() { hideLoadingIndicator(); } );
</script>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/05f15b51/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 67cb4bc..2555647 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
@@ -44,6 +44,7 @@ import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.image.NonCachingImage;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -193,8 +194,9 @@ public class KittenCaptchaPanel extends Panel
{
// Get clicked cursor position
final Request request = RequestCycle.get().getRequest();
- final int x = request.getRequestParameters().getParameterValue("x").toInt(0);
- final int y = request.getRequestParameters().getParameterValue("y").toInt(0);
+ IRequestParameters requestParameters = request.getRequestParameters();
+ final int x = requestParameters.getParameterValue("x").toInt(0);
+ final int y = requestParameters.getParameterValue("y").toInt(0);
// Force refresh
imageResource.clearData();