5:48 p.m.
Author: pyaschenko
Date: 2011-02-24 11:48:28 -0500 (Thu, 24 Feb 2011)
New Revision: 21923
Modified:
branches/4.0.0.CR1/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java
branches/4.0.0.CR1/ui/input/ui/src/main/templates/autocomplete.template.xml
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml
Log:
https://jira.jboss.org/browse/RF-10604
Modified:
branches/4.0.0.CR1/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java
===================================================================
---
branches/4.0.0.CR1/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java 2011-02-24
15:58:17 UTC (rev 21922)
+++
branches/4.0.0.CR1/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java 2011-02-24
16:48:28 UTC (rev 21923)
@@ -85,6 +85,9 @@
@Attribute()
public abstract String getPopupClass();
+
+ @Attribute()
+ public abstract String getInputClass();
@Attribute
public abstract AutocompleteMode getMode();
Modified: branches/4.0.0.CR1/ui/input/ui/src/main/templates/autocomplete.template.xml
===================================================================
--- branches/4.0.0.CR1/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-02-24
15:58:17 UTC (rev 21922)
+++ branches/4.0.0.CR1/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-02-24
16:48:28 UTC (rev 21923)
@@ -17,7 +17,7 @@
<cc:implementation>
<cdk:object type="java.lang.Object" name="disabled"
value="#{component.attributes['disabled']}" />
- <div id="#{clientId}" class="rf-au-fld">
+ <span id="#{clientId}" class="rf-au-fld">
<input id="#{clientId}Value" name="#{clientId}Value"
type="hidden"/>
<span class="#{component.attributes['showButton'] ?
'rf-au-fld-btn' : ''}">
<input onclick="#{component.attributes['onclick']}"
@@ -29,7 +29,12 @@
onmouseout="#{component.attributes['onmouseout']}"
onkeyup="#{component.attributes['onkeyup']}"
onkeydown="#{component.attributes['onkeydown']}"
- onkeypress="#{component.attributes['onkeypress']}"
id="#{clientId}Input" value="#{component.attributes['value']}"
disabled="#{disabled}" name="#{clientId}Input" type="text"
class="rf-au-fnt rf-au-inp" autocomplete="off"/>
+ onkeypress="#{component.attributes['onkeypress']}"
+ id="#{clientId}Input"
value="#{component.attributes['value']}"
+ disabled="#{disabled}" name="#{clientId}Input"
+ type="text"
+ class="rf-au-fnt rf-au-inp #{component.attributes['inputClass']}"
+ autocomplete="off"/>
<c:if
test="#{component.attributes['showButton']}">
<span id="#{clientId}Button"
class="rf-au-btn">
<span
class="rf-au-btn-arrow#{component.attributes['disabled'] ? '-dis' :
''}"></span>
@@ -82,7 +87,7 @@
);
</script>
</c:if>
- </div>
+ </span>
</cc:implementation>
</cdk:root>
Modified:
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml
===================================================================
---
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml 2011-02-24
15:58:17 UTC (rev 21922)
+++
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml 2011-02-24
16:48:28 UTC (rev 21923)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <div class="rf-au-fld" id="form:myAutocomplete">
+ <span class="rf-au-fld" id="form:myAutocomplete">
<input id="form:myAutocompleteValue"
name="form:myAutocompleteValue" type="hidden"/>
<span class="rf-au-fld-btn">
<input autocomplete="off" class="rf-au-fnt rf-au-inp"
id="form:myAutocompleteInput" name="form:myAutocomplete"
type="text"/>
@@ -188,4 +188,4 @@
);
//]]>
</script>
- </div>
+ </span>
Modified:
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml
===================================================================
---
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml 2011-02-24
15:58:17 UTC (rev 21922)
+++
branches/4.0.0.CR1/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml 2011-02-24
16:48:28 UTC (rev 21923)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<div class="rf-au-fld" id="form:myAutocomplete">
+<span class="rf-au-fld" id="form:myAutocomplete">
<input id="form:myAutocompleteValue"
name="form:myAutocompleteValue" type="hidden"/>
<span class="rf-au-fld-btn">
<input autocomplete="off" class="rf-au-fnt rf-au-inp"
id="form:myAutocompleteInput" name="form:myAutocomplete"
type="text"/>
@@ -188,4 +188,4 @@
);
//]]>
</script>
-</div>
\ No newline at end of file
+</span>
\ No newline at end of file