You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2008/04/09 13:43:00 UTC
svn commit: r646282 -
/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
Author: gseitz
Date: Wed Apr 9 04:43:00 2008
New Revision: 646282
URL: http://svn.apache.org/viewvc?rev=646282&view=rev
Log:
WICKET-1499: race-condition in AjaxEditableMultiLineLabel
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=646282&r1=646281&r2=646282&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Wed Apr 9 04:43:00 2008
@@ -83,7 +83,8 @@
@Override
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- if (getModelObject() == null)
+ Object modelObject = getModelObject();
+ if (modelObject == null || "".equals(modelObject))
{
replaceComponentTagBody(markupStream, openTag, defaultNullLabel());
}
@@ -170,7 +171,7 @@
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
final String cancelCall = "{wicketAjaxGet('" + getCallbackUrl() +
- "&save=false'); return false;}";
+ "&save=false');this.onblur='';return false;}";
final String keypress = "var kc=wicketKeyCode(event); if (kc==27) " + cancelCall +
"; ";