svn commit: r990024 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java

[ivaynberg]

Author: ivaynberg
Date: Fri Aug 27 05:38:12 2010
New Revision: 990024

URL: http://svn.apache.org/viewvc?rev=990024&view=rev
Log:

Issue: WICKET-1928

Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=990024&r1=990023&r2=990024&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
 Fri Aug 27 05:38:12 2010
@@ -167,8 +167,8 @@ public class AjaxEditableMultiLineLabel<
                        protected void onComponentTag(ComponentTag tag)
                        {
                                super.onComponentTag(tag);
-                               final String saveCall = "{wicketAjaxPost('" + 
getCallbackUrl() +
-                                       "&save=true', " + 
"wicketSerialize(this)); return true;}";
+                               final String saveCall = "{wicketAjaxPost('" + 
getCallbackUrl() + "&save=true', " +
+                                       "wicketSerialize(this)); return true;}";
 
                                final String cancelCall = "{wicketAjaxGet('" + 
getCallbackUrl() +
                                        "&save=false');this.onblur='';return 
false;}";
@@ -177,7 +177,8 @@ public class AjaxEditableMultiLineLabel<
                                        "; ";
 
                                tag.put("onblur", saveCall);
-                               tag.put("onkeypress", keypress);
+                               tag.put("onkeypress", "if 
(Wicket.Browser.isSafari()) { return; }; " + keypress);
+                               tag.put("onkeydown", "if 
(!Wicket.Browser.isSafari()) { return; }; " + keypress);
                        }
                });
                return editor;