Author: abelevich Date: 2008-04-14 12:13:24 -0400 (Mon, 14 Apr 2008) New Revision: 7818 Modified: branches/3.2.x/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/WEB-INF/web.xml branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml Log: Modified: branches/3.2.x/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java =================================================================== --- branches/3.2.x/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java 2008-04-14 16:13:07 UTC (rev 7817) +++ branches/3.2.x/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java 2008-04-14 16:13:24 UTC (rev 7818) @@ -39,7 +39,7 @@ private String controlsHorizontalAlign = "right"; - private Object value = "New York"; + private Object value = "New&'< York"; private String listWidth = "200px"; Modified: branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/WEB-INF/web.xml 2008-04-14 16:13:07 UTC (rev 7817) +++ branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/WEB-INF/web.xml 2008-04-14 16:13:24 UTC (rev 7818) @@ -2,7 +2,7 @@ <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <display-name>Archetype Created Web Application</display-name> -<!-- +<!-- <context-param> <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> <param-value>com.sun.facelets.FaceletViewHandler</param-value> @@ -10,8 +10,8 @@ <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> - </context-param> --> - <context-param> + </context-param> --> + <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> <param-value>/WEB-INF/faces-config.xml</param-value> </context-param> Modified: branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp =================================================================== --- branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp 2008-04-14 16:13:07 UTC (rev 7817) +++ branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp 2008-04-14 16:13:24 UTC (rev 7818) @@ -80,18 +80,17 @@ showControls="#{bean.showControls}" editOnTab="#{bean.editOnTab}" openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" layout="inline" - <f:selectItem itemValue="option 1" itemLabel="Kansas City"/> - <f:selectItem itemValue="option 2" itemLabel="Las Vegas"/> - <f:selectItem itemValue="option 3" itemLabel="Oklahoma City"/> - <f:selectItem itemValue="option 4" itemLabel="New Jersey"/> - <f:selectItem itemValue="option 5" itemLabel="Detroit"/> - <f:selectItem itemValue="option 6" itemLabel="Toronto"/> - <f:selectItem itemValue="option 7" itemLabel="Cleveland"/> - <f:selectItem itemValue="option 8" itemLabel="Indianapolis"/> - <f:selectItem itemValue="option 9" itemLabel="New York"/> + <f:selectItem itemLabel="option 1" itemValue="Kansas City"/> + <f:selectItem itemLabel="option 2" itemValue="Las Vegas"/> + <f:selectItem itemLabel="option 3" itemValue="Oklahoma City"/> + <f:selectItem itemLabel="option 4" itemValue="New Jersey"/> + <f:selectItem itemLabel="option 5" itemValue="Detroit"/> + <f:selectItem itemLabel="option 6" itemValue="Toronto"/> + <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> + <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> + <f:selectItem itemLabel="New&'< York" itemValue="New&'< York"/> </is:inplaceSelect> <a4j:commandButton reRender="inplace" value="12312"></a4j:commandButton> @@ -100,190 +99,6 @@ <br/> <h:outputText value="value is: #{bean.value}"></h:outputText> <h:commandButton value="submit"></h:commandButton> - - - <table class="tab_example" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemValue="option 1" itemLabel="Kansas City"/> - <f:selectItem itemValue="option 2" itemLabel="Las Vegas"/> - <f:selectItem itemValue="option 3" itemLabel="Oklahoma City"/> - <f:selectItem itemValue="option 4" itemLabel="New Jersey"/> - <f:selectItem itemValue="option 5" itemLabel="Detroit"/> - <f:selectItem itemValue="option 6" itemLabel="Toronto"/> - <f:selectItem itemValue="option 7" itemLabel="Cleveland"/> - <f:selectItem itemValue="option 8" itemLabel="Indianapolis"/> - <f:selectItem itemValue="option 9" itemLabel="New York"/> - </is:inplaceSelect> - </td> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemValue="option 1" itemLabel="Kansas City"/> - <f:selectItem itemValue="option 2" itemLabel="Las Vegas"/> - <f:selectItem itemValue="option 3" itemLabel="Oklahoma City"/> - <f:selectItem itemValue="option 4" itemLabel="New Jersey"/> - <f:selectItem itemValue="option 5" itemLabel="Detroit"/> - <f:selectItem itemValue="option 6" itemLabel="Toronto"/> - <f:selectItem itemValue="option 7" itemLabel="Cleveland"/> - <f:selectItem itemValue="option 8" itemLabel="Indianapolis"/> - <f:selectItem itemValue="option 9" itemLabel="New York"/> - </is:inplaceSelect> - </td> - </tr> - <tr> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemValue="option 1" itemLabel="Kansas City"/> - <f:selectItem itemValue="option 2" itemLabel="Las Vegas"/> - <f:selectItem itemValue="option 3" itemLabel="Oklahoma City"/> - <f:selectItem itemValue="option 4" itemLabel="New Jersey"/> - <f:selectItem itemValue="option 5" itemLabel="Detroit"/> - <f:selectItem itemValue="option 6" itemLabel="Toronto"/> - <f:selectItem itemValue="option 7" itemLabel="Cleveland"/> - <f:selectItem itemValue="option 8" itemLabel="Indianapolis"/> - <f:selectItem itemValue="option 9" itemLabel="New York"/> - </is:inplaceSelect> - </td> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemValue="option 1" itemLabel="Kansas City"/> - <f:selectItem itemValue="option 2" itemLabel="Las Vegas"/> - <f:selectItem itemValue="option 3" itemLabel="Oklahoma City"/> - <f:selectItem itemValue="option 4" itemLabel="New Jersey"/> - <f:selectItem itemValue="option 5" itemLabel="Detroit"/> - <f:selectItem itemValue="option 6" itemLabel="Toronto"/> - <f:selectItem itemValue="option 7" itemLabel="Cleveland"/> - <f:selectItem itemValue="option 8" itemLabel="Indianapolis"/> - <f:selectItem itemValue="option 9" itemLabel="New York"/> - </is:inplaceSelect> - </td> - </tr> - <tr> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemValue="option 1" itemLabel="Kansas City"/> - <f:selectItem itemValue="option 2" itemLabel="Las Vegas"/> - <f:selectItem itemValue="option 3" itemLabel="Oklahoma City"/> - <f:selectItem itemValue="option 4" itemLabel="New Jersey"/> - <f:selectItem itemValue="option 5" itemLabel="Detroit"/> - <f:selectItem itemValue="option 6" itemLabel="Toronto"/> - <f:selectItem itemValue="option 7" itemLabel="Cleveland"/> - <f:selectItem itemValue="option 8" itemLabel="Indianapolis"/> - <f:selectItem itemValue="option 9" itemLabel="New York"/> - </is:inplaceSelect> - </td> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemValue="option 1" itemLabel="Kansas City"/> - <f:selectItem itemValue="option 2" itemLabel="Las Vegas"/> - <f:selectItem itemValue="option 3" itemLabel="Oklahoma City"/> - <f:selectItem itemValue="option 4" itemLabel="New Jersey"/> - <f:selectItem itemValue="option 5" itemLabel="Detroit"/> - <f:selectItem itemValue="option 6" itemLabel="Toronto"/> - <f:selectItem itemValue="option 7" itemLabel="Cleveland"/> - <f:selectItem itemValue="option 8" itemLabel="Indianapolis"/> - <f:selectItem itemValue="option 9" itemLabel="New York"/> - </is:inplaceSelect> - </td> - </tr> - </table> </h:form> </f:view> </body> Modified: branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml =================================================================== --- branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml 2008-04-14 16:13:07 UTC (rev 7817) +++ branches/3.2.x/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml 2008-04-14 16:13:24 UTC (rev 7818) @@ -86,196 +86,13 @@ <f:selectItem itemLabel="option 6" itemValue="Toronto"/> <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> - <f:selectItem itemLabel="option 9" itemValue="New York"/> + <f:selectItem itemLabel="New&amp;&apos;&lt; York" itemValue="New&amp;&apos;&lt; York"/> </is:inplaceSelect> Mayor Rudy Giuliani plans to drop out and endorse McCain, two GOP sources said. That would give McCain added momentum heading into a debate Wednesday and next week's Super Tuesday contests </div> <br/> <h:outputText value="value is: #{bean.value}"></h:outputText> <h:commandButton value="submit"></h:commandButton> - - <table class="tab_example" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemLabel="option 1" itemValue="Kansas City"/> - <f:selectItem itemLabel="option 2" itemValue="Las Vegas"/> - <f:selectItem itemLabel="option 3" itemValue="Oklahoma City"/> - <f:selectItem itemLabel="option 4" itemValue="New Jersey"/> - <f:selectItem itemLabel="option 5" itemValue="Detroit"/> - <f:selectItem itemLabel="option 6" itemValue="Toronto"/> - <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> - <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> - <f:selectItem itemLabel="option 9" itemValue="New York"/> - </is:inplaceSelect> - </td> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemLabel="option 1" itemValue="Kansas City"/> - <f:selectItem itemLabel="option 2" itemValue="Las Vegas"/> - <f:selectItem itemLabel="option 3" itemValue="Oklahoma City"/> - <f:selectItem itemLabel="option 4" itemValue="New Jersey"/> - <f:selectItem itemLabel="option 5" itemValue="Detroit"/> - <f:selectItem itemLabel="option 6" itemValue="Toronto"/> - <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> - <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> - <f:selectItem itemLabel="option 9" itemValue="New York"/> - </is:inplaceSelect> - </td> - </tr> - <tr> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemLabel="option 1" itemValue="Kansas City"/> - <f:selectItem itemLabel="option 2" itemValue="Las Vegas"/> - <f:selectItem itemLabel="option 3" itemValue="Oklahoma City"/> - <f:selectItem itemLabel="option 4" itemValue="New Jersey"/> - <f:selectItem itemLabel="option 5" itemValue="Detroit"/> - <f:selectItem itemLabel="option 6" itemValue="Toronto"/> - <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> - <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> - <f:selectItem itemLabel="option 9" itemValue="New York"/> - </is:inplaceSelect> - </td> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemLabel="option 1" itemValue="Kansas City"/> - <f:selectItem itemLabel="option 2" itemValue="Las Vegas"/> - <f:selectItem itemLabel="option 3" itemValue="Oklahoma City"/> - <f:selectItem itemLabel="option 4" itemValue="New Jersey"/> - <f:selectItem itemLabel="option 5" itemValue="Detroit"/> - <f:selectItem itemLabel="option 6" itemValue="Toronto"/> - <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> - <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> - <f:selectItem itemLabel="option 9" itemValue="New York"/> - </is:inplaceSelect> - </td> - </tr> - <tr> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemLabel="option 1" itemValue="Kansas City"/> - <f:selectItem itemLabel="option 2" itemValue="Las Vegas"/> - <f:selectItem itemLabel="option 3" itemValue="Oklahoma City"/> - <f:selectItem itemLabel="option 4" itemValue="New Jersey"/> - <f:selectItem itemLabel="option 5" itemValue="Detroit"/> - <f:selectItem itemLabel="option 6" itemValue="Toronto"/> - <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> - <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> - <f:selectItem itemLabel="option 9" itemValue="New York"/> - </is:inplaceSelect> - </td> - <td> - <is:inplaceSelect - editEvent="#{bean.editEvent}" - maxSelectWidth="#{bean.maxSelectWidth}" - minSelectWidth="#{bean.minSelectWidth}" - defaultLabel="#{bean.defaultLabel}" - controlsVerticalPosition="#{bean.controlsPosition}" - controlsHorizontalPosition="#{bean.controlsHorizontalAlign}" - value="#{bean.value}" - listWidth="#{bean.listWidth}" - listHeight="#{bean.listHeight}" - selectOnEdit="#{bean.selectOnEdit}" - showControls="#{bean.showControls}" - editOnTab="#{bean.editOnTab}" - openOnEdit="#{bean.openOnEdit}" - valueChangeListener="#{bean.valueChange}" - layout="block" - > - <f:selectItem itemLabel="option 1" itemValue="Kansas City"/> - <f:selectItem itemLabel="option 2" itemValue="Las Vegas"/> - <f:selectItem itemLabel="option 3" itemValue="Oklahoma City"/> - <f:selectItem itemLabel="option 4" itemValue="New Jersey"/> - <f:selectItem itemLabel="option 5" itemValue="Detroit"/> - <f:selectItem itemLabel="option 6" itemValue="Toronto"/> - <f:selectItem itemLabel="option 7" itemValue="Cleveland"/> - <f:selectItem itemLabel="option 8" itemValue="Indianapolis"/> - <f:selectItem itemLabel="option 9" itemValue="New York"/> - </is:inplaceSelect> - </td> - </tr> - </table> </h:form> </f:view>