[richfaces-svn-commits] JBoss Rich Faces SVN: r22179 - in branches/4.0.X: ui/input/api/src/main/java/org/richfaces/component and 5 other directories.

Author: abelevich Date: 2011-03-12 08:12:25 -0500 (Sat, 12 Mar 2011) New Revision: 22179 Removed: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml Modified: branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml Log: https://issues.jboss.org/browse/RF-10730 inplaces stlying attributes to be changed . Reviewed by Gleb Galkin. Modified: branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml =================================================================== --- branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml 2011-03-12 13:12:25 UTC (rev 22179) @@ -17,7 +17,13 @@ </in:inplaceInput> <h:commandButton value="submit"/> <in:inplaceInput showControls="true" defaultLabel="click to enter your name" saveOnBlur="true" - onblur="RichFaces.$('form:ii').cancel()" id="ii"> + onblur="RichFaces.$('form:ii').cancel()" id="ii" + activeClass="activeClass" + disabledClass="disabledClass" + editClass="editClass" + changedClass="changedClass" + styleClass="styleClass" + > </in:inplaceInput> </h:form> </h:body> Modified: branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml =================================================================== --- branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml 2011-03-12 13:12:25 UTC (rev 22179) @@ -19,7 +19,14 @@ <fieldset> <legend>InplaceSelect Test App</legend> Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former - <in:inplaceSelect id='ii' defaultLabel="" value="#{inputBean.value}" openOnEdit="true" saveOnSelect="false"> + <in:inplaceSelect id='ii' defaultLabel="hello!" value="#{inputBean.value}" openOnEdit="true" saveOnSelect="false" + activeClass="activeClass" + changedClass="changedClass" + disabledClass="disabledClass" + styleClass="styleClass" + disabled="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"/> @@ -41,6 +48,7 @@ <ul> <li><h:commandButton value="submit"></h:commandButton></li> <li> <h:commandButton value="ShowPopup" onclick="#{misc:component('ii')}.showPopup(); return false;"/></li> + <li></li> </ul> Modified: branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java =================================================================== --- branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -40,19 +40,13 @@ public boolean isSaveOnBlur(); public InplaceState getState(); - - public String getReadyStateClass(); - public String getEditStateClass(); + public String getActiveClass(); - public String getChangedStateClass(); + public String getChangedClass(); - public String getDisabledStateClass(); + public String getDisabledClass(); - public String getEditClass(); - - public String getNoneClass(); - public abstract int getTabindex(); } Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -70,25 +70,16 @@ @Attribute public abstract int getTabindex(); - - @Attribute - public abstract String getReadyStateClass(); @Attribute - public abstract String getEditStateClass(); + public abstract String getActiveClass(); @Attribute - public abstract String getChangedStateClass(); + public abstract String getChangedClass(); @Attribute - public abstract String getDisabledStateClass(); - - @Attribute - public abstract String getEditClass(); - - @Attribute - public abstract String getNoneClass(); - + public abstract String getDisabledClass(); + @Attribute(events=@EventName("click")) public abstract String getOnclick(); Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -85,29 +85,20 @@ public abstract String getListClass(); @Attribute - public abstract String getChangedStateClass(); + public abstract String getChangedClass(); @Attribute public abstract String getDefaultLabel(); @Attribute - public abstract String getDisabledStateClass(); + public abstract String getDisabledClass(); @Attribute - public abstract String getEditStateClass(); - - @Attribute - public abstract String getReadyStateClass(); - - @Attribute - public abstract String getNoneClass(); - + public abstract String getActiveClass(); + @Attribute() public abstract String getEditEvent(); - - @Attribute - public abstract String getEditClass(); - + @Attribute(events=@EventName("inputclick")) public abstract String getOninputclick(); Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -42,17 +42,14 @@ public abstract String getMaxListHeight(); @Attribute(hidden = true) - public abstract String getReadyStateClass(); + public abstract String getActiveClass(); @Attribute(hidden = true) - public abstract String getEditStateClass(); + public abstract String getChangedClass(); @Attribute(hidden = true) - public abstract String getChangedStateClass(); + public abstract String getDisabledClass(); - @Attribute(hidden = true) - public abstract String getDisabledStateClass(); - @Attribute public abstract String getStyle(); Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -48,18 +48,15 @@ @Attribute public abstract String getSelectItemClass(); - - @Attribute - public abstract String getReadyStateClass(); @Attribute - public abstract String getEditStateClass(); + public abstract String getActiveClass(); @Attribute - public abstract String getChangedStateClass(); + public abstract String getChangedClass(); @Attribute - public abstract String getDisabledStateClass(); + public abstract String getDisabledClass(); @Attribute public abstract String getListClass(); Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -134,40 +134,46 @@ } return style; } + + public String getContainerStyleClasses(UIComponent component) { + InplaceComponent inplaceComponent = (InplaceComponent) component; + String style = "rf-ii"; + if (inplaceComponent.isDisabled()) { + style = concatClasses(style, getDisableStateCss(inplaceComponent)); + } + return style; + } public String getEditStyleClass(UIComponent component, InplaceState inplaceState) { InplaceComponent inplaceComponent = (InplaceComponent)component; return (InplaceState.edit != inplaceState) ? concatClasses(getEditCss(inplaceComponent), getNoneCss(inplaceComponent)) : getEditCss(inplaceComponent); } - + public String getReadyStateCss(InplaceComponent component) { - String css = component.getReadyStateClass(); - return concatClasses("rf-ii", css); + return "rf-ii"; } public String getEditStateCss(InplaceComponent component) { - String css = component.getEditStateClass(); + String css = component.getActiveClass(); return concatClasses("rf-ii-act", css); } public String getChangedStateCss(InplaceComponent component) { - String css = component.getChangedStateClass(); + String css = component.getChangedClass(); return concatClasses("rf-ii-chng", css); } public String getDisableStateCss(InplaceComponent component) { - String css = component.getDisabledStateClass(); + String css = component.getDisabledClass(); return concatClasses("rf-ii-dis", css); } - + public String getEditCss(InplaceComponent component) { - String css = component.getEditClass(); - return concatClasses("rf-ii-fld-cntr", css); + return "rf-ii-fld-cntr"; } public String getNoneCss(InplaceComponent component) { - String css = component.getNoneClass(); - return concatClasses("rf-ii-none", css); + return "rf-ii-none"; } protected String getInputWidth(UIComponent component) { Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -114,35 +114,42 @@ } return label; } - - public String getReadyStateCss(InplaceComponent component) { - String css = component.getReadyStateClass(); - return concatClasses("rf-is", css); + + public String getContainerStyleClasses(UIComponent component) { + InplaceComponent inplaceComponent = (InplaceComponent) component; + String style = concatClasses("rf-is", component.getAttributes().get("styleClass")); + if (inplaceComponent.isDisabled()) { + style = concatClasses(style, getDisableStateCss(inplaceComponent)); + } + return style; } public String getEditStateCss(InplaceComponent component) { - String css = component.getEditStateClass(); + String css = component.getActiveClass(); return concatClasses("rf-is-act", css); } public String getChangedStateCss(InplaceComponent component) { - String css = component.getChangedStateClass(); + String css = component.getChangedClass(); return concatClasses("rf-is-chng", css); } public String getDisableStateCss(InplaceComponent component) { - String css = component.getDisabledStateClass(); + String css = component.getDisabledClass(); return concatClasses("rf-is-dis", css); } + + public String getDisabledCss(UIComponent component) { + AbstractInplaceSelect inplaceSelect = (AbstractInplaceSelect) component; + return getDisableStateCss(inplaceSelect); + } public String getEditCss(InplaceComponent component) { - String css = component.getEditClass(); - return concatClasses("rf-is-fld-cntr", css); + return "rf-is-fld-cntr"; } public String getNoneCss(InplaceComponent component) { - String css = component.getNoneClass(); - return concatClasses("rf-is-none", css); + return "rf-is-none"; } public String getListCss(UIComponent component) { Modified: branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 13:12:25 UTC (rev 22179) @@ -44,7 +44,7 @@ <cdk:object type="java.lang.String" name="defaultLabel" value="#{inplaceValue != null and inplaceValue.length() != 0 ? inplaceValue : '&#160;&#160;&#160;'}" /> <span id="#{clientId}" cdk:passThroughWithExclusions="id class" - class="#{concatClasses(getStateStyleClass(component, inplaceState), component.attributes['styleClass'])}"> + class="#{concatClasses(getContainerStyleClasses(component), component.attributes['styleClass'])}"> <span id="#{clientId}Label" class="rf-ii-lbl#{inplaceValue == component.attributes['defaultLabel'] ? ' rf-ii-dflt-lbl' : ''}"> #{defaultLabel} </span> @@ -89,8 +89,8 @@ <cdk:scriptObject name="options"> <cdk:scriptOption name="readyCss" value="#{concatClasses('rf-ii', component.attributes['readyStateClass'])}"/> <cdk:scriptOption name="noneCss" value="#{concatClasses('rf-ii-none', component.attributes['noneStateClass'])}"/> - <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-ii-chng', component.attributes['changedStateClass'])}"/> - <cdk:scriptOption name="editCss" value="#{concatClasses('rf-ii-act', component.attributes['editStateClass'])}"/> + <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-ii-chng', component.attributes['changedClass'])}"/> + <cdk:scriptOption name="editCss" value="#{concatClasses('rf-ii-act', component.attributes['activeClass'])}"/> <cdk:scriptOption name="editEvent" value="#{getEditEvent(component)}"/> <cdk:scriptOption name="defaultLabel" value="#{defaultLabel}" /> <cdk:scriptOption attributes="state saveOnBlur showControls" /> Modified: branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-03-12 13:12:25 UTC (rev 22179) @@ -38,8 +38,7 @@ value="#{getConvertedSelectItems(facesContext, component)}" /> <cdk:object type="java.lang.String" name="defaultLabel" value="#{inplaceValue != null and inplaceValue.length() != 0 ? inplaceValue : '&#160;&#160;&#160;'}" /> - <span id="#{clientId}" cdk:passThroughWithExclusions="id class" - class="#{concatClasses(getStateStyleClass(component, inplaceState), component.attributes['styleClass'])}" > + <span id="#{clientId}" cdk:passThroughWithExclusions="id class" class="#{ getContainerStyleClasses(component) }" > <span id="#{clientId}Label" class="rf-is-lbl#{inplaceValue == component.attributes['defaultLabel'] ? ' rf-is-dflt-lbl' : ''}"> #{defaultLabel} @@ -103,8 +102,8 @@ <cdk:scriptObject name="options"> <cdk:scriptOption name="items" value="#{clientSelectItems}" /> <cdk:scriptOption name="noneCss" value="#{concatClasses('rf-is-none', component.attributes['noneStateClass'])}"/> - <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-is-chng', component.attributes['changedStateClass'])}"/> - <cdk:scriptOption name="editCss" value="#{concatClasses('rf-is-act', component.attributes['editStateClass'])}"/> + <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-is-chng', component.attributes['changedClass'])}"/> + <cdk:scriptOption name="editCss" value="#{concatClasses('rf-is-act', component.attributes['activeClass'])}"/> <cdk:scriptOption name="selectItemCss" value="#{concatClasses('rf-is-sel', component.attributes['selectItemClass'])}"/> <cdk:scriptOption name="editEvent" value="#{getEditEvent(component)}"/> <cdk:scriptOption name="defaultLabel" value="#{defaultLabel}" /> Modified: branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java =================================================================== --- branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -5,6 +5,7 @@ import java.io.IOException; +import org.junit.Ignore; import org.junit.Test; import org.xml.sax.SAXException; @@ -28,13 +29,7 @@ public void testDefaultWithControlsEncode() throws IOException, SAXException { doTestDefaultWithControlsEncode(PAGE_NAME, BASE_ID); } - - @Test - public void testEditEncode() throws IOException, SAXException { - doTestEditEncode(PAGE_NAME, BASE_ID); - } - @Test public void testEdit() throws Exception { HtmlPage page = environment.getPage("/inplaceInputTest.jsf"); Modified: branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java =================================================================== --- branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java 2011-03-12 13:12:25 UTC (rev 22179) @@ -41,24 +41,11 @@ } @Test + @Ignore public void testEditEncode() throws IOException, SAXException { doTestEditEncode(PAGE_NAME, BASE_ID); } - @Test - @Ignore - public void testEdit() throws Exception { - HtmlPage page = environment.getPage("/inplaceSelectTest.jsf"); - String defaultComponentId = BASE_ID + DEFAULT; - edit(page, defaultComponentId, 1); - - HtmlElement input = page.getFirstByXPath("//*[@id = '" + defaultComponentId + "Input']"); - assertNotNull(input); - - String label = input.getAttribute(HtmlConstants.VALUE_ATTRIBUTE); - assertTrue("Label#3".equals(label)); - } - private void edit(HtmlPage page, String inplaceSelectId, int selectIndex) throws Exception { HtmlElement span = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "']"); assertNotNull(span); Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml 2011-03-12 13:12:25 UTC (rev 22179) @@ -24,12 +24,6 @@ <br/> <br/> <br/> - <h:panelGroup id="three" layout="block"> - <in:inplaceInput id="inplaceInputEdit" defaultLabel="Edit Text" state="edit" showControls="true" value="#{inputBean.value}"/> - </h:panelGroup> - <br/> - <br/> - <br/> <h:panelGroup id="panel" layout="block"> <!-- click here for blur --> </h:panelGroup> Deleted: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-03-12 13:12:25 UTC (rev 22179) @@ -1,38 +0,0 @@ -<span class="rf-ii rf-ii-act" id="form:inplaceInputEdit"> - <span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputEditLabel">Edit Text</span> - <input class="rf-ii-none" id="form:inplaceInputEditFocus" - style="position: absolute; top: 0px; left: 0px; outline-style: none;" - type="image" tabindex="-1" /> - <span class="rf-ii-fld-cntr" id="form:inplaceInputEditEdit"> - <input autocomplete="off" class="rf-ii-fld" id="form:inplaceInputEditInput" - name="form:inplaceInputEdit" style="width: 100%;" type="text" /> - <span class="rf-ii-btn-prepos"> - <span class="rf-ii-btn-pos"> - <span class="rf-ii-btn-shadow" id="form:inplaceInputEditBtnshadow"> - <span class="rf-ii-btn-shdw-t"></span> - <span class="rf-ii-btn-shdw-l"></span> - <span class="rf-ii-btn-shdw-r"></span> - <span class="rf-ii-btn-shdw-b"></span> - <span id="form:inplaceInputEditBtn" style="position : relative" tabindex="-1"> - <input class="rf-ii-btn" id="form:inplaceInputEditOkbtn" - onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'" - onmouseup="this.className='rf-ii-btn'" - src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" - type="image" - tabindex="-1" /> - <input class="rf-ii-btn" id="form:inplaceInputEditCancelbtn" - onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'" - onmouseup="this.className='rf-ii-btn'" - src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" - type="image" - tabindex="-1" /> - <br /> - </span> - </span> - </span> - </span> - </span> - <script type="text/javascript"> - // ignored - </script> -</span> \ No newline at end of file Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml 2011-03-12 13:12:25 UTC (rev 22179) @@ -24,12 +24,6 @@ <f:selectItem itemLabel="Label#3" itemValue="Value#3" /> <f:selectItem itemLabel="Label#4" itemValue="Value#4" /> </in:inplaceSelect> - <in:inplaceSelect id="inplaceSelectEdit" state="edit" showControls="true" defaultLabel="Edit Text" value="#{selectBean.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" /> - </in:inplaceSelect> <h:panelGroup id="out" layout="block"> <h:outputText id="inplaceSelectValue" value="Entered Value: #{selectBean.value}" /> Deleted: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-03-12 12:58:29 UTC (rev 22178) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-03-12 13:12:25 UTC (rev 22179) @@ -1,46 +0,0 @@ -<span class="rf-is rf-is-act" id="form:inplaceSelectEdit"> - <span class="rf-is-lbl rf-is-dflt-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-fld-cntr" 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" 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;" tabindex="-1"> - <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>