Author: abelevich
Date: 2008-08-28 10:49:55 -0400 (Thu, 28 Aug 2008)
New Revision: 10224
Modified:
trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
https://jira.jboss.org/jira/browse/RF-4243
Modified: trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-08-28 14:14:59
UTC (rev 10223)
+++ trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-08-28 14:49:55
UTC (rev 10224)
@@ -60,7 +60,7 @@
<name>defaultLabel</name>
<classname>java.lang.String</classname>
<description>The attribute is used to display text while value is
undefined</description>
- <defaultvalue>"\u00a0\u00a0\u00a0"</defaultvalue>
+ <defaultvalue>""</defaultvalue>
</property>
<property>
<name>showControls</name>
Modified:
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
---
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-08-28
14:14:59 UTC (rev 10223)
+++
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-08-28
14:49:55 UTC (rev 10224)
@@ -158,7 +158,7 @@
String defaultLabel =
(String)component.getAttributes().get("defaultLabel");
- if (defaultLabel == null || defaultLabel.length() == 0) {
+ if (defaultLabel == null || defaultLabel.trim().equals("")) {
defaultLabel = EMPTY_DEFAULT_LABEL;
}
Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-08-28 14:14:59 UTC
(rev 10223)
+++ trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-08-28 14:49:55 UTC
(rev 10224)
@@ -26,17 +26,16 @@
<f:clientid var="clientId" />
<jsp:scriptlet>
<![CDATA[
- Object value = component.getSubmittedValue();
+ String value = (String)component.getSubmittedValue();
if (value == null) {
- value = component.getValue();
- value = getConvertedStringValue(context, component,value);
+ value = getConvertedStringValue(context, component,component.getValue());
}
- Object fieldValue = value;
- if (value == null || value.equals("")) {
+ String fieldValue = value;
+ if (value == null || value.trim().equals("")) {
fieldValue = "";
String defaultValue =
(String)component.getAttributes().get("defaultLabel");
- if(defaultValue == null || defaultValue.equals("")) {
+ if(defaultValue == null || defaultValue.trim().equals("")) {
defaultValue = "\u00a0\u00a0\u00a0";
}
value = defaultValue;