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:36:25 UTC
svn commit: r646279 -
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
Author: gseitz
Date: Wed Apr 9 04:36:23 2008
New Revision: 646279
URL: http://svn.apache.org/viewvc?rev=646279&view=rev
Log:
WICKET-1499
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=646279&r1=646278&r2=646279&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Wed Apr 9 04:36:23 2008
@@ -79,7 +79,8 @@
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- if (getModelObject() == null)
+ Object modelObject = getModelObject();
+ if (modelObject == null || "".equals(modelObject))
{
replaceComponentTagBody(markupStream, openTag, defaultNullLabel());
}
@@ -159,7 +160,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 +
"; ";