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 11:27:32 UTC
git commit: WICKET-4436 Pressing ESCAPE doesn't work for AjaxEditable
components
Updated Branches:
refs/heads/wicket-1.5.x a0e4e9795 -> a3061be24
WICKET-4436 Pressing ESCAPE doesn't work for AjaxEditable components
Fix the support for Escape key. Modern Safari support 'onkeydown' as good as any other browser.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a3061be2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a3061be2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a3061be2
Branch: refs/heads/wicket-1.5.x
Commit: a3061be24c5b757ef7bf21c98936e73400419220
Parents: a0e4e97
Author: martin-g <mg...@apache.org>
Authored: Fri Mar 2 12:27:18 2012 +0200
Committer: martin-g <mg...@apache.org>
Committed: Fri Mar 2 12:27:18 2012 +0200
----------------------------------------------------------------------
.../ajax/markup/html/AjaxEditableLabel.java | 3 +--
.../markup/html/AjaxEditableMultiLineLabel.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3061be2/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 d647c28..d1be6dd 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
@@ -115,8 +115,7 @@ public class AjaxEditableLabel<T> extends Panel
" else if (kc!=13) { return true; } else " + saveCall;
tag.put("onblur", saveCall);
- tag.put("onkeypress", "if (Wicket.Browser.isSafari()) { return; }; " + keypress);
- tag.put("onkeydown", "if (!Wicket.Browser.isSafari()) { return; }; " + keypress);
+ tag.put("onkeydown", keypress);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3061be2/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
index 4e285f6..deaee5b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
@@ -187,8 +187,7 @@ public class AjaxEditableMultiLineLabel<T> extends AjaxEditableLabel<T>
"; ";
tag.put("onblur", saveCall);
- tag.put("onkeypress", "if (Wicket.Browser.isSafari()) { return; }; " + keypress);
- tag.put("onkeydown", "if (!Wicket.Browser.isSafari()) { return; }; " + keypress);
+ tag.put("onkeydown", keypress);
}
});
return editor;