Author: ayanul Date: 2008-07-02 02:54:16 -0400 (Wed, 02 Jul 2008) New Revision: 9340 Removed: trunk/test-applications/jsp/src/main/webapp/pages/Action/ Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java trunk/test-applications/jsp/src/main/java/combobox/Combobox.java trunk/test-applications/jsp/src/main/java/componentControl/ComponentControl.java trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java trunk/test-applications/jsp/src/main/java/rich/Options.java trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java trunk/test-applications/jsp/src/main/java/util/event/Event.java trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml trunk/test-applications/jsp/src/main/webapp/pages/Info/Info.jsp trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp Log: Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-07-02 06:54:16 UTC (rev 9340) @@ -32,8 +32,11 @@ import javax.faces.context.FacesContext; import javax.faces.event.ValueChangeEvent; +import org.richfaces.component.html.HtmlCalendar; import org.richfaces.event.CurrentDateChangeEvent; +import util.componentInfo.ComponentInfo; + /** * @author AYanul * @@ -97,7 +100,18 @@ private boolean showFooter; private boolean resetTimeOnDateSelect; private String defaultTime; + private HtmlCalendar htmlCalendar = null; + public HtmlCalendar getHtmlCalendar() { + return htmlCalendar; + } + + + public void setHtmlCalendar(HtmlCalendar htmlCalendar) { + this.htmlCalendar = htmlCalendar; + } + + /** * @return the defaultTime */ @@ -772,4 +786,8 @@ this.firstWeekDay = firstWeekDay; } + public void addHtmlCalendar(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlCalendar); + } } Modified: trunk/test-applications/jsp/src/main/java/combobox/Combobox.java =================================================================== --- trunk/test-applications/jsp/src/main/java/combobox/Combobox.java 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/java/combobox/Combobox.java 2008-07-02 06:54:16 UTC (rev 9340) @@ -10,6 +10,7 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; +import util.componentInfo.ComponentInfo; import util.data.Data; public class Combobox { @@ -34,7 +35,7 @@ public String listHeight; public String listWidth; public ArrayList<SelectItem> selectItem; - private HtmlComboBox myComboBox = null; + private HtmlComboBox htmlComboBox = null; private String bindLabel; private String align; @@ -242,12 +243,12 @@ this.listWidth = listWidth; } - public HtmlComboBox getMyComboBox() { - return myComboBox; + public HtmlComboBox getHtmlComboBox() { + return htmlComboBox; } - public void setMyComboBox(HtmlComboBox myComboBox) { - this.myComboBox = myComboBox; + public void setHtmlComboBox(HtmlComboBox htmlComboBox) { + this.htmlComboBox = htmlComboBox; } public String getBindLabel() { @@ -260,7 +261,7 @@ public void checkBinding(ActionEvent actionEvent){ FacesContext context = FacesContext.getCurrentInstance(); - bindLabel = myComboBox.getClientId(context); + bindLabel = htmlComboBox.getClientId(context); } public String getAlign() { @@ -270,4 +271,9 @@ public void setAlign(String align) { this.align = align; } + + public void addHtmlCombobox(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlComboBox); + } } Modified: trunk/test-applications/jsp/src/main/java/componentControl/ComponentControl.java =================================================================== --- trunk/test-applications/jsp/src/main/java/componentControl/ComponentControl.java 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/java/componentControl/ComponentControl.java 2008-07-02 06:54:16 UTC (rev 9340) @@ -1,8 +1,22 @@ package componentControl; +import org.richfaces.component.html.HtmlComponentControl; + +import util.componentInfo.ComponentInfo; + public class ComponentControl { private boolean calendarPopup; + private HtmlComponentControl htmlComponentControl = null; + + public HtmlComponentControl getHtmlComponentControl() { + return htmlComponentControl; + } + + public void setHtmlComponentControl(HtmlComponentControl htmlComponentControl) { + this.htmlComponentControl = htmlComponentControl; + } + public ComponentControl() { calendarPopup = false; } @@ -14,4 +28,9 @@ public void setCalendarPopup(boolean calendarPopup) { this.calendarPopup = calendarPopup; } + + public void addHtmlComponentControl(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlComponentControl); + } } Modified: trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java =================================================================== --- trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/java/contextMenu/ContextMenu.java 2008-07-02 06:54:16 UTC (rev 9340) @@ -5,7 +5,11 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; +import org.richfaces.component.UIContextMenu; +import org.richfaces.component.html.HtmlCalendar; + import rich.RichBean; +import util.componentInfo.ComponentInfo; public class ContextMenu { private String info; @@ -20,7 +24,21 @@ private boolean rendered; private boolean disamble; private boolean attached; + private org.richfaces.component.html.ContextMenu htmlContextMenu = null; + public org.richfaces.component.html.ContextMenu getHtmlContextMenu() { + return htmlContextMenu; + } + + public void setHtmlContextMenu(org.richfaces.component.html.ContextMenu htmlContextMenu) { + this.htmlContextMenu = htmlContextMenu; + } + + public void addHtmlContextMenu(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlContextMenu); + } + public boolean isAttached() { return attached; } Modified: trunk/test-applications/jsp/src/main/java/rich/Options.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-07-02 06:54:16 UTC (rev 9340) @@ -1,42 +1,28 @@ package rich; public class Options { - private static String [] CALENDAR_EVENT = {"onbeforedomupdate", "onchanged", "oncollapse", "oncomplete", "oncurrentdateselect", "ondatemouseout", "ondatemouseover", "ondateselect", "ondateselected", "onexpand", "oninputblur", "oninputchange", "oninputclick", "oninputfocus", "oninputkeydown", "oninputkeypress", "oninputkeyup", "oninputselect", "ontimeselect", "ontimeselected"}; - private static String [] CALENDAR_STYLE = {"style", "styleClass", "inputStyle"}; - private static String [] COLUMNS_STYLE = {"footerClass", "headerClass", "styleClass", "style"}; - private static String [] COMBOBOX_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onfocus", "onitemselected", "onkeydown", "onkeypress", "onkeyup", "onlistcall", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect"}; - private static String [] COMBOBOX_STYLE = {"buttonClass", "buttonDisabledClass", "buttonDisabledStyle", "buttonInactiveClass", "buttonInactiveStyle", "buttonStyle", "inputClass", "inputDisabledClass", "inputDisabledStyle", "inputInactiveClass", "inputInactiveStyle", "itemClass", "inputStyle", "listClass", "listStyle"}; - private static String [] CONTEXTMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover"}; - private static String [] CONTEXTMENU_STYLE = {"disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "style", "styleClass"}; - private static String [] DATADEFINITIONLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass"}; - private static String [] DATAORDEREDLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass", "footerClass", "headerClass"}; - private static String [] DATAFILTERSLIDER_EVENT = {"onbeforedomupdate", "onchange", "onclick", "oncomplete", "ondblclick", "onerror", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onslide", "onSlideSubmit"}; - private static String [] DATAFILTERSLIDER_STYLE = {"styleClass", "rangeStyleClass", "trailerStyleClass", "style", "fieldStyleClass", "trackStyleClass", "handleStyleClass"}; - private static String [] DATASCROLLER_EVENT = {"onbeforedomupdate", "onclick", "oncomplete", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"}; - private static String [] DATASCROLLER_STYLE = {"inactiveStyle", "inactiveStyleClass", "selectedStyle", "selectedStyleClass", "style", "styleClass", "tableStyle", "tableStyleClass"}; - private static String [] DATATABLE_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onRowClick", "onRowDblClick", "onRowMouseDown", "onRowMouseMove", "onRowMouseOut", "onRowMouseOver", "onRowMouseUp"}; - private static String [] DATATABLE_STYLE = {"captionClass", "rowClasses", "headerClass", "footerClass", "styleClass", "captionStyle", "columnClasses"}; - private static String [] DRAGANDDROP_EVENT = {"ondragenter", "ondragexit", "ondrop", "ondropend", "oncomplete", "onsubmit", "onbeforedomupdate", "oncomplete", "ondragend", "ondragstart", "onsubmit", "ondropout", "ondropover"}; - private static String [] DRAGANDDROP_STYLE = {"acceptClass", "rejectClass", "style", "styleClass"}; - private static String [] DROPDOWNMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover", "onbeforedomupdate", "onclick", "oncomplete", "onmousedown", "onmouseup", "onselect"}; - private static String [] DROPDOWNMENU_STYLE = {"iconClass", "iconStyle", "selectClass", "selectStyle", "style", "disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "styleClass"}; - private static String [] GMAP_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"}; - private static String [] GMAP_STYLE = {"style=", "styleClass"}; - private static String [] INPUTNUMBERSLIDER_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onerror", "onfocus", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect", "onslide"}; - private static String [] INPUTNUMBERSLIDER_STYLE = {"barClass", "barStyle", "handleClass", "inputClass", "handleSelectedClass", "inputSize", "styleClass", "inputStyle", "tipStyle", "style", "tipClass"}; - private boolean log; - private boolean reDefault; + private boolean reDefault ; private boolean reComponent; private boolean reProperty; private boolean reStraightforward; + private boolean attribute; + public boolean isAttribute() { + return attribute; + } + + public void setAttribute(boolean attribute) { + this.attribute = attribute; + } + public Options() { log = false; reDefault = true; reComponent = true; reProperty = true; reStraightforward = true; + attribute = false; } public boolean isReComponent() { Modified: trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-02 06:54:16 UTC (rev 9340) @@ -51,7 +51,7 @@ if (str.startsWith("on")) { componentAttribute.putEvent(str, ""); - } else if (str.indexOf("style") != -1 || str.indexOf("lass") != -1) { + } else if (str.indexOf("tyle") != -1 || str.indexOf("lass") != -1) { try { Object obj = field.get(component); componentAttribute.putStyle(str, obj == null ? "null" : obj.toString()); Modified: trunk/test-applications/jsp/src/main/java/util/event/Event.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/event/Event.java 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/java/util/event/Event.java 2008-07-02 06:54:16 UTC (rev 9340) @@ -125,113 +125,113 @@ // showEvent('onkeypressInputID', 'onkeypress work!') public Event() { - onobjectchange = "showEvent('onobjectchangeInputID', 'onobjectchange work!')"; - onLoadMap = "showEvent('onLoadMapInputID', 'onLoadMap work!')"; - opened = "showEvent('openedInputID', 'opened work!')"; - onRowClick = "showEvent('onRowClickInputID', 'onRowClick work!')"; - onRowDblClick = "showEvent('onRowDblClickInputID', 'onRowDblClick work!')"; - onRowMouseDown = "showEvent('onRowMouseDownInputID', 'onRowMouseDown work!')"; - onRowMouseMove = "showEvent('onRowMouseMoveInputID', 'onRowMouseMove work!')"; - onRowMouseOut = "showEvent('onRowMouseOutInputID', 'onRowMouseOut work!')"; - onRowMouseOver = "showEvent('onRowMouseOverInputID', 'onRowMouseOver work!')"; - onRowMouseUp = "showEvent('onRowMouseUpInputID', 'onRowMouseUp work!')"; - onbeforedomupdate = "showEvent('onbeforedomupdateInputID', 'onbeforedomupdate work!')"; - onblur = "showEvent('onblurInputID', 'onblur work!')"; - onbottomclick = "showEvent('onbottomclickInputID', 'onbottomclick work!')"; - onchange = "showEvent('onchangeInputID', 'onchange work!')"; - onchanged = "showEvent('onchangedInputID', 'onchanged work!')"; - onclick = "showEvent('onclickInputID', 'onclick work!')"; - oncollapse = "showEvent('oncollapseInputID', 'oncollapse work!')"; - oncomplete = "showEvent('oncompleteInputID', 'oncomplete work!')"; - oncontextmenu = "showEvent('oncontextmenuInputID', 'oncontextmenu work!')"; - onclear = "showEvent('onclearInputID', 'onclear work!')"; - oncurrentdateselect = "showEvent('oncurrentdateselectInputID', 'oncurrentdateselect work!')"; - ondatemouseout = "showEvent('ondatemouseoutInputID', 'ondatemouseout work!')"; - ondatemouseover = "showEvent('ondatemouseoverInputID', 'ondatemouseover work!')"; - ondateselect = "showEvent('ondateselectInputID', 'ondateselect work!')"; - ondateselected = "showEvent('ondateselectedInputID', 'ondateselected work!')"; - ondblclick = "showEvent('ondblclickInputID', 'ondblclick work!')"; - ondownclick = "showEvent('ondownclickInputID', 'ondownclick work!')"; - ondragend = "showEvent('ondragendInputID', 'ondragend work!')"; - ondragenter = "showEvent('ondragenterInputID', 'ondragenter work!')"; - ondragexit = "showEvent('ondragexitInputID', 'ondragexit work!')"; - ondragstart = "showEvent('ondragstartInputID', 'ondragstart work!')"; - ondrop = "showEvent('ondropInputID', 'ondrop work!')"; - ondropend = "showEvent('ondropendInputID', 'ondropend work!')"; - ondropout = "showEvent('ondropoutInputID', 'ondropout work!')"; - ondropover = "showEvent('ondropoverInputID', 'ondropover work!')"; - onerror = "showEvent('onerrorInputID', 'onerror work!')"; - onexpand = "showEvent('onexpandInputID', 'onexpand work!')"; - onfocus = "showEvent('onfocusInputID', 'onfocus work!')"; - ongroupactivate = "showEvent('ongroupactivateInputID', 'ongroupactivate work!')"; - ongroupexpand = "showEvent('ongroupexpandInputID', 'ongroupexpand work!')"; - onheaderclick = "showEvent('onheaderclickInputID', 'onheaderclick work!')"; - onhide = "showEvent('onhideInputID', 'onhide work!')"; - oninit = "showEvent('oninitInputID', 'oninit work!')"; - oninputblur = "showEvent('oninputblurInputID', 'oninputblur work!')"; - oninputchange = "showEvent('oninputchangeInputID', 'oninputchange work!')"; - oninputclick = "showEvent('oninputclickInputID', 'oninputclick work!')"; - oninputfocus = "showEvent('oninputfocusInputID', 'oninputfocus work!')"; - oninputkeydown = "showEvent('oninputkeydownInputID', 'oninputkeydown work!')"; - oninputkeypress = "showEvent('oninputkeypressInputID', 'oninputkeypress work!')"; - oninputkeyup = "showEvent('oninputkeyupInputID', 'oninputkeyup work!')"; - oninputselect = "showEvent('oninputselectInputID', 'oninputselect work!')"; - onitemchange = "showEvent('onitemchangeInputID', 'onitemchange work!')"; - onitemhover = "showEvent('onitemhoverInputID', 'onitemhover work!')"; - onitemselect = "showEvent('onitemselectInputID', 'onitemselect work!')"; - onitemselected = "showEvent('onitemselectedInputID', 'onitemselected work!')"; - onkeydown = "showEvent('onkeydownInputID', 'onkeydown work!')"; - onkeypress = "showEvent('onkeypressInputID', 'onkeypress work!')"; - onkeyup = "showEvent('onkeyupInputID', 'onkeyup work!')"; - onlistcall = "showEvent('onlistcallInputID', 'onlistcall work!')"; - onmaskclick = "showEvent('onmaskclickInputID', 'onmaskclick work!')"; - onmaskcontextmenu = "showEvent('onmaskcontextmenuInputID', 'onmaskcontextmenu work!')"; - onmaskdblclick = "showEvent('onmaskdblclickInputID', 'onmaskdblclick work!')"; - onmaskmousedown = "showEvent('onmaskmousedownInputID', 'onmaskmousedown work!')"; - onmaskmousemove = "showEvent('onmaskmousemoveInputID', 'onmaskmousemove work!')"; - onmaskmouseout = "showEvent('onmaskmouseoutInputID', 'onmaskmouseout work!')"; - onmaskmouseover = "showEvent('onmaskmouseoverInputID', 'onmaskmouseover work!')"; - onmaskmouseup = "showEvent('onmaskmouseupInputID', 'onmaskmouseup work!')"; - onmousedown = "showEvent('onmousedownInputID', 'onmousedown work!')"; - onmousemove = "showEvent('onmousemoveInputID', 'onmousemove work!')"; - onmouseout = "showEvent('onmouseoutInputID', 'onmouseout work!')"; - onmouseover = "showEvent('onmouseoverInputID', 'onmouseover work!')"; - onmouseup = "showEvent('onmouseupInputID', 'onmouseup work!')"; - onmove = "showEvent('onmoveInputID', 'onmove work!')"; - onorderchanged = "showEvent('onorderchangedInputID', 'onorderchanged work!')"; - onresize = "showEvent('onresizeInputID', 'onresize work!')"; - onselect = "showEvent('onselectInputID', 'onselect work!')"; - onselected = "showEvent('onselectedInputID', 'onselected work!')"; - onselectionchange = "showEvent('onselectionchangeInputID', 'onselectionchange work!')"; - onshow = "showEvent('onshowInputID', 'onshow work!')"; - onslide = "showEvent('onslideInputID', 'onslide work!')"; - onsubmit = "showEvent('onsubmitInputID', 'onsubmit work!')"; - ontabenter = "showEvent('ontabenterInputID', 'ontabenter work!')"; - ontableave = "showEvent('ontableaveInputID', 'ontableave work!')"; - ontimeselect = "showEvent('ontimeselectInputID', 'ontimeselect work!')"; - ontimeselected = "showEvent('ontimeselectedInputID', 'ontimeselected work!')"; - ontopclick = "showEvent('ontopclickInputID', 'ontopclick work!')"; - onupclick = "showEvent('onupclickInputID', 'onupclick work!')"; - ongroupcollapse = "showEvent('ongroupcollapseInputID', 'ongroupcollapse work!')"; - onSlideSubmit = "showEvent('onSlideSubmitInputID', 'onSlideSubmit work!')"; - oneditactivated = "showEvent('oneditactivatedInputID', 'oneditactivated work!')"; - oneditactivation = "showEvent('oneditactivationInputID', 'oneditactivation work!')"; - oninputdblclick = "showEvent('oninputdblclickInputID', 'oninputdblclick work!')"; - oninputmousedown = "showEvent('oninputmousedownInputID', 'oninputmousedown work!')"; - oninputmousemove = "showEvent('oninputmousemoveInputID', 'oninputmousemove work!')"; - oninputmouseout = "showEvent('oninputmouseoutInputID', 'oninputmouseout work!')"; - oninputmouseover = "showEvent('oninputmouseoverInputID', 'oninputmouseover work!')"; - oninputmouseup = "showEvent('oninputmouseupInputID', 'oninputmouseup work!')"; - onsizerejected = "showEvent('onsizerejectedInputID', 'onsizerejected work!')"; - ontyperejected = "showEvent('ontyperejectedInputID', 'ontyperejected work!')"; - onupload = "showEvent('onuploadInputID', 'onupload work!')"; - onuploadcanceled = "showEvent('onuploadcanceledInputID', 'onuploadcanceled work!')"; - onuploadcomplete = "showEvent('onuploadcompleteInputID', 'onuploadcomplete work!')"; - onviewactivated = "showEvent('onviewactivatedInputID', 'onviewactivated work!')"; - onviewactivation = "showEvent('onviewactivationInputID', 'onviewactivation work!')"; - onbeforehide = "showEvent('onbeforehideInputID', 'onbeforehide work!')"; - onbeforeshow = "showEvent('onbeforeshowInputID', 'onbeforeshow work!')"; - onadd = "showEvent('onaddInputID', 'onadd work!')"; + onobjectchange = "showEvent('infoFormID:infoSubview:onobjectchangeInputID', 'onobjectchange work!')"; + onLoadMap = "showEvent('infoFormID:infoSubview:onLoadMapInputID', 'onLoadMap work!')"; + opened = "showEvent('infoFormID:infoSubview:openedInputID', 'opened work!')"; + onRowClick = "showEvent('infoFormID:infoSubview:onRowClickInputID', 'onRowClick work!')"; + onRowDblClick = "showEvent('infoFormID:infoSubview:onRowDblClickInputID', 'onRowDblClick work!')"; + onRowMouseDown = "showEvent('infoFormID:infoSubview:onRowMouseDownInputID', 'onRowMouseDown work!')"; + onRowMouseMove = "showEvent('infoFormID:infoSubview:onRowMouseMoveInputID', 'onRowMouseMove work!')"; + onRowMouseOut = "showEvent('infoFormID:infoSubview:onRowMouseOutInputID', 'onRowMouseOut work!')"; + onRowMouseOver = "showEvent('infoFormID:infoSubview:onRowMouseOverInputID', 'onRowMouseOver work!')"; + onRowMouseUp = "showEvent('infoFormID:infoSubview:onRowMouseUpInputID', 'onRowMouseUp work!')"; + onbeforedomupdate = "showEvent('infoFormID:infoSubview:onbeforedomupdateInputID', 'onbeforedomupdate work!')"; + onblur = "showEvent('infoFormID:infoSubview:onblurInputID', 'onblur work!')"; + onbottomclick = "showEvent('infoFormID:infoSubview:onbottomclickInputID', 'onbottomclick work!')"; + onchange = "showEvent('infoFormID:infoSubview:onchangeInputID', 'onchange work!')"; + onchanged = "showEvent('infoFormID:infoSubview:onchangedInputID', 'onchanged work!')"; + onclick = "showEvent('infoFormID:infoSubview:onclickInputID', 'onclick work!')"; + oncollapse = "showEvent('infoFormID:infoSubview:oncollapseInputID', 'oncollapse work!')"; + oncomplete = "showEvent('infoFormID:infoSubview:oncompleteInputID', 'oncomplete work!')"; + oncontextmenu = "showEvent('infoFormID:infoSubview:oncontextmenuInputID', 'oncontextmenu work!')"; + onclear = "showEvent('infoFormID:infoSubview:onclearInputID', 'onclear work!')"; + oncurrentdateselect = "showEvent('infoFormID:infoSubview:oncurrentdateselectInputID', 'oncurrentdateselect work!')"; + ondatemouseout = "showEvent('infoFormID:infoSubview:ondatemouseoutInputID', 'ondatemouseout work!')"; + ondatemouseover = "showEvent('infoFormID:infoSubview:ondatemouseoverInputID', 'ondatemouseover work!')"; + ondateselect = "showEvent('infoFormID:infoSubview:ondateselectInputID', 'ondateselect work!')"; + ondateselected = "showEvent('infoFormID:infoSubview:ondateselectedInputID', 'ondateselected work!')"; + ondblclick = "showEvent('infoFormID:infoSubview:ondblclickInputID', 'ondblclick work!')"; + ondownclick = "showEvent('infoFormID:infoSubview:ondownclickInputID', 'ondownclick work!')"; + ondragend = "showEvent('infoFormID:infoSubview:ondragendInputID', 'ondragend work!')"; + ondragenter = "showEvent('infoFormID:infoSubview:ondragenterInputID', 'ondragenter work!')"; + ondragexit = "showEvent('infoFormID:infoSubview:ondragexitInputID', 'ondragexit work!')"; + ondragstart = "showEvent('infoFormID:infoSubview:ondragstartInputID', 'ondragstart work!')"; + ondrop = "showEvent('infoFormID:infoSubview:ondropInputID', 'ondrop work!')"; + ondropend = "showEvent('infoFormID:infoSubview:ondropendInputID', 'ondropend work!')"; + ondropout = "showEvent('infoFormID:infoSubview:ondropoutInputID', 'ondropout work!')"; + ondropover = "showEvent('infoFormID:infoSubview:ondropoverInputID', 'ondropover work!')"; + onerror = "showEvent('infoFormID:infoSubview:onerrorInputID', 'onerror work!')"; + onexpand = "showEvent('infoFormID:infoSubview:onexpandInputID', 'onexpand work!')"; + onfocus = "showEvent('infoFormID:infoSubview:onfocusInputID', 'onfocus work!')"; + ongroupactivate = "showEvent('infoFormID:infoSubview:ongroupactivateInputID', 'ongroupactivate work!')"; + ongroupexpand = "showEvent('infoFormID:infoSubview:ongroupexpandInputID', 'ongroupexpand work!')"; + onheaderclick = "showEvent('infoFormID:infoSubview:onheaderclickInputID', 'onheaderclick work!')"; + onhide = "showEvent('infoFormID:infoSubview:onhideInputID', 'onhide work!')"; + oninit = "showEvent('infoFormID:infoSubview:oninitInputID', 'oninit work!')"; + oninputblur = "showEvent('infoFormID:infoSubview:oninputblurInputID', 'oninputblur work!')"; + oninputchange = "showEvent('infoFormID:infoSubview:oninputchangeInputID', 'oninputchange work!')"; + oninputclick = "showEvent('infoFormID:infoSubview:oninputclickInputID', 'oninputclick work!')"; + oninputfocus = "showEvent('infoFormID:infoSubview:oninputfocusInputID', 'oninputfocus work!')"; + oninputkeydown = "showEvent('infoFormID:infoSubview:oninputkeydownInputID', 'oninputkeydown work!')"; + oninputkeypress = "showEvent('infoFormID:infoSubview:oninputkeypressInputID', 'oninputkeypress work!')"; + oninputkeyup = "showEvent('infoFormID:infoSubview:oninputkeyupInputID', 'oninputkeyup work!')"; + oninputselect = "showEvent('infoFormID:infoSubview:oninputselectInputID', 'oninputselect work!')"; + onitemchange = "showEvent('infoFormID:infoSubview:onitemchangeInputID', 'onitemchange work!')"; + onitemhover = "showEvent('infoFormID:infoSubview:onitemhoverInputID', 'onitemhover work!')"; + onitemselect = "showEvent('infoFormID:infoSubview:onitemselectInputID', 'onitemselect work!')"; + onitemselected = "showEvent('infoFormID:infoSubview:onitemselectedInputID', 'onitemselected work!')"; + onkeydown = "showEvent('infoFormID:infoSubview:onkeydownInputID', 'onkeydown work!')"; + onkeypress = "showEvent('infoFormID:infoSubview:onkeypressInputID', 'onkeypress work!')"; + onkeyup = "showEvent('infoFormID:infoSubview:onkeyupInputID', 'onkeyup work!')"; + onlistcall = "showEvent('infoFormID:infoSubview:onlistcallInputID', 'onlistcall work!')"; + onmaskclick = "showEvent('infoFormID:infoSubview:onmaskclickInputID', 'onmaskclick work!')"; + onmaskcontextmenu = "showEvent('infoFormID:infoSubview:onmaskcontextmenuInputID', 'onmaskcontextmenu work!')"; + onmaskdblclick = "showEvent('infoFormID:infoSubview:onmaskdblclickInputID', 'onmaskdblclick work!')"; + onmaskmousedown = "showEvent('infoFormID:infoSubview:onmaskmousedownInputID', 'onmaskmousedown work!')"; + onmaskmousemove = "showEvent('infoFormID:infoSubview:onmaskmousemoveInputID', 'onmaskmousemove work!')"; + onmaskmouseout = "showEvent('infoFormID:infoSubview:onmaskmouseoutInputID', 'onmaskmouseout work!')"; + onmaskmouseover = "showEvent('infoFormID:infoSubview:onmaskmouseoverInputID', 'onmaskmouseover work!')"; + onmaskmouseup = "showEvent('infoFormID:infoSubview:onmaskmouseupInputID', 'onmaskmouseup work!')"; + onmousedown = "showEvent('infoFormID:infoSubview:onmousedownInputID', 'onmousedown work!')"; + onmousemove = "showEvent('infoFormID:infoSubview:onmousemoveInputID', 'onmousemove work!')"; + onmouseout = "showEvent('infoFormID:infoSubview:onmouseoutInputID', 'onmouseout work!')"; + onmouseover = "showEvent('infoFormID:infoSubview:onmouseoverInputID', 'onmouseover work!')"; + onmouseup = "showEvent('infoFormID:infoSubview:onmouseupInputID', 'onmouseup work!')"; + onmove = "showEvent('infoFormID:infoSubview:onmoveInputID', 'onmove work!')"; + onorderchanged = "showEvent('infoFormID:infoSubview:onorderchangedInputID', 'onorderchanged work!')"; + onresize = "showEvent('infoFormID:infoSubview:onresizeInputID', 'onresize work!')"; + onselect = "showEvent('infoFormID:infoSubview:onselectInputID', 'onselect work!')"; + onselected = "showEvent('infoFormID:infoSubview:onselectedInputID', 'onselected work!')"; + onselectionchange = "showEvent('infoFormID:infoSubview:onselectionchangeInputID', 'onselectionchange work!')"; + onshow = "showEvent('infoFormID:infoSubview:onshowInputID', 'onshow work!')"; + onslide = "showEvent('infoFormID:infoSubview:onslideInputID', 'onslide work!')"; + onsubmit = "showEvent('infoFormID:infoSubview:onsubmitInputID', 'onsubmit work!')"; + ontabenter = "showEvent('infoFormID:infoSubview:ontabenterInputID', 'ontabenter work!')"; + ontableave = "showEvent('infoFormID:infoSubview:ontableaveInputID', 'ontableave work!')"; + ontimeselect = "showEvent('infoFormID:infoSubview:ontimeselectInputID', 'ontimeselect work!')"; + ontimeselected = "showEvent('infoFormID:infoSubview:ontimeselectedInputID', 'ontimeselected work!')"; + ontopclick = "showEvent('infoFormID:infoSubview:ontopclickInputID', 'ontopclick work!')"; + onupclick = "showEvent('infoFormID:infoSubview:onupclickInputID', 'onupclick work!')"; + ongroupcollapse = "showEvent('infoFormID:infoSubview:ongroupcollapseInputID', 'ongroupcollapse work!')"; + onSlideSubmit = "showEvent('infoFormID:infoSubview:onSlideSubmitInputID', 'onSlideSubmit work!')"; + oneditactivated = "showEvent('infoFormID:infoSubview:oneditactivatedInputID', 'oneditactivated work!')"; + oneditactivation = "showEvent('infoFormID:infoSubview:oneditactivationInputID', 'oneditactivation work!')"; + oninputdblclick = "showEvent('infoFormID:infoSubview:oninputdblclickInputID', 'oninputdblclick work!')"; + oninputmousedown = "showEvent('infoFormID:infoSubview:oninputmousedownInputID', 'oninputmousedown work!')"; + oninputmousemove = "showEvent('infoFormID:infoSubview:oninputmousemoveInputID', 'oninputmousemove work!')"; + oninputmouseout = "showEvent('infoFormID:infoSubview:oninputmouseoutInputID', 'oninputmouseout work!')"; + oninputmouseover = "showEvent('infoFormID:infoSubview:oninputmouseoverInputID', 'oninputmouseover work!')"; + oninputmouseup = "showEvent('infoFormID:infoSubview:oninputmouseupInputID', 'oninputmouseup work!')"; + onsizerejected = "showEvent('infoFormID:infoSubview:onsizerejectedInputID', 'onsizerejected work!')"; + ontyperejected = "showEvent('infoFormID:infoSubview:ontyperejectedInputID', 'ontyperejected work!')"; + onupload = "showEvent('infoFormID:infoSubview:onuploadInputID', 'onupload work!')"; + onuploadcanceled = "showEvent('infoFormID:infoSubview:onuploadcanceledInputID', 'onuploadcanceled work!')"; + onuploadcomplete = "showEvent('infoFormID:infoSubview:onuploadcompleteInputID', 'onuploadcomplete work!')"; + onviewactivated = "showEvent('infoFormID:infoSubview:onviewactivatedInputID', 'onviewactivated work!')"; + onviewactivation = "showEvent('infoFormID:infoSubview:onviewactivationInputID', 'onviewactivation work!')"; + onbeforehide = "showEvent('infoFormID:infoSubview:onbeforehideInputID', 'onbeforehide work!')"; + onbeforeshow = "showEvent('infoFormID:infoSubview:onbeforeshowInputID', 'onbeforeshow work!')"; + onadd = "showEvent('infoFormID:infoSubview:onaddInputID', 'onadd work!')"; } public String getOncontextmenu() { Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -15,6 +15,8 @@ rendered="#{calendarBean.renderedAjax}" /> <rich:calendar id="calendarClientID" + + binding="#{calendarBean.htmlCalendar}" firstWeekDay="#{calendarBean.firstWeekDay}" defaultTime="#{calendarBean.defaultTime}" resetTimeOnDateSelect="#{calendarBean.resetTimeOnDateSelect}" Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -4,6 +4,7 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="calendarPropertySubviewID"> + <h:commandButton value="add test" action="#{calendarBean.addHtmlCalendar}"></h:commandButton> <h:panelGrid columns="2"> <h:panelGroup> Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -45,7 +45,7 @@ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}" - binding="#{combobox.myComboBox}" + binding="#{combobox.htmlComboBox}" align="#{combobox.align}"> <f:selectItem itemValue="GoshaGoshaGoshaGoshaGosha"/> </rich:comboBox> Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -4,6 +4,8 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="comboboxPropertySubviewID"> + <h:commandButton value="add test" action="#{combobox.addHtmlCombobox}"></h:commandButton> + <h:panelGrid columns="2"> <h:outputText value="defaultLabel"></h:outputText> <h:inputText value="#{combobox.defaultLabel}" onchange="submit();"></h:inputText> Modified: trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -8,7 +8,7 @@ <rich:panel style="width: 130px; height: 50px; background-color: #98FB98;"> <h:outputText value="panel with contextMenu(DEFAULT)" /> <f:verbatim><br /></f:verbatim> <h:outputText value="testing events" /> - <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" style="#{style.style}" styleClass="#{style.styleClass}" disabledItemClass="#{style.disabledItemClass}" disabledItemStyle="#{style.disabledItemStyle}" itemClass="#{style.itemClass}" itemStyle="#{style.itemStyle}" selectItemStyle="#{style.selectItemStyle}" selectItemClass="#{style.selectItemClass}" + <rich:contextMenu id="contextMenuDefaultID" binding="#{contextMenu.htmlContextMenu}" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" style="#{style.style}" styleClass="#{style.styleClass}" disabledItemClass="#{style.disabledItemClass}" disabledItemStyle="#{style.disabledItemStyle}" itemClass="#{style.itemClass}" itemStyle="#{style.itemStyle}" selectItemStyle="#{style.selectItemStyle}" selectItemClass="#{style.selectItemClass}" oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID" style="#{style.styleA}" styleClass="#{style.styleClassA}"> <f:param name="cmdParam" value="abc" /> Modified: trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -4,7 +4,7 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="contextMenuPropertySubviewID"> - +<h:commandButton value="add test" action="#{combobox.addHtmlContextMenu}"></h:commandButton> <a4j:commandButton value="reRender" reRender="cmInfoID"></a4j:commandButton> <a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-07-02 06:54:16 UTC (rev 9340) @@ -20,7 +20,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,! /WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces! -config-Custom.xml</param-value> + <param-value>/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml! ,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/! faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml</param-valu e> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> Modified: trunk/test-applications/jsp/src/main/webapp/pages/Info/Info.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Info/Info.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/pages/Info/Info.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -6,27 +6,32 @@ <f:subview id="infoSubview"> <h:panelGrid binding="#{info.panelEvent}" columns="2"> </h:panelGrid> - <h:commandButton action="#{info.getEvent}" value="style"></h:commandButton> + <f:verbatim><br/></f:verbatim> + <h:commandButton action="#{info.getEvent}" value="test event"></h:commandButton> + + <h:panelGrid columns="2"> + <h:outputText value="style:"></h:outputText> + <h:dataTable id="styleTableID" value="#{info.style}" var="info"> + <h:column> + <h:outputText value="#{info.key}"></h:outputText> + </h:column> + <h:column> + <h:outputText value="#{info.value}"></h:outputText> + </h:column> + </h:dataTable> - <a4j:commandButton reRender="styleTableID" value="rerender"></a4j:commandButton> - <h:dataTable id="styleTableID" value="#{info.style}" var="info"> - <h:column> - <h:outputText value="#{info.key}"></h:outputText> - </h:column> - <h:column> - <h:outputText value="#{info.value}"></h:outputText> - </h:column> - </h:dataTable> + <h:outputText value="attribute"></h:outputText> + <h:selectBooleanCheckbox value="#{option.attribute}"></h:selectBooleanCheckbox> - <a4j:commandButton reRender="attributeTableID" value="rerender"></a4j:commandButton> - <h:dataTable id="attributeTableID" value="#{info.attribute}" var="info"> - <h:column> - <h:outputText value="#{info.key}"></h:outputText> - </h:column> - <h:column> - <h:outputText value="#{info.value}"></h:outputText> - </h:column> - </h:dataTable> - - <h:commandButton value="test" action="#{calendarBean.bindingTest}"></h:commandButton> + + <h:outputText value="attribute:" rendered="#{option.attribute}"></h:outputText> + <h:dataTable id="attributeTableID" rendered="#{option.attribute}" value="#{info.attribute}" var="info"> + <h:column> + <h:outputText value="#{info.key}"></h:outputText> + </h:column> + <h:column> + <h:outputText value="#{info.value}"></h:outputText> + </h:column> + </h:dataTable> + </h:panelGrid> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-07-01 18:30:52 UTC (rev 9339) +++ trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-07-02 06:54:16 UTC (rev 9340) @@ -14,9 +14,9 @@ <script type="text/javascript"> function showEvent(elementID, value) { var oldObject = window.document.getElementById(elementID); - if (oldObject == null || oldObject.type == "text") return; + if (oldObject == null) return; var newObject = window.document.createElement('input'); - if (oldObject.type) newObject.type = "text"; + if (oldObject.type) newObject.type = oldObject.type; if (oldObject.size) newObject.size = oldObject.size; if (oldObject.value) newObject.value = value; if (oldObject.id) newObject.id = oldObject.id; @@ -66,20 +66,10 @@ <jsp:include page="${richBean.pathProperty}"/> </h:panelGroup> </h:panelGrid> - - <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="true" style="overflow: true;"> - <f:facet name="header"> - <h:outputText value="Events ..."/> - </f:facet> - <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> - </f:facet> - - <jsp:include page="/pages/Action/EventInfo.jsp"/> - - </rich:modalPanel> - <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </h:form> + <h:form id="infoFormID"> + <jsp:include page="/pages/Info/Info.jsp"/> + </h:form> </body> </f:view> </html>