Author: abelevich Date: 2010-12-23 09:18:13 -0500 (Thu, 23 Dec 2010) New Revision: 20770 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java trunk/ui/input/ui/src/main/templates/select.template.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml Log: fix inplaceSelectTests, RF-9735, RF-9737 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2010-12-23 14:09:07 UTC (rev 20769) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2010-12-23 14:18:13 UTC (rev 20770) @@ -32,5 +32,14 @@ @Attribute(defaultValue="true") public abstract boolean isShowButton(); + + @Attribute(defaultValue="20px") + public abstract String getMinListHeight(); + + @Attribute(defaultValue="100px") + public abstract String getMaxListHeight(); + @Attribute(defaultValue="auto") + public abstract String getListHeight(); + } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java 2010-12-23 14:09:07 UTC (rev 20769) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java 2010-12-23 14:18:13 UTC (rev 20770) @@ -34,7 +34,7 @@ public abstract class AbstractSelectComponent extends UISelectOne { - @Attribute(defaultValue="250px") + @Attribute(defaultValue="200px") public abstract String getListWidth(); @Attribute(defaultValue="100px") Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java 2010-12-23 14:09:07 UTC (rev 20769) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java 2010-12-23 14:18:13 UTC (rev 20770) @@ -30,6 +30,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.richfaces.component.AbstractSelect; import org.richfaces.component.AbstractSelectComponent; /** @@ -62,6 +63,40 @@ return SelectHelper.getSelectInputLabel(facesContext, component); } + public String getListWidth(UIComponent component) { + AbstractSelect select = (AbstractSelect)component; + String width = select.getListWidth(); + return (width != null && width.trim().length() != 0) ? ("width: " + width) : ""; + } + + public String encodeHeightAndWidth(UIComponent component) { + AbstractSelect select = (AbstractSelect)component; + + String height = select.getListHeight(); + if(!"auto".equals(height)) { + height = (height != null && height.trim().length() != 0) ? ("height: " + height) : ""; + } else { + String minHeight = select.getMinListHeight(); + minHeight = (minHeight != null && minHeight.trim().length() != 0) ? ("min-height: " + minHeight) : ""; + + String maxHeight = select.getMaxListHeight(); + maxHeight = (maxHeight != null && maxHeight.trim().length() != 0) ? ("max-height: " + maxHeight) : ""; + height = concatStyles(minHeight, maxHeight); + } + + String width = select.getListWidth(); + width = (width != null && width.trim().length() != 0) ? ("width: " + width) : ""; + + return concatStyles(height, width); + } + + public String getListCss(UIComponent component) { + AbstractSelect inplaceSelect = (AbstractSelect)component; + String css = inplaceSelect.getListClass(); + css = (css != null) ? concatClasses("rf-sel-lst-cord", css) : "rf-sel-lst-cord"; + return css; + } + public String getSelectLabel(FacesContext facesContext, UIComponent component) { AbstractSelectComponent select = (AbstractSelectComponent) component; String label = getSelectInputLabel(facesContext, select); Modified: trunk/ui/input/ui/src/main/templates/select.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/select.template.xml 2010-12-23 14:09:07 UTC (rev 20769) +++ trunk/ui/input/ui/src/main/templates/select.template.xml 2010-12-23 14:18:13 UTC (rev 20770) @@ -47,7 +47,7 @@ </c:if> </div> - <div id="#{clientId}List" class="rf-sel-lst-cord"> + <div id="#{clientId}List" class="#{getListCss(component)}"> <cdk:call expression="renderListHandlers(facesContext, component);"/> <div class="rf-sel-shdw"> <div class="rf-sel-shdw-t"></div> @@ -56,7 +56,7 @@ <div class="rf-sel-shdw-b"></div> <div class="rf-sel-lst-dcrtn"> - <div class="rf-sel-lst-scrl"> + <div class="rf-sel-lst-scrl" style="#{encodeHeightAndWidth(component)}"> <div id="#{clientId}Items" > <cdk:call expression="encodeItems(facesContext, component, clientSelectItems);"/> </div> @@ -67,9 +67,8 @@ <script type="text/javascript"> <cdk:scriptObject name="options"> <cdk:scriptOption name="items" value="#{clientSelectItems}" /> - <cdk:scriptOption name="itemCss" value="#{concatClasses('rf-sel-opt', component.attributes['itemClass'])}" /> + <cdk:scriptOption name="itemCss" value="rf-sel-opt" /> <cdk:scriptOption name="selectItemCss" value="#{concatClasses('rf-sel-sel', component.attributes['selectItemClass'])}" /> - <cdk:scriptOption name="listCss" value="#{concatClasses('rf-sel-lst-cord', component.attributes['listClass'])}" /> <cdk:scriptOption attributes="onbegin oncomplete onerror onbeforedomupdate onchange onblur onselectitem onfocus" wrapper="eventHandler"/> <cdk:scriptOption attributes="showControl defaultLabel enableManualInput selectFirst" /> </cdk:scriptObject> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-12-23 14:09:07 UTC (rev 20769) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-12-23 14:18:13 UTC (rev 20770) @@ -1,45 +1,31 @@ <span class="rf-is-d-s" id="form:inplaceSelectDefault"> - <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel"> - Edit Text - </span> - <input class="rf-is-none" id="form:inplaceSelectDefaultFocus" name="form:inplaceSelectDefaultFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/> - <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit"> - <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault" type="hidden"/> - <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectDefaultInput" name="form:inplaceSelectDefaultInput" readonly="readonly" style="width: ;" type="text"/> - <span class="rf-is-lst-cord" id="form:inplaceSelectDefaultList" style="display: none"> - <span class="rf-is-lst-pos" style="width: 250px"> - <span class="rf-is-shdw"> - <span class="rf-is-shdw-t"> - </span> - <span class="rf-is-shdw-l"> - </span> - <span class="rf-is-shdw-r"> - </span> - <span class="rf-is-shdw-b"> - </span> - <span class="rf-is-lst-dec"> - <span class="rf-is-lst-scrl" style="height: 100px"> - <span id="form:inplaceSelectDefaultItems"> - <span id="form:inplaceSelectDefaultItem0" class="rf-is-opt"> - Label#1 - </span> - <span id="form:inplaceSelectDefaultItem1" class="rf-is-opt"> - Label#2 - </span> - <span id="form:inplaceSelectDefaultItem2" class="rf-is-opt"> - Label#3 - </span> - <span id="form:inplaceSelectDefaultItem3" class="rf-is-opt"> - Label#4 - </span> - </span> - </span> - </span> - </span> - </span> - </span> - </span> - <script type="text/javascript"> - //ignored - </script> + <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel">Edit Text</span> + <input class="rf-is-none" id="form:inplaceSelectDefaultFocus" name="form:inplaceSelectDefaultFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> + <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit"> + <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault" type="hidden" /> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectDefaultInput" name="form:inplaceSelectDefaultInput" readonly="readonly" style="width: ;" type="text" /> + <span class="rf-is-lst-cord" id="form:inplaceSelectDefaultList" style="display: none"> + <span class="rf-is-lst-pos" style="width: 200px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" style="height: 100px"> + <span id="form:inplaceSelectDefaultItems"> + <span id="form:inplaceSelectDefaultItem0" class="rf-is-opt">Label#1</span> + <span id="form:inplaceSelectDefaultItem1" class="rf-is-opt">Label#2</span> + <span id="form:inplaceSelectDefaultItem2" class="rf-is-opt">Label#3</span> + <span id="form:inplaceSelectDefaultItem3" class="rf-is-opt">Label#4</span> + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignored + </script> </span> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-12-23 14:09:07 UTC (rev 20769) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-12-23 14:18:13 UTC (rev 20770) @@ -1,64 +1,46 @@ <span class="rf-is-d-s rf-is-e-s" id="form:inplaceSelectEdit"> - <span class="rf-is-lbl" id="form:inplaceSelectEditLabel"> - Edit Text - </span> - <input class="rf-is-none" id="form:inplaceSelectEditFocus" name="form:inplaceSelectEditFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/> - <span class="rf-is-edit" id="form:inplaceSelectEditEdit"> - <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" type="hidden"/> - <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput" name="form:inplaceSelectEditInput" readonly="readonly" style="width: ;" type="text"/> - <span class="rf-is-btn-prepos"> - <span class="rf-is-btn-pos"> - <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow"> - <span class="rf-is-shdw-t"> - </span> - <span class="rf-is-shdw-l"> - </span> - <span class="rf-is-shdw-r"> - </span> - <span class="rf-is-shdw-b"> - </span> - <span id="form:inplaceSelectEditBtn" style="position : relative;"> - <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" name="form:inplaceSelectEditOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image"/> - <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" name="form:inplaceSelectEditOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image"/> - <br/> - </span> - </span> - </span> - </span> - <span class="rf-is-lst-cord" id="form:inplaceSelectEditList" style="display: none"> - <span class="rf-is-lst-pos" style="width: 250px"> - <span class="rf-is-shdw"> - <span class="rf-is-shdw-t"> - </span> - <span class="rf-is-shdw-l"> - </span> - <span class="rf-is-shdw-r"> - </span> - <span class="rf-is-shdw-b"> - </span> - <span class="rf-is-lst-dec"> - <span class="rf-is-lst-scrl" style="height: 100px"> - <span id="form:inplaceSelectEditItems"> - <span id="form:inplaceSelectEditItem0" class="rf-is-opt"> - Label#1 - </span> - <span id="form:inplaceSelectEditItem1" class="rf-is-opt"> - Label#2 - </span> - <span id="form:inplaceSelectEditItem2" class="rf-is-opt"> - Label#3 - </span> - <span id="form:inplaceSelectEditItem3" class="rf-is-opt"> - Label#4 - </span> - </span> - </span> - </span> - </span> - </span> - </span> - </span> - <script type="text/javascript"> - //ignored - </script> + <span class="rf-is-lbl" id="form:inplaceSelectEditLabel">Edit Text</span> + <input class="rf-is-none" id="form:inplaceSelectEditFocus" name="form:inplaceSelectEditFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> + <span class="rf-is-edit" id="form:inplaceSelectEditEdit"> + <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" type="hidden" /> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput" name="form:inplaceSelectEditInput" readonly="readonly" style="width: ;" type="text" /> + <span class="rf-is-btn-prepos"> + <span class="rf-is-btn-pos"> + <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span id="form:inplaceSelectEditBtn" style="position : relative;"> + <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image" /> + <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image" /> + <br /> + </span> + </span> + </span> + </span> + <span class="rf-is-lst-cord" id="form:inplaceSelectEditList" style="display: none"> + <span class="rf-is-lst-pos" style="width: 200px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" style="height: 100px"> + <span id="form:inplaceSelectEditItems"> + <span id="form:inplaceSelectEditItem0" class="rf-is-opt">Label#1</span> + <span id="form:inplaceSelectEditItem1" class="rf-is-opt">Label#2</span> + <span id="form:inplaceSelectEditItem2" class="rf-is-opt">Label#3</span> + <span id="form:inplaceSelectEditItem3" class="rf-is-opt">Label#4</span> + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignore + </script> </span> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-12-23 14:09:07 UTC (rev 20769) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-12-23 14:18:13 UTC (rev 20770) @@ -1,64 +1,46 @@ <span class="rf-is-d-s" id="form:inplaceSelectWithControls"> - <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel"> - Edit Text - </span> - <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus" name="form:inplaceSelectWithControlsFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/> - <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit"> - <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls" type="hidden"/> - <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectWithControlsInput" name="form:inplaceSelectWithControlsInput" readonly="readonly" style="width: ;" type="text"/> - <span class="rf-is-btn-prepos"> - <span class="rf-is-btn-pos"> - <span class="rf-is-shdw" id="form:inplaceSelectWithControlsBtnshadow"> - <span class="rf-is-shdw-t"> - </span> - <span class="rf-is-shdw-l"> - </span> - <span class="rf-is-shdw-r"> - </span> - <span class="rf-is-shdw-b"> - </span> - <span id="form:inplaceSelectWithControlsBtn" style="position : relative;"> - <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" name="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image"/> - <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" name="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image"/> - <br/> - </span> - </span> - </span> - </span> - <span class="rf-is-lst-cord" id="form:inplaceSelectWithControlsList" style="display: none"> - <span class="rf-is-lst-pos" style="width: 250px"> - <span class="rf-is-shdw"> - <span class="rf-is-shdw-t"> - </span> - <span class="rf-is-shdw-l"> - </span> - <span class="rf-is-shdw-r"> - </span> - <span class="rf-is-shdw-b"> - </span> - <span class="rf-is-lst-dec"> - <span class="rf-is-lst-scrl" style="height: 100px"> - <span id="form:inplaceSelectWithControlsItems"> - <span id="form:inplaceSelectWithControlsItem0" class="rf-is-opt"> - Label#1 - </span> - <span id="form:inplaceSelectWithControlsItem1" class="rf-is-opt"> - Label#2 - </span> - <span id="form:inplaceSelectWithControlsItem2" class="rf-is-opt"> - Label#3 - </span> - <span id="form:inplaceSelectWithControlsItem3" class="rf-is-opt"> - Label#4 - </span> - </span> - </span> - </span> - </span> - </span> - </span> - </span> - <script type="text/javascript"> - //ignored - </script> + <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel">Edit Text</span> + <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus" name="form:inplaceSelectWithControlsFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> + <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit"> + <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls" type="hidden" /> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectWithControlsInput" name="form:inplaceSelectWithControlsInput" readonly="readonly" style="width: ;" type="text" /> + <span class="rf-is-btn-prepos"> + <span class="rf-is-btn-pos"> + <span class="rf-is-shdw" id="form:inplaceSelectWithControlsBtnshadow"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span id="form:inplaceSelectWithControlsBtn" style="position : relative;"> + <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image" /> + <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image" /> + <br /> + </span> + </span> + </span> + </span> + <span class="rf-is-lst-cord" id="form:inplaceSelectWithControlsList" style="display: none"> + <span class="rf-is-lst-pos" style="width: 200px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"></span> + <span class="rf-is-shdw-l"></span> + <span class="rf-is-shdw-r"></span> + <span class="rf-is-shdw-b"></span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" style="height: 100px"> + <span id="form:inplaceSelectWithControlsItems"> + <span id="form:inplaceSelectWithControlsItem0" class="rf-is-opt">Label#1</span> + <span id="form:inplaceSelectWithControlsItem1" class="rf-is-opt">Label#2</span> + <span id="form:inplaceSelectWithControlsItem2" class="rf-is-opt">Label#3</span> + <span id="form:inplaceSelectWithControlsItem3" class="rf-is-opt">Label#4</span> + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + // ignore + </script> </span> \ No newline at end of file