Author: mgrigorov
Date: Tue Jul 5 19:44:35 2011
New Revision: 1143187
URL: http://svn.apache.org/viewvc?rev=1143187&view=rev
Log:
WICKET-3868 Feedback message should be handled the same way everywhere.
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1143187&r1=1143186&r2=1143187&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
Tue Jul 5 19:44:35 2011
@@ -452,10 +452,10 @@ public class AjaxEditableLabel<T> extend
protected void onError(AjaxRequestTarget target)
{
Serializable errorMessage =
editor.getFeedbackMessage().getMessage();
- if (errorMessage instanceof String)
+ if (errorMessage != null)
{
target.appendJavascript("window.status='" +
-
JavascriptUtils.escapeQuotes((String)errorMessage) + "';");
+
JavascriptUtils.escapeQuotes(errorMessage.toString()) + "';");
}
target.appendJavascript("{var el=wicketGet('" +
editor.getMarkupId() +
"'); el.select(); el.focus();}");