Author: pyaschenko
Date: 2011-01-28 08:32:20 -0500 (Fri, 28 Jan 2011)
New Revision: 21303
Modified:
trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
trunk/ui/input/ui/src/main/templates/autocomplete.template.xml
Log:
http://jira.jboss.com/jira/browse/RF-9649
Modified: trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml
===================================================================
--- trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml 2011-01-28
13:09:56 UTC (rev 21302)
+++ trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml 2011-01-28
13:32:20 UTC (rev 21303)
@@ -138,6 +138,38 @@
<input:autocomplete mode="cachedAjax"
autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country"
fetchValue="#{country.name}">
#{country.name} #{country.iso} #{country.domain}
</input:autocomplete>
+ <input:select id="select" enableManualInput="true"
defaultLabel="Select Value ...">
+ <f:selectItem itemLabel="Label#1" itemValue="Value#1"/>
+ <f:selectItem itemLabel="Label#2" itemValue="Value#2"/>
+ <f:selectItem itemLabel="Label#3" itemValue="Value#3"/>
+ <f:selectItem itemLabel="Label#4" itemValue="Value#4"/>
+ <f:selectItem itemLabel="Label#5" itemValue="Value#5"/>
+ <f:selectItem itemLabel="Label#6" itemValue="Value#6"/>
+ <f:selectItem itemLabel="Label#7" itemValue="Value#7"/>
+ <f:selectItem itemLabel="Label#8" itemValue="Value#8"/>
+ <f:selectItem itemLabel="Label#9" itemValue="Value#9"/>
+ <f:selectItem itemLabel="Label#10" itemValue="Value#10"/>
+ <f:selectItem itemLabel="Label#11" itemValue="Value#11"/>
+ <f:selectItem itemLabel="Label#12" itemValue="Value#12"/>
+ <f:selectItem itemLabel="Label#13" itemValue="Value#13"/>
+ <f:selectItem itemLabel="Label#14" itemValue="Value#14"/>
+ </input:select>
+ <input:inplaceSelect defaultLabel="Edit Text"
openOnEdit="true" saveOnSelect="false">
+ <f:selectItem itemLabel="Label#1" itemValue="Value#1"/>
+ <f:selectItem itemLabel="Label#2" itemValue="Value#2"/>
+ <f:selectItem itemLabel="Label#3" itemValue="Value#3"/>
+ <f:selectItem itemLabel="Label#4" itemValue="Value#4"/>
+ <f:selectItem itemLabel="Label#5" itemValue="Value#5"/>
+ <f:selectItem itemLabel="Label#6" itemValue="Value#6"/>
+ <f:selectItem itemLabel="Label#7" itemValue="Value#7"/>
+ <f:selectItem itemLabel="Label#8" itemValue="Value#8"/>
+ <f:selectItem itemLabel="Label#9" itemValue="Value#9"/>
+ <f:selectItem itemLabel="Label#10" itemValue="Value#10"/>
+ <f:selectItem itemLabel="Label#11" itemValue="Value#11"/>
+ <f:selectItem itemLabel="Label#12" itemValue="Value#12"/>
+ <f:selectItem itemLabel="Label#13" itemValue="Value#13"/>
+ <f:selectItem itemLabel="Label#14" itemValue="Value#14"/>
+ </input:inplaceSelect>
</h:form>
</output:popupPanel>
</ui:define>
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-01-28
13:09:56 UTC (rev 21302)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-01-28
13:32:20 UTC (rev 21303)
@@ -61,6 +61,7 @@
.rf-au-lst-cord{
position: absolute;
+ z-index: 10000;
/* TODO nick - review: font-size: 0px; */
display: none;
}
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2011-01-28
13:09:56 UTC (rev 21302)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2011-01-28
13:32:20 UTC (rev 21303)
@@ -201,13 +201,17 @@
var selectItem = function(event, index, isOffset) {
if (this.items.length==0 || (!isOffset && index == this.index)) return;
- if (index == null) {
+ if (index == null || index == undefined) {
clearSelection.call(this);
return;
}
if (isOffset) {
- index = this.index + index;
+ if (this.index==null) {
+ index = 0;
+ } else {
+ index = this.index + index;
+ }
}
if (index<0) {
index = 0;
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-01-28
13:09:56 UTC (rev 21302)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-01-28
13:32:20 UTC (rev 21303)
@@ -110,6 +110,7 @@
color: '#{richSkin.generalTextColor}';
font-family: '#{richSkin.generalFamilyFont}';
font-size : '#{richSkin.generalSizeFont}';
+ z-index: 10000;
}
.rf-is-lst-pos {
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-01-28
13:09:56 UTC (rev 21302)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-01-28
13:32:20 UTC (rev 21303)
@@ -71,6 +71,7 @@
.rf-sel-lst-cord{
position: absolute;
+ z-index: 10000;
/* TODO nick - review: font-size: 0px; */
display: none;
}
Modified: trunk/ui/input/ui/src/main/templates/autocomplete.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-01-28 13:09:56 UTC
(rev 21302)
+++ trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-01-28 13:32:20 UTC
(rev 21303)
@@ -27,7 +27,7 @@
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}" 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" autocomplete="off"/>
<c:if
test="#{component.attributes['showButton']}">
<c:if
test="#{component.attributes['disabled']}">
<div id="#{clientId}Button" class="rf-au-btn
rf-au-btn-dis">