Author: ayanul Date: 2008-01-22 03:44:45 -0500 (Tue, 22 Jan 2008) New Revision: 5527 Removed: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryStraightforward.xhtml Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelImpl.java branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java branches/3.1.x/test-applications/facelets/src/main/java/dfs/DataFilterSliderDaoImpl.java branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/facelets/src/main/java/sb/Data.java branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java branches/3.1.x/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTracker.java branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css Log: update Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -29,22 +29,23 @@ import java.util.StringTokenizer; import java.util.TimeZone; +import javax.faces.context.FacesContext; import javax.faces.event.ValueChangeEvent; import org.richfaces.event.CurrentDateChangeEvent; public class CalendarBean { - private static final String [] WEEK_DAY_SHORT = new String[] { "Sun*", - "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat*" }; - private static final String [] WEEK_DAY = new String[] { "*Saturday*", "+Monday+", - "+Tuesday+", "+Wednesday+", "+Thursday+", "+Friday+", "*Sunday*"}; - private static final String [] MOUNT_LABELS = new String[] { "January+", - "February+", "March+", "April+", "May +", "June +", "July +", "August +", - "September +", "October +", "November +", "December +" }; - private static final String [] MOUNT_LABELS_SHORT = new String[] { "+Jan+", - "+Feb+", "+Mar+", "+Apr+", "+May+", "+Jun+", "+Jul+", "+Aug+", - "+Sep+", "+Oct+", "+Nov+", "+Dec+" }; + private static final String [] WEEK_DAY_SHORT = new String[] { "<i>Sun</i>", + "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat*" }; + private static final String [] WEEK_DAY = new String[] { "*Saturday", "+Monday+", + "+Tuesday+", "+Wednesday+", "+Thursday+", "+Friday+", "*Sunday*"}; + private static final String [] MOUNT_LABELS = new String[] { "<i>January</i>", + "February+", "March+", "April+", "May +", "June +", "July +", "August +", + "September +", "October +", "November +", "December +" }; + private static final String [] MOUNT_LABELS_SHORT = new String[] { "+Jan", + "+Feb+", "+Mar+", "+Apr+", "+May+", "+Jun+", "+Jul+", "+Aug+", + "+Sep+", "+Oct+", "+Nov+", "+Dec+" }; private Locale locale; private TimeZone tZone; private boolean popup; @@ -72,10 +73,32 @@ private String toolTipMode; private String label; private String timeZone; + private String horizontalOffset; + private String verticalOffset; private int zindex; private int counter; + private String cellHeight; + private String cellWidth; + private boolean immediate; + private boolean isDayEnabled; + private boolean showApplyButton; + private boolean showScrollerBar; + private boolean showWeekDaysBar; + private boolean showWeeksBar; + private String todayControlMode; // scroll, select, hidden; public CalendarBean() { + horizontalOffset = "0"; + verticalOffset = "0"; + isDayEnabled = true; + immediate = false; + cellHeight = "15"; + cellWidth = "15"; + showApplyButton = false; + showWeeksBar = false; + showWeekDaysBar = false; + showScrollerBar = false; + todayControlMode = "select"; mode = "client"; label = "Button label"; locale = new Locale("us","US",""); @@ -100,7 +123,96 @@ preloadDateRangeBegin = "10.08.2007"; //d.m.y preloadDateRangeEnd = "11.10.2007"; } + + public String getHorizontalOffset() { + return horizontalOffset; + } + + public void setHorizontalOffset(String horizontalOffset) { + this.horizontalOffset = horizontalOffset; + } + + public String getVerticalOffset() { + return verticalOffset; + } + + public void setVerticalOffset(String verticalOffset) { + this.verticalOffset = verticalOffset; + } + + public boolean getImmediate() { + return immediate; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + + public boolean getIsDayEnabled() { + return isDayEnabled; + } + + public void setIsDayEnabled(boolean isDayEnabled) { + this.isDayEnabled = isDayEnabled; + } + + public String getTodayControlMode() { + return todayControlMode; + } + + public void setTodayControlMode(String todayControlMode) { + this.todayControlMode = todayControlMode; + } + + public String getCellHeight() { + return cellHeight; + } + + public void setCellHeight(String cellHeight) { + this.cellHeight = cellHeight; + } + + public String getCellWidth() { + return cellWidth; + } + + public void setCellWidth(String cellWidth) { + this.cellWidth = cellWidth; + } + + public boolean isShowApplyButton() { + return showApplyButton; + } + + public void setShowApplyButton(boolean showApplyButton) { + this.showApplyButton = showApplyButton; + } + + public boolean isShowScrollerBar() { + return showScrollerBar; + } + + public void setShowScrollerBar(boolean showScrollerBar) { + this.showScrollerBar = showScrollerBar; + } + + public boolean isShowWeekDaysBar() { + return showWeekDaysBar; + } + + public void setShowWeekDaysBar(boolean showWeekDaysBar) { + this.showWeekDaysBar = showWeekDaysBar; + } + + public boolean isShowWeeksBar() { + return showWeeksBar; + } + + public void setShowWeeksBar(boolean showWeeksBar) { + this.showWeeksBar = showWeeksBar; + } + public boolean getRenderedAjax() { if(mode.equalsIgnoreCase("ajax") && rendered) return true; else return false; Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelImpl.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelImpl.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelImpl.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -29,6 +29,9 @@ import java.util.Map; import java.util.Random; +import javax.faces.application.FacesMessage; +import javax.faces.validator.ValidatorException; + import org.richfaces.model.CalendarDataModel; import org.richfaces.model.CalendarDataModelItem; @@ -68,14 +71,21 @@ c.setTime(date); item.setDay(c.get(Calendar.DAY_OF_MONTH));*/ - if (new Random().nextInt(10) > 5) { - item.setEnabled(true); - } else { - item.setEnabled(false); - } +// if (new Random().nextInt(10) > 5) { +// item.setEnabled(true); +// } else { +// item.setEnabled(false); +// } item.setData(data); - + if (date != null) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + int d = calendar.get(Calendar.DATE); + if (d == 7 || d == 15) { + item.setEnabled(false); + } else item.setEnabled(true); + } System.out.println(item.getData() + " " + item.isEnabled()); return item; Modified: branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -32,6 +32,7 @@ Map params = facesContext.getExternalContext().getRequestParameterMap(); String cmdParam = (String) params.get("cmdParam"); if (cmdParam != null) info = cmdParam; + System.out.println(info); return info; } @@ -45,17 +46,18 @@ } public ContextMenu() { - selectOneMenu = "item1"; - inputText = "inputText"; - submitMode = "none"; - event = "oncontextmenu"; - popupWidth = "300px"; - hideDelay = 3; - showDelay = 3; - disableDefaultMenu = true; - rendered = true; - disamble = false; - attached = true; + this.selectOneMenu = "item1"; + this.inputText = "inputText"; + this.submitMode = "none"; + this.event = "oncontextmenu"; + this.popupWidth = "300px"; + this.hideDelay = 3; + this.showDelay = 3; + this.disableDefaultMenu = true; + this.rendered = true; + this.disamble = false; + this.attached = true; + this.info = ""; } public boolean isDisamble() { Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -15,11 +15,19 @@ private String align; private String border; private String width; + private String columns; private String columnsWidth; + private String cellpadding; + private String cellspacing; + private String rows; private boolean r2rendered; private boolean rendered; public DataTable() { + columns = "2"; + cellpadding = "0"; + cellspacing = "0"; + rows = "0"; align = "center"; border = "1"; width = "400px"; @@ -178,4 +186,36 @@ setColumnsWidth("400px"); setWidth("800px"); } + + public String getColumns() { + return columns; + } + + public void setColumns(String columns) { + this.columns = columns; + } + + public String getCellpadding() { + return cellpadding; + } + + public void setCellpadding(String cellpadding) { + this.cellpadding = cellpadding; + } + + public String getCellspacing() { + return cellspacing; + } + + public void setCellspacing(String cellspacing) { + this.cellspacing = cellspacing; + } + + public String getRows() { + return rows; + } + + public void setRows(String rows) { + this.rows = rows; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/dfs/DataFilterSliderDaoImpl.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dfs/DataFilterSliderDaoImpl.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/dfs/DataFilterSliderDaoImpl.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -170,7 +170,8 @@ return lo + i; } - public static String randomstring(int lo, int hi) + @SuppressWarnings("deprecation") + public static String randomstring(int lo, int hi) { int n = rand(lo, hi); byte b[] = new byte[n]; Modified: branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -19,6 +19,7 @@ private String inputStyle; private String tipStyle; private String handleStyle; + private String valueChangeListener; private boolean immediate; private boolean required; private boolean showToolTip; @@ -273,6 +274,11 @@ this.value = value; } + public void valueChangeListener(ValueChangeEvent event) { + valueChangeListener = (String)event.getNewValue(); + System.out.println("valueChangeListener: " + valueChangeListener); + } + public void bTest1(){ setMinValue("0"); setMaxValue("9"); @@ -285,6 +291,7 @@ setShowToolTip(true); setShowBoundaryValues(true); setShowInput(true); + setMaxlength(2); } public void bTest2(){ @@ -298,6 +305,7 @@ setStep("50"); setShowToolTip(false); setShowBoundaryValues(true); + setMaxlength(5); } public void bTest3(){ @@ -311,6 +319,7 @@ setStep("2"); setShowToolTip(false); setShowBoundaryValues(true); + setMaxlength(6); } public void bTest4(){ @@ -324,6 +333,7 @@ setStep("2"); setShowToolTip(false); setShowBoundaryValues(true); + setMaxlength(2); } public void bTest5(){ @@ -337,5 +347,10 @@ setStep("2"); setShowToolTip(false); setShowBoundaryValues(false); + setMaxlength(8); } + + public String getValueChangeListener() { + return valueChangeListener; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -5,7 +5,7 @@ // private String size; // private String controlPosition; private int inputSize; - private int tabindex; + private String tabindex; private String max; private String min; private String value; @@ -156,11 +156,11 @@ this.inputSize = inputSize; } - public int getTabindex() { + public String getTabindex() { return tabindex; } - public void setTabindex(int tabindex) { + public void setTabindex(String tabindex) { this.tabindex = tabindex; } @@ -171,7 +171,7 @@ setMin("0"); setMax("20"); setStep("1"); - setTabindex(2); + setTabindex("2"); setValue("1"); } @@ -182,7 +182,7 @@ setMin("1000"); setMax("99999"); setStep("255"); - setTabindex(5); + setTabindex("5"); setValue("5555"); } @@ -193,7 +193,7 @@ setMin("101"); setMax("202"); setStep("2"); - setTabindex(2); + setTabindex("2"); setValue("102"); } @@ -204,7 +204,7 @@ setMin("33"); setMax("66"); setStep("11"); - setTabindex(3); + setTabindex("3"); setValue("55"); } @@ -215,7 +215,7 @@ setMin("-99999"); setMax("99999"); setStep("33"); - setTabindex(5); + setTabindex("5"); setValue("101"); } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -11,7 +11,6 @@ public class OrderingList{ private ArrayList<String> info; private ArrayList<Data> list; - private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; private String captionLabel; private Collection<Data> selection; private String controlsType; @@ -66,7 +65,7 @@ list.remove(i); else for(int i = list.size() + 1; i <= lenght; i++) - list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5])); + list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), Data.statusIcon[i % 5])); } public OrderingList() { Modified: branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/paint2D/Paint2D.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -27,6 +27,7 @@ private String format; // jpeg|gif|png private String bgcolor; private String border; + private boolean cacheable; private boolean rendered; private boolean style; @@ -47,7 +48,7 @@ } public Paint2D() { - + cacheable = false; width = 400; align = "left"; height = 200; @@ -233,4 +234,12 @@ setTitle("Test5"); //data.setText("Test5!"); } + + public boolean isCacheable() { + return cacheable; + } + + public void setCacheable(boolean cacheable) { + this.cacheable = cacheable; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,14 +1,15 @@ package rich; import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; +import java.util.Set; +import java.util.TreeMap; public class MapComponent { private Map<String, ArrayList<String>> m; public MapComponent() { - m = new HashMap<String, ArrayList<String>>(); + m = new TreeMap<String, ArrayList<String>>(); } public void add(String component, ArrayList<String> path) { @@ -18,4 +19,8 @@ public ArrayList<String> get(String key){ return m.get(key); } + + public Set getSet() { + return m.keySet(); + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,23 +1,30 @@ package rich; import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import javax.faces.model.SelectItem; + import org.richfaces.VersionBean; public class RichBean { + private static final String EXT = ".xhtml"; private String version = VersionBean.SCM_REVISION; private String src; private MapComponent map; private boolean reComponent; private boolean reProperty; private boolean reStraightforward; + private boolean log; //private String [] menu = {"Blank", "Calendar", "DataFilterSlider", "DataScroller", "DataTable", "DragAndDrop", "DropDownMenu", "Effect", "Gmap", "InputNumberSlider", "InputNumberSpinner", "Insert", "Message", "ModalPanel", "Paint2D", "Panel", "Panel2", "PanelBar", "PanelMenu", "Separator", "SimpleTogglePanel", "Spacer", "SuggestionBox", "TabPanel", "TogglePanel", "ToolBar", "Tooltip", "Tree", "VirtualEarth", "ScrollableDataTable", "jQuery", "OrderingList"}; - + public RichBean() { src = "Blank"; reComponent = true; reProperty = true; reStraightforward = true; + log = false; map = new MapComponent(); // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true})); @@ -36,7 +43,6 @@ map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {true, true})); map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {true, true})); map.add("Panel", add("/Panel/Panel", new boolean [] {true, true})); - map.add("Panel2", add("/Panel/Panel2", new boolean [] {false, false})); map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {true, true})); map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {true, true})); map.add("Separator", add("/Separator/Separator", new boolean [] {true, true})); @@ -57,6 +63,7 @@ map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {true, false})); map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true})); map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false})); + map.add("Columns", add("/Columns/Columns", new boolean [] {true, false})); } public String getSrc() { @@ -81,9 +88,9 @@ private ArrayList<String> add(String path, boolean [] arr){ ArrayList<String> list = new ArrayList<String>(); - list.add(path + ".xhtml"); - if(arr[0]) list.add(path + "Property.xhtml"); else list.add("/pages/Blank/BlankProperty.xhtml"); - if(arr[1]) list.add(path + "Straightforward.xhtml"); else list.add("/pages/Blank/BlankStraightforward.xhtml"); + list.add(path + EXT); + if(arr[0]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT); + if(arr[1]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT); return list; } @@ -118,4 +125,22 @@ public void setVersion(String version) { this.version = version; } + + public boolean isLog() { + return log; + } + + public void setLog(boolean log) { + this.log = log; + } + + public List<SelectItem> getList(){ + Iterator<String> iterator = map.getSet().iterator(); + List<SelectItem> list = new ArrayList<SelectItem>(); + while(iterator.hasNext()){ + list.add(new SelectItem(iterator.next())); + } + return list; + } + } Modified: branches/3.1.x/test-applications/facelets/src/main/java/sb/Data.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/sb/Data.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/sb/Data.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -34,4 +34,12 @@ public void setContry(String contry) { this.contry = contry; } + + public String getText() { + return city + " (" + contry + ")"; + } + + public String toString() { + return city + " (" + contry + ")"; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -5,21 +5,21 @@ import java.util.Iterator; import java.util.List; +import org.richfaces.component.html.HtmlSuggestionBox; import org.richfaces.renderkit.html.SuggestionBoxRenderer; public class Sb implements Serializable { private ArrayList cities; private ArrayList data; - private ArrayList tokens; private int first; private int zindex; + private double frequency; private String property; private String rows; private String cellspacing; private String cellpadding; private String minchars; - private String frequency; private String rules; private String border; private String width; @@ -27,7 +27,14 @@ private String shadowOpacity; private String bgColor; private String shadowDepth; + private Object tokens; private boolean focus; + private boolean ajaxSingle; + private boolean rendered; + private boolean selfRendered; + private String value; + private String dir; + private int requestDelay; /* * private static final String[] cit = { "Abba", "Abbeville", "Acworth", @@ -50,6 +57,13 @@ public Sb() { + dir = "LTR"; + ajaxSingle = false; + rendered = true; + selfRendered = false; + value = "a, "; + requestDelay = 100; + tokens = "[ ,"; border = "1"; width = "200"; height = "150"; @@ -62,7 +76,7 @@ cellspacing = "2"; cellpadding = "2"; minchars = "1"; - frequency = "0"; + frequency = 0; rules = "none"; setCities(getAllData()); } @@ -162,15 +176,11 @@ this.first = first; } - public String getFrequency() { + public double getFrequency() { return frequency; } - public double getDoubleFrequency() { - return Double.parseDouble(getFrequency()); - } - - public void setFrequency(String frequency) { + public void setFrequency(double frequency) { this.frequency = frequency; } @@ -202,14 +212,6 @@ this.rules = rules; } - public ArrayList getTokens() { - return tokens; - } - - public void setTokens(ArrayList tokens) { - this.tokens = tokens; - } - public void OnSelect() { System.out.print("Onselect works!!!"); } @@ -282,7 +284,7 @@ setBorder("2"); setCellpadding("0"); setCellspacing("0"); - setFrequency("0"); + setFrequency(0); setHeight("150"); setWidth("200"); setMinchars("1"); @@ -295,7 +297,7 @@ setBorder("0"); setCellpadding("3"); setCellspacing("3"); - setFrequency("2"); + setFrequency(2); setHeight("200"); setWidth("200"); setMinchars("1"); @@ -308,7 +310,7 @@ setBorder("1"); setCellpadding("5"); setCellspacing("0"); - setFrequency("1"); + setFrequency(1); setHeight("150"); setWidth("200"); setMinchars("2"); @@ -321,7 +323,7 @@ setBorder("1"); setCellpadding("0"); setCellspacing("5"); - setFrequency("3"); + setFrequency(3); setHeight("150"); setWidth("200"); setMinchars("2"); @@ -334,7 +336,7 @@ setBorder("4"); setCellpadding("1"); setCellspacing("1"); - setFrequency("5"); + setFrequency(5); setHeight("200"); setWidth("400"); setMinchars("2"); @@ -342,4 +344,64 @@ setShadowOpacity("5"); setZindex(1); } + + public void setTokens(String tokens) { + this.tokens = tokens; + } + + public Object getTokens() { + return tokens; + } + + public void setTokens(Object tokens) { + this.tokens = tokens; + } + + public boolean isAjaxSingle() { + return ajaxSingle; + } + + public void setAjaxSingle(boolean ajaxSingle) { + this.ajaxSingle = ajaxSingle; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public boolean isSelfRendered() { + return selfRendered; + } + + public void setSelfRendered(boolean selfRendered) { + this.selfRendered = selfRendered; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public int getRequestDelay() { + return requestDelay; + } + + public void setRequestDelay(int requestDelay) { + this.requestDelay = requestDelay; + } + + public String getDir() { + return dir; + } + + public void setDir(String dir) { + this.dir = dir; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,20 +1,157 @@ package scrollableDataTable; import java.util.ArrayList; -import java.util.Random; -import dataScroller.Data; +import org.ajax4jsf.model.DataComponentState; +import org.richfaces.model.selection.Selection; +import util.data.Data; + + +/** + * @author AYanul + * + */ public class ScrollableDataTable { private ArrayList<Data> data; - private String [] status = {"error", "fatal", "info", "passed", "warn"}; - private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; private String width; private int rows; private String key; private boolean hideWhenScrolling; + private int dataLength; + private int frozenColCount; + private int first; + private boolean rendered; + private String timeout; + private String height; + private boolean limitToList; + private DataComponentState componentState; + private boolean bypassUpdates; + private boolean ignoreDupResponses; + private String eventsQueue; + private String activeRowKey; + private Selection selection; + private boolean ajaxSingle; + + public ScrollableDataTable() { + width = "400px"; + rows = 30; + hideWhenScrolling = false; + dataLength = 40; + data = new ArrayList<Data>(); + first = 0; + rendered = true; + timeout = "10"; + height = "400px"; + limitToList = false; + bypassUpdates = false; + ignoreDupResponses = false; + ajaxSingle = false; + addNewItem(); + } + + public Selection getSelection() { + return selection; + } + + public void setSelection(Selection selection) { + this.selection = selection; + } + + public int getFrozenColCount() { + return frozenColCount; + } + + public void setFrozenColCount(int frozenColCount) { + this.frozenColCount = frozenColCount; + } + + public int getFirst() { + return first; + } + + public void setFirst(int first) { + this.first = first; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public String getTimeout() { + return timeout; + } + + public void setTimeout(String timeout) { + this.timeout = timeout; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public boolean isLimitToList() { + return limitToList; + } + + public void setLimitToList(boolean limitToList) { + this.limitToList = limitToList; + } + + public DataComponentState getComponentState() { + return componentState; + } + + public void setComponentState(DataComponentState componentState) { + this.componentState = componentState; + } + + public boolean isBypassUpdates() { + return bypassUpdates; + } + + public void setBypassUpdates(boolean bypassUpdates) { + this.bypassUpdates = bypassUpdates; + } + + public boolean isIgnoreDupResponses() { + return ignoreDupResponses; + } + + public void setIgnoreDupResponses(boolean ignoreDupResponses) { + this.ignoreDupResponses = ignoreDupResponses; + } + + public String getEventsQueue() { + return eventsQueue; + } + + public void setEventsQueue(String eventsQueue) { + this.eventsQueue = eventsQueue; + } + + public String getActiveRowKey() { + return activeRowKey; + } + + public void setActiveRowKey(String activeRowKey) { + this.activeRowKey = activeRowKey; + } + + public String getKey() { + return key; + } + public boolean isHideWhenScrolling() { return hideWhenScrolling; } @@ -22,20 +159,17 @@ public void setHideWhenScrolling(boolean hideWhenScrolling) { this.hideWhenScrolling = hideWhenScrolling; } - - public ScrollableDataTable() { - width = "400px"; - rows = 30; - hideWhenScrolling = false; - - data = new ArrayList<Data>(); - int k; - for(int i = 0; i < 10000; i++) { - k = new Random().nextInt(5); - data.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[k], statusIcon[k])); - } + + public void addNewItem() { + if(dataLength < 0) dataLength = 0; + if(data.size() > dataLength) + for(int i = dataLength; i < data.size(); ) + data.remove(i); + else + for(int i = data.size() + 1; i <= dataLength; i++) + data.add(new Data(i, "Text " + i, "Link " + i, "select" +(i % 5), Data.statusIcon[i % 5])); } - + public ArrayList<Data> getData() { return data; } @@ -63,4 +197,20 @@ public void setKey(String key) { this.key = key; } + + public int getDataLength() { + return dataLength; + } + + public void setDataLength(int dataLength) { + this.dataLength = dataLength; + } + + public boolean isAjaxSingle() { + return ajaxSingle; + } + + public void setAjaxSingle(boolean ajaxSingle) { + this.ajaxSingle = ajaxSingle; + } } \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -3,17 +3,14 @@ public class Spacer { private String width; - private String height; - private String style; - private String btn; - + private String title; private boolean rendered; public Spacer() { - + title = "title text"; height = "50px"; width = "300px"; rendered = true; @@ -97,4 +94,12 @@ setHeight("400"); setWidth("200"); } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/tooltip/Tooltip.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -8,12 +8,23 @@ private int horizontalOffset; private int verticalOffset; private int delay; + private int hideDelay; + private int showDelay; private String value; private String mode; private String direction; private String style; private String layout; + private String event; + public String getEvent() { + return event; + } + + public void setEvent(String event) { + this.event = event; + } + public String getLayout() { return layout; } @@ -23,6 +34,9 @@ } public Tooltip() { + event = "onmouseover"; + showDelay = 100; + hideDelay = 10; followMouse = false; rendered = true; disabled = false; @@ -180,4 +194,20 @@ setValue("Test5"); setRendered(true); } + + public int getHideDelay() { + return hideDelay; + } + + public void setHideDelay(int hideDelay) { + this.hideDelay = hideDelay; + } + + public int getShowDelay() { + return showDelay; + } + + public void setShowDelay(int showDelay) { + this.showDelay = showDelay; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,7 +1,10 @@ package util.data; public class Data { - public static final String[] cityAfrica = {"Africa", "Algeria", "Angola", "Bassas da India", "Benin", "Botswana", "Burkina Faso", "Burundi", "Cameroon", "Central African Republic", "Chad", "Comoros", "Democratic Republic of the Congo", "Djibouti", "Egypt", "Equatorial Guinea", "Eritrea", "Ethiopia", "Europa Island", "Gabon", "Gambia", "Ghana", "Glorioso Islands", "Guinea", "Guinea-Bissau", "Ivory Coast", "Juan de Nova Island", "Kenya", "Lesotho", "Liberia", "Libya", "Madagascar", "Malawi", "Mali", "Mauritania", "Mauritius Island", "Mayotte", "Morocco", "Mozambique", "Namibia", "Niger", "Nigeria", "Republic of the Congo", "Reunion", "Rwanda", "Saint Helena", "Sao Tome and Principe", "Senegal", "Seychelles", "Sierra Leone", "Somalia", "South Africa", "Sudan", "Swaziland", "Tanzania", "Togo", "Tromelin Island", "Tunisia", "Uganda", "Western Sahara", "Zambia", "Zimbabwe"}; + public static final String[] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; + public static final String[] status = {"error", "fatal", "info", "passed", "warn"}; + + public static final String[] cityAfrica = {"Africa", "Algeria", "Angola", "Bassas da India", "Benin", "Botswana", "Burkina Faso", "Burundi", "Cameroon", "Central African Republic", "Chad", "Comoros", "Democratic Republic of the Congo", "Djibouti", "Egypt", "Equatorial Guinea", "Eritrea", "Ethiopia", "Europa Island", "Gabon", "Gambia", "Ghana", "Glorioso Islands", "Guinea", "Guinea-Bissau", "Ivory Coast", "Juan de Nova Island", "Kenya", "Lesotho", "Liberia", "Libya", "Madagascar", "Malawi", "Mali", "Mauritania", "Mauritius Island", "Mayotte", "Morocco", "Mozambique", "Namibia", "Niger", "Nigeria", "Republic of the Congo", "Reunion", "Rwanda", "Saint Helena", "Sao Tome and Principe", "Senegal", "Seychelles", "Sierra Leone", "Somalia", "South Africa", "Sudan", "Swaziland", "Tanzania", "Togo", "Tromelin Island", "Tunisia", "Uganda", "Western Sahara", "Zambia", "Zimbabwe"}; public static final String[] cityAsia = {"Asia", "Afghanistan", "Armenia", "Azerbaijan", "Bangladesh", "Bhutan", "China", "Georgia", "India", "Japan", "Kazakhstan", "Korea, North", "Korea, South", "Kyrgyzstan", "Maldives", "Mongolia", "Nepal", "Pakistan", "Russia", "Sri Lanka", "Tajikistan", "Turkmenistan", "Uzbekistan"}; public static final String[] cityCAmerica = {"Central America", "Belize", "Costa Rica", "El Salvador", "Guatemala", "Honduras", "Nicaragua", "Panama"}; public static final String[] cityEurope = {"Europe", "Albania", "Andorra", "Austria", "Belarus", "Belgium", "Bosnia and Herzegovina", "Bulgaria", "Canary Islands", "Croatia", "Czech Republic", "Denmark", "Estonia", "Faroe Islands", "Finland", "France", "Germany", "Gibraltar", "Greece", "Guernsey", "Hungary", "Iceland", "Ireland", "Isle of Man", "Italy", "Jersey", "Latvia", "Liechtenstein", "Lithuania", "Luxembourg", "Macedonia", "Malta", "Moldova", "Monaco", "Montenegro", "Netherlands", "Norway", "Poland", "Portugal", "Romania", "San Marino", "Serbia and Montenegro", "Slovakia", "Slovenia", "Spain", "Sweden", "Switzerland", "Ukraine", "United Kingdom", "Vatican The Holy See"}; Modified: branches/3.1.x/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTracker.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTracker.java 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTracker.java 2008-01-22 08:44:45 UTC (rev 5527) @@ -21,7 +21,7 @@ * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent) */ public void afterPhase(PhaseEvent arg0) { - //System.out.println("PhaseTracker.afterPhase()" + arg0.getPhaseId()); + System.out.println("PhaseTracker.afterPhase()" + arg0.getPhaseId()); } /* (non-Javadoc) Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,94 +1,97 @@ -<f:subview id="calendarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:messages /> - <rich:messages showDetail="true"></rich:messages> - - <h:panelGrid columns="2"> - <h:outputText value="Client mode" rendered="#{calendarBean.renderedClient}" /> - <h:outputText value="Ajax mode" rendered="#{calendarBean.renderedAjax}"/> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarSubviewID"> - <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" - popup="#{calendarBean.popup}" preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" datePattern="#{calendarBean.pattern}" - weekDayLabels="#{calendarBean.weekDayLabels}" weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - monthLabels="#{calendarBean.monthLabels}" monthLabelsShort="#{calendarBean.monthLabelsShort}" - value="#{calendarBean.selectedDate}" currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" - direction="#{calendarBean.direction}" enableManualInput="#{calendarBean.enableManualInput}" - showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" - buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedClient}" - focus="popupModeID" mode="client" required="#{calendarBean.required}" requiredMessage="Required Message" - timeZone="#{calendarBean.tmZone}"> - <f:facet name="weekDay"> - <f:verbatim> - <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> - </f:verbatim> - </f:facet> + <h:messages /> + <rich:messages showDetail="true"></rich:messages> - <f:facet name="optionalHeader"> - <h:outputText value="optionalHeader Facet #{headerFacet}" /> - </f:facet> + <h:panelGrid columns="2"> + <h:outputText value="Client mode" rendered="#{calendarBean.renderedClient}" /> + <h:outputText value="Ajax mode" rendered="#{calendarBean.renderedAjax}" /> - <f:facet name="optionalFooter"> - <h:outputText value="optionalFooter Facet" /> - </f:facet> + <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" + inputClass="ic" buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" + rendered="#{calendarBean.renderedClient}" focus="popupModeID" mode="client" required="#{calendarBean.required}" + requiredMessage="Required Message" timeZone="#{calendarBean.tmZone}" cellHeight="#{calendarBean.cellHeight}" + cellWidth="#{calendarBean.cellWidth}" showApplyButton="#{calendarBean.showApplyButton}" + showScrollerBar="#{calendarBean.showScrollerBar}" showWeekDaysBar="#{calendarBean.showWeekDaysBar}" + showWeeksBar="#{calendarBean.showWeeksBar}" todayControlMode="#{calendarBean.todayControlMode}" + immediate="#{calendarBean.immediate}"> + <f:facet name="weekDay"> + <f:verbatim> + <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> + </f:verbatim> + </f:facet> - <f:validator validatorId="org.richfaces.CalendarValidator" /> + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> - <h:panelGrid columns="2"> - <f:verbatim> - <span style="padding: 2px;">{day}</span> - </f:verbatim> - <h:panelGrid> - <h:outputText styleClass="smallText" value="{data.enLabel}" /> - <h:outputText styleClass="smallText" value="{data.frLabel}" /> - <h:outputText styleClass="smallText" value="{data.deLabel}" /> - </h:panelGrid> + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> + + <f:validator validatorId="org.richfaces.CalendarValidator" /> + + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> </h:panelGrid> - </rich:calendar> - - <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" - popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" - monthLabelsShort="#{calendarBean.monthLabelsShort}" value="#{calendarBean.selectedDate}" - currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" direction="#{calendarBean.direction}" - enableManualInput="#{calendarBean.enableManualInput}" showInput="#{calendarBean.showInput}" - buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" - buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedAjax}" - focus="popupModeID" mode="ajax" required="#{calendarBean.required}" requiredMessage="Required Message" - timeZone="#{calendarBean.tmZone}"> - <f:facet name="weekDay"> - <f:verbatim> - <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> - </f:verbatim> - </f:facet> + </h:panelGrid> + </rich:calendar> - <f:facet name="optionalHeader"> - <h:outputText value="optionalHeader Facet" /> - </f:facet> + <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" + boundaryDatesMode="#{calendarBean.boundary}" currentDateChangeListener="#{calendarBean.dcl}" + valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" buttonClass="bc" + ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" buttonIconDisabled="#{icon.iconFileManagerReject}" + disabled="#{calendarBean.disabled}" bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" + toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedAjax}" focus="popupModeID" mode="ajax" + required="#{calendarBean.required}" requiredMessage="Required Message" timeZone="#{calendarBean.tmZone}"> + <f:facet name="weekDay"> + <f:verbatim> + <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> + </f:verbatim> + </f:facet> - <f:facet name="optionalFooter"> - <h:outputText value="optionalFooter Facet" /> - </f:facet> + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> - <f:validator validatorId="org.richfaces.CalendarValidator" /> + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> - <h:panelGrid columns="2"> - <f:verbatim> - <span style="padding: 2px;">{day}</span> - </f:verbatim> - <h:panelGrid> - <h:outputText styleClass="smallText" value="{data.enLabel}" /> - <h:outputText styleClass="smallText" value="{data.frLabel}" /> - <h:outputText styleClass="smallText" value="{data.deLabel}" /> - </h:panelGrid> + <f:validator validatorId="org.richfaces.CalendarValidator" /> + + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> </h:panelGrid> - </rich:calendar> - </h:panelGrid> + </h:panelGrid> + </rich:calendar> + </h:panelGrid> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,13 +1,16 @@ -<f:subview id="calendarPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="calendarPropertyID" switchType="client" opened="true" label="calendar property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarPropertySubviewID"> + <h:panelGrid columns="2"> - - <h:outputText value="Mode" /> + <h:panelGroup> + <a4j:commandButton value="reRender" reRender="calendarClientID,calendarAjaxID"></a4j:commandButton> + <a4j:commandButton reRender="calendarClientID,calendarAjaxID" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> + <h:commandButton action="submit();" value="submit();" /> + <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> + </h:panelGroup> + <h:column></h:column> + + <h:outputText value="Mode:" /> <h:selectOneRadio value="#{calendarBean.mode}" onchange="submit();"> <f:selectItem itemLabel="client" itemValue="client"/> <f:selectItem itemLabel="ajax" itemValue="ajax"/> @@ -15,7 +18,7 @@ <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" valueChangeListener="#{calendarBean.selectLocale}"> + <h:selectOneRadio onchange="submit()" value="en/US" valueChangeListener="#{calendarBean.selectLocale}"> <f:selectItem itemLabel="US" itemValue="en/US" /> <f:selectItem itemLabel="DE" itemValue="de/DE" /> <f:selectItem itemLabel="FR" itemValue="fr/FR" /> @@ -23,22 +26,45 @@ </h:selectOneRadio> <h:outputText value="Popup Mode:" /> - <h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}" onclick="submit()" /> + <h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}" onclick="submit();" /> + + <h:outputText value="showApplyButton: "></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.showApplyButton}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="showScrollerBar: "></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.showScrollerBar}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="showWeeksBar: "></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.showWeeksBar}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="showWeekDaysBar: "></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.showWeekDaysBar}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="cellHeight: "></h:outputText> + <h:inputText value="#{calendarBean.cellHeight}" onchange="submit();"></h:inputText> + + <h:outputText value="cellWidth: "></h:outputText> + <h:inputText value="#{calendarBean.cellWidth}" onchange="submit();"></h:inputText> <h:outputText value="Custom day labels" /> - <h:selectOneRadio value="#{calendarBean.weekDay}"> + <h:selectOneRadio value="#{calendarBean.todayControlMode}" onchange="submit();"> + <f:selectItem itemLabel="scroll" itemValue="scroll" /> + <f:selectItem itemLabel="select" itemValue="select" /> + <f:selectItem itemLabel="hidden" itemValue="hidden" /> + </h:selectOneRadio> + + <h:outputText value="Custom day labels" /> + <h:selectOneRadio value="#{calendarBean.weekDay}" onchange="submit();"> <f:selectItem itemLabel="none" itemValue="none" /> <f:selectItem itemLabel="day labels" itemValue="long" /> <f:selectItem itemLabel="day labels short" itemValue="short" /> - <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Custom month labels" /> - <h:selectOneRadio value="#{calendarBean.month}"> + <h:selectOneRadio value="#{calendarBean.month}" onchange="submit();"> <f:selectItem itemLabel="none" itemValue="none" /> <f:selectItem itemLabel="day labels" itemValue="long" /> <f:selectItem itemLabel="day labels short" itemValue="short" /> - <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Select Date Pattern:" /> @@ -64,6 +90,15 @@ <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> + <h:outputText value="horizontalOffset: "></h:outputText> + <h:inputText value="#{calendarBean.horizontalOffset}" onchange="submit();"></h:inputText> + + <h:outputText value="verticalOffset:"></h:outputText> + <h:inputText value="#{calendarBean.verticalOffset}" onchange="submit();"></h:inputText> + + <h:outputText value="immediate: "></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.immediate}"></h:selectBooleanCheckbox> + <h:outputText value="reRender (counter):" /> <h:outputText id="counter" value="#{calendarBean.counter}" /> @@ -135,5 +170,21 @@ <f:verbatim></f:verbatim> <h:commandButton value="Submit" /> </h:panelGrid> - </rich:simpleTogglePanel> + + <h:panelGrid columns="3"> + <h:column></h:column> + <h:outputText value="JavaScript API"></h:outputText> + <h:column></h:column> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.doExpand(event)" value="expand"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.nextMonth()" value="nextMonth"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.prevMonth()" value="prevMonth"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.nextYear()" value="nextYear"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.prevYear()" value="prevYear"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.today()" value="today"></a4j:commandLink> + <a4j:commandLink onclick="alert($('formID:calendarSubviewID:calendarClientID').component.getSelectedDate(new Data().setFullYear(2010,0,14)))" value="getSelectedDate"></a4j:commandLink> + <a4j:commandLink onclick="alert($('formID:calendarSubviewID:calendarClientID').component.isDateEnabled(new Data()))" value="isDateEnabled"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.selectDate(new Data())" value="selectDate"></a4j:commandLink> + <a4j:commandLink onclick="alert($('formID:calendarSubviewID:calendarClientID').component.getCurrentMonth())" value="getCurrentMonth"></a4j:commandLink> + <a4j:commandLink onclick="alert($('formID:calendarSubviewID:calendarClientID').component.getCurrentYear())" value="getCurrentYear"></a4j:commandLink> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="calendarStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="calendar straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{calendarBean.bTest1}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{calendarBean.bTest5}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5Calendar}" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,5 @@ -<f:subview id="componentControlSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <h:form> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="componentControlSubviewID"> <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> <h:outputLink id="hideButton1ID" onclick="return false;" value="#"> <f:verbatim>Close 1</f:verbatim> @@ -20,61 +19,19 @@ <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide" params="hide:'componentControl work(hide)'" /> - <ui:remove> - <f:verbatim> - <br /> - <br /> - </f:verbatim> - - <rich:panelMenu id="ccPanelMenuID" mode="client"> - <rich:panelMenuGroup label="group1"> - <rich:panelMenuGroup label="group1 1"> - <rich:panelMenuItem label="Item 1 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1 2"></rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenu> - - <rich:componentControl attachTo="testPMID" for="ccPanelMenuID" event="onclick" operation="doCollapse" /> - - <a href="#" id="testPMID" onclick="return false;">Click text</a> - </ui:remove> - <f:verbatim> <br /> <br /> </f:verbatim> - <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" /> + <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" mode="ajax" /> <h:panelGrid columns="2"> <h:outputText value="popup calendar" /> <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" /> </h:panelGrid> +<a onclick="$('j_id_jsp_362828066_1:componentControlSubviewID:ccCalendarID').component.Expand()" href="#">Show</a> - <f:verbatim> - <br /> - <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a> - <br /> - <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a> - <br /> - <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a> - <br /> - <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a> - <br /> - <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a> - <br /> - <a href="#" id="doTodayCalendarID">Calendar (today)</a> - </f:verbatim> - <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" /> - <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" /> - <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" /> - <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" /> - <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" /> - <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" /> - <f:verbatim> <br /> <br /> @@ -84,21 +41,19 @@ <h:outputText value="click text" /> </rich:panelMenu> - <rich:contextMenu id="ccContextMenuID" submitMode="ajax"> - <rich:menuItem icon="/pics/header.png" value="tab1" reRender="cmInfoID"> - <f:param name="cmdParam" value="menu" /> + <rich:contextMenu id="ccContextMenuID" submitMode="ajax" onexpand="alert(event.parameters.expand)"> + <rich:menuItem icon="/pics/header.png" value="tab1"> </rich:menuItem> <rich:menuSeparator /> - <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID"> - <f:param name="cmdParam" value="a" /> + <rich:menuItem icon="/pics/info.gif" value="a"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value=" b" reRender="cmInfoID"> - <f:param name="cmdParam" value="b" /> + <rich:menuItem icon="/pics/info.gif" value="b"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="c" reRender="cmInfoID"> - <f:param name="cmdParam" value="c" /> + <rich:menuItem icon="/pics/info.gif" value="c"> </rich:menuItem> </rich:contextMenu> - <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="doShow" /> - </h:form> + <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" + operation="show" params="expand:'show work'" /> + + </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,11 +1,14 @@ -<f:subview id="contextMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="contextMenuSubviewID"> <h:panelGrid columns="2"> <rich:panel style="width: 130px; height: 50px; background-color: #98FB98;"> <h:outputText value="panel with contextMenu(DEFAULT)" /> <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}"> <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID"> <f:param name="cmdParam" value="abc" /> + </rich:menuItem> + <rich:menuItem icon="/pics/header.png" value="JSAPI Hide" onclick="$('formID:contextMenuSubviewID:contextMenuDefaultID').component.doHide()" reRender="cmInfoID"> + <f:param name="cmdParam" value="hide" /> </rich:menuItem> <rich:menuSeparator /> <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID"> @@ -35,14 +38,16 @@ </rich:menuItem> </rich:menuGroup> </rich:contextMenu> + <a4j:commandLink onclick="$('formID:contextMenuSubviewID:contextMenuDefaultID').component.doShow()" value="JSAPI Show"></a4j:commandLink> </rich:panel> + <rich:panel style="width: 130px; height: 50px; background-color: #98FB98;"> <h:outputText value="panel with contextMenu(Test)" /> <rich:contextMenu id="contextMenuID" attached="#{contextMenu.attached}" submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" rendered="#{contextMenu.rendered}" hideDelay="#{contextMenu.hideDelay}" showDelay="#{contextMenu.showDelay}" popupWidth="#{contextMenu.popupWidth}"> - <rich:menuItem icon="/pics/header.png" value="abc"> + <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID"> <f:param name="cmdParam" value="abc" /> </rich:menuItem> <rich:menuSeparator /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,6 @@ -<f:subview id="contextMenuPropertySubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="contextMenuPropertySubviewID"> + <a4j:commandButton value="reRender" reRender="cmInfoID"></a4j:commandButton> <a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> <h:commandButton action="submit();" value="submit();" /> @@ -30,11 +30,10 @@ </h:inputText> <h:outputText value="submitMode:" /> - <h:selectOneRadio value="#{contextMenu.submitMode}"> + <h:selectOneRadio value="#{contextMenu.submitMode}" onchange="submit();"> <f:selectItem itemLabel="none" itemValue="none" /> <f:selectItem itemLabel="server" itemValue="server" /> <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onchange" action="submit();"></a4j:support> </h:selectOneRadio> <h:outputText value="attached" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,27 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> -<head> -<link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" type="text/css" /> -</head> - +<html> <f:view> - <h:form id="test"> -<rich:tabPanel switchType="ajax"> + <head> + </head> + <body> + <h:form id="test"> -<rich:tab label="Sample 1"> -<h:outputText value="1"></h:outputText> -<h:inputText value="#{dDMenu.mode}" required="true" /> -</rich:tab> - -<rich:tab label="Sample 2"> -<a4j:support event="ontabenter"></a4j:support> -<h:outputText value="2"></h:outputText> -<h:inputText value="#{dDMenu.mode}"></h:inputText> -</rich:tab> - -</rich:tabPanel> - </h:form> + </h:form> + </body> </f:view> -</html> \ No newline at end of file +</html> + Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="dataDefinitionListSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListSubviewID"> <rich:dataDefinitionList id="ddListID" value="#{dataDefinitionList.arr}" var="arr" first="#{dataDefinitionList.first}" rendered="#{dataDefinitionList.rendered}" title="#{dataDefinitionList.title}" dir="#{dataDefinitionList.dir}" rows="#{dataDefinitionList.rows}"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="dataDefinitionListPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="title" /> <h:inputText value="#{dataDefinitionList.title}" > Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,6 @@ -<f:subview id="dataFilterSliderSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderSubviewID"> + <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" for="carList" forValRef="inventoryList.carInventory" filterBy="getMileage" manualInput="true" onSlide="true" onChange="true" storeResults="true" trackStyleClass="track" width="400px" styleClass="slider-container" startRange="10000" endRange="60000" Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="dataFilterSliderPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Rendered:" /> <h:selectBooleanCheckbox value="#{dfs.rendered}" > Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,7 +1,7 @@ -<f:subview id="dataOrderedListSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataOrderedListSubviewID"> <rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}" - rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="disc" dir="#{dataOrderedList.dir}" + rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}" rows="#{dataOrderedList.rows}"> <f:facet name="header"> <h:outputText value="Africa(header):" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="dataOrderedListPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataOrderedListPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="title" /> <h:inputText value="#{dataOrderedList.title}" > Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="DataScrollerSubviewID" - xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataScrollerSubviewID"> <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" var="dT" cellpadding="5px" rows="5" border="1"> <f:facet name="header"> @@ -13,12 +9,12 @@ renderIfSinglePage="#{dataScroller.renderIfSinglePage}" maxPages="#{dataScroller.maxPages}" scrollerListener="#{dataScroller.ScrollerListener}" - onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" - onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/> + onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"/> </f:facet> <h:column> <h:outputText value="#{dT.data0}" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,12 +1,6 @@ -<f:subview id="datascrollerPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="dTablePropertyID" switchType="client" opened="true" - label="datascroller property"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="datascrollerPropertySubviewID"> + <h:commandButton action="#{dataScroller.CutArray}" value="CutArray" /> <h:commandButton action="#{dataScroller.RestoreArray}" value="RestoreArray" /> @@ -45,5 +39,4 @@ <a4j:support event="onclick" reRender="dataTableId"></a4j:support> </h:selectOneRadio> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,11 +1,5 @@ -<f:subview id="datascrollerStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" - label="datascroller straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="datascrollerStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataScroller.bTest1}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> @@ -27,5 +21,4 @@ <a4j:commandButton action="#{dataScroller.bTest5}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5DataScroller}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,14 +1,14 @@ -<f:subview id="DataTableSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataTableSubviewID"> <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" onRowClick="showEvent('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" - onRowDblClick="print('onRowDblClickInputID', 'onRowDblClick work!')" - onRowMouseDown="print('onRowMouseDownInputID', 'onRowMouseDown work!')" - onRowMouseMove="print('onRowMouseMoveInputID', 'onRowMouseMove work!')" - onRowMouseOut="print('onRowMouseOutInputID', 'onRowMouseOut work!')" - onRowMouseOver="print('onRowMouseOverInputID', 'onRowMouseOver work!')" - onRowMouseUp="print('onRowMouseUpInputID', 'onRowMouseUp 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!')"> <f:facet name="caption"> <h:outputText value="caption facet" /> </f:facet> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="dataTablePropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="dtPropertyID" switchType="client" opened="true" label="dataTable property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataTablePropertySubviewID"> <h:panelGrid columns="2" style="top"> <h:outputText value="Align:"></h:outputText> <h:selectOneMenu value="#{dataTable.align}"> @@ -35,5 +30,4 @@ <h:outputText value=" row 2 rendered" /> <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" onclick="submit();" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="StraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="StraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataTable.bTest1}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{dataTable.bTest5}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> <h:outputText value="#{msg.t5DataTable}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,7 +1,11 @@ -<f:subview id="DtadAndDropSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListSubviewID"> + + <a4j:outputPanel ajaxRendered="true"> + <h:messages /> + </a4j:outputPanel> - <script type="text/javascript"> + <script> DnD.CLIENT_VALIDATION_OFF = false; </script> @@ -14,9 +18,9 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drag1"> <h:outputText value="#{type} - drag" /> - <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}"> + <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}"> </rich:dragSupport> </h:panelGrid> </h:column> @@ -26,10 +30,10 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drop2"> <h:outputText value="#{type} - drop" /> - <rich:dropSupport reRender="dragValueText" ondragenter="print('InputID', ' work!')" ondragexit="print('InputID', ' work!')" - ondrop="print('InputID', ' work!')" ondropend="print('InputID', ' work!')" - oncomplete="print('oncompleteInputID', 'oncomplete work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')" + <rich:dropSupport reRender="dragValueText" ondragenter="showEvent('InputID', ' work!')" ondragexit="showEvent('InputID', ' work!')" + ondrop="showEvent('InputID', ' work!')" ondropend="showEvent('InputID', ' work!')" + oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')" action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value"> </rich:dropSupport> </h:panelGrid> @@ -72,10 +76,10 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid1"> <f:verbatim>Accepts file and folder... Customizes</f:verbatim> <rich:dropSupport id="zone1" - oncomplete="print('oncompleteInputID', 'oncomplete work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')" - ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondropend="print('ondropendInputID', 'ondropend work!')" - ondrop="print('ondropInputID', 'ondrop work!')" + oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')" ondragenter="showEvent('ondragenterInputID', 'ondragenter work!')" + ondragexit="showEvent('ondragexitInputID', 'ondragexit work!')" ondropend="showEvent('ondropendInputID', 'ondropend work!')" + ondrop="showEvent('ondropInputID', 'ondrop work!')" acceptedTypes="file, folder" typeMapping="{file: testDrop}"> <rich:dndParam name="testDrop"> <h:graphicImage height="16" width="16" @@ -92,11 +96,11 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid3"> <f:verbatim>Accepts none... Customizes</f:verbatim> - <rich:dropSupport typeMapping="{file: testDrop}" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragenter="print('ondragenterInputID', 'ondragenter work!')" - ondragexit="print('ondragexitInputID', 'ondragexit work!')" - ondrop="print('ondropInputID', 'ondrop work!')" ondropend="print('ondropendInputID', 'ondropend work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dropSupport typeMapping="{file: testDrop}" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragenter="showEvent('ondragenterInputID', 'ondragenter work!')" + ondragexit="showEvent('ondragexitInputID', 'ondragexit work!')" + ondrop="showEvent('ondropInputID', 'ondrop work!')" ondropend="showEvent('ondropendInputID', 'ondropend work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="testDrop"> <h:graphicImage height="16" width="16" value="#{icon.iconFileManagerReject}" /> </rich:dndParam> @@ -105,19 +109,19 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid4"> <f:verbatim>Accepts file and folder</f:verbatim> - <rich:dropSupport acceptedTypes="file, folder" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragenter="print('ondragenterInputID', 'ondragenter work!')" - ondragexit="print('ondragexitInputID', 'ondragexit work!')" - ondrop="print('ondropInputID', 'ondrop work!')" ondropend="print('ondropendInputID', 'ondropend work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dropSupport acceptedTypes="file, folder" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragenter="showEvent('ondragenterInputID', 'ondragenter work!')" + ondragexit="showEvent('ondragexitInputID', 'ondragexit work!')" + ondrop="showEvent('ondropInputID', 'ondrop work!')" ondropend="showEvent('ondropendInputID', 'ondropend work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="testDrop" value="testDropValue" /> </rich:dropSupport> </h:panelGrid> <h:panelGrid id="grid5"> - <rich:dragSupport dragType="file" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> </rich:dragSupport> @@ -125,9 +129,9 @@ </h:panelGrid> <h:panelGrid id="grid6"> - <rich:dragSupport dragType="file" dragIndicator="indicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" dragIndicator="indicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> </rich:dragSupport> @@ -135,9 +139,9 @@ </h:panelGrid> <h:panelGrid id="grid7"> - <rich:dragSupport dragType="folder" dragIndicator="indicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="folder" dragIndicator="indicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> </rich:dragSupport> @@ -147,9 +151,9 @@ <h:outputText /> <h:panelGrid id="grid8"> - <rich:dragSupport dragType="folder" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="folder" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> </rich:dragSupport> @@ -157,9 +161,9 @@ </h:panelGrid> <h:panelGrid id="grid9"> - <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="testDrag" value="testDragValue" /> <rich:dndParam name="marker" value="testMarkerValue" /> <rich:dndParam name="label" value="testDragValue" /> @@ -168,9 +172,9 @@ </h:panelGrid> <h:panelGrid id="grid10"> - <rich:dragSupport dragType="folder" dragIndicator="defaultIndicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="folder" dragIndicator="defaultIndicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="testDragValue for Folder" /> </rich:dragSupport> <f:verbatim>Folder Draggable with defaultIndicator</f:verbatim> @@ -179,9 +183,9 @@ </h:panelGrid> <h:panelGrid id="renderedId"> - <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - onsubmit="print('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" + onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="marker" value="testMarkerValue" /> <rich:dndParam name="label" value="testDragValue" /> </rich:dragSupport> @@ -189,10 +193,4 @@ <h:graphicImage id="dragImage" value="/pics/masshtaby_01.jpg" width="200px" height="200px" /> <f:verbatim>dragSupport</f:verbatim> </h:panelGrid> - - - - <a4j:outputPanel ajaxRendered="true"> - <h:messages /> - </a4j:outputPanel> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,22 +1,22 @@ -<f:subview id="DropDownMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DropDownMenuSubviewID"> <h:panelGrid columns="2"> <rich:spacer width="400px" height="400px"></rich:spacer> <rich:panel> - <rich:dropDownMenu id="ddmId" value="dropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" + <rich:dropDownMenu id="ddmId" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}" popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}" - oncollapse="print('oncollapseInputID', 'oncollapse work!')" onexpand="print('onexpandInputID', 'onexpand work!')" - ongroupactivate="print('ongroupactivateInputID', 'ongroupactivate work!')" - onitemselect="print('onitemselectInputID', 'onitemselect work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')"> - <rich:menuItem icon="#{dDMenu.icon}" onclick="print('onclickInputID', 'onclick work (item)!')" - oncomplete="print('oncompleteInputID', 'oncomplete work (item)!')" onmousedown="print('onmousedownInputID', 'onmousedown work (item)!')" - onmousemove="print('onmousemoveInputID', ' work (item)!')" onmouseout="print('onmouseoutInputID', 'onmouseout work (item)!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work (item)!')" onmouseup="print('onmouseupInputID', 'onmouseup work (item)!')" - onselect="print('onselectInputID', 'onselect work (item)!')"> + oncollapse="showEvent('oncollapseInputID', 'oncollapse work!')" onexpand="showEvent('onexpandInputID', 'onexpand work!')" + ongroupactivate="showEvent('ongroupactivateInputID', 'ongroupactivate work!')" + onitemselect="showEvent('onitemselectInputID', 'onitemselect work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')"> + <rich:menuItem icon="#{dDMenu.icon}" onclick="showEvent('onclickInputID', 'onclick work (item)!')" + oncomplete="showEvent('oncompleteInputID', 'oncomplete work (item)!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work (item)!')" + onmousemove="showEvent('onmousemoveInputID', ' work (item)!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work (item)!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work (item)!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work (item)!')" + onselect="showEvent('onselectInputID', 'onselect work (item)!')"> <h:outputText value="Item1(test events)" /> </rich:menuItem> <rich:menuSeparator /> @@ -60,5 +60,4 @@ </rich:dropDownMenu> </rich:panel> </h:panelGrid> - <a4j:log></a4j:log> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="dropDownMenuPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="ddMenuPropertyID" switchType="client" opened="true" label="dropDownMenu property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dropDownMenuPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="HideDelay (ms):" /> <h:inputText value="#{dDMenu.hideDelay}"> @@ -87,5 +82,4 @@ </h:selectBooleanCheckbox> <h:commandButton action="#{dDMenu.changeIcons}" value="ChangeIcons" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="dropDownMenuStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="ddMenuStraightforwardID" switchType="client" opened="true" label="dropDownMenu straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dropDownMenuStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dDMenu.bTest1}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{dDMenu.bTest5}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5DDMenu}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,8 +1,5 @@ -<f:subview id="effectSubviewID" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.ajax4jsf.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="effectSubviewID"> <rich:panel id="indexID"> <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> @@ -57,7 +54,7 @@ </span> </f:verbatim> <h:graphicImage value="/pics/fatal.gif" - onclick="hidePanel1(), hedeImage1()" /> + onclick="hidePanel1(), hideImage1()" /> <f:verbatim> <span onclick="showPanel1(), showImage1()"><font color="blue">Show</font> @@ -76,7 +73,7 @@ <h:panelGroup id="form_1a_ID"> <h:panelGrid id="panel_1_ID" border="1" - style="background-color:#CCC"> + style="background-color:#696969"> <f:facet name="header"> <h:outputText value="Panel Header" /> </f:facet> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,16 +1,11 @@ -<f:subview id="GmapSubviewID" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> - <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" - onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" - onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapSubviewID"> + <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" + onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')" gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="width:500px;height:400px" enableContinuousZoom="#{gmap.continuousZoom}" Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="GmapPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Dragging:" /> <h:selectBooleanCheckbox value="#{gmap.dragging}" onclick="submit()" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="inputNumberSliderSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderSubviewID"> <h:panelGrid columns="1"> <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}" inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}" @@ -11,7 +11,7 @@ step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}" barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}" handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}" - maxlength="#{inputNumberSlider.maxlength}" onmousedown="print('onmousedownInputID', 'onmousedown work!')" > + maxlength="#{inputNumberSlider.maxlength}" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" > </rich:inputNumberSlider> <h:panelGroup> <a4j:commandButton value="valueChangeListener (show)" reRender="valueCLID" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="inputNumberSliderPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="iNSliderPropertyID" switchType="client" opened="true" label="inputNumberSlider property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderPropertySubviewID"> <h:panelGrid columns="2" cellspacing="10px" border="1"> <h:outputText value="value" /> <h:inputText value="#{inputNumberSlider.value}"> @@ -102,5 +97,4 @@ reRender="SliderId,slBtn"> </a4j:commandButton> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="inputNumberSliderStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSlider straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSlider.bTest1}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{inputNumberSlider.bTest5}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5INSlider}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,5 @@ -<f:subview id="inputNumberSpinnerSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptf... + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSpinnerSubviewID"> <h:messages></h:messages> <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}" @@ -8,14 +7,14 @@ step="#{inputNumberSpinner.step}" rendered="#{inputNumberSpinner.rendered}" value="#{inputNumberSpinner.value}" inputClass="#{inputNumberSpinner.inputStyle}" styleClass="#{inputNumberSpinner.style}" enableManualInput="#{inputNumberSpinner.manualInput}" inputSize="#{inputNumberSpinner.inputSize}" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onblur="print('onblurInputID', 'onblur work!')" - onchange="print('onchangeInputID', 'onchange work!')" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onerror="print('ondblclickInputID', 'ondblclick work!')" - onfocus="print('onfocusInputID', 'onfocus work!')" onselect="print('onselectInputID', 'onselect work!')" - onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" - onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')" - onupclick="print('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner> + onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onblur="showEvent('onblurInputID', 'onblur work!')" + onchange="showEvent('onchangeInputID', 'onchange work!')" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onerror="showEvent('ondblclickInputID', 'ondblclick work!')" + onfocus="showEvent('onfocusInputID', 'onfocus work!')" onselect="showEvent('onselectInputID', 'onselect work!')" + onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" + onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" + onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" ondownclick="showEvent('ondownclickInputID', 'ondownclick work!')" + onupclick="showEvent('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner> <rich:spacer height="20px"></rich:spacer> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="iNSpinnerPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="iNSpinnerPropertyID" switchType="client" opened="true" label="inputNumberSpinner property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="iNSpinnerPropertySubviewID"> <h:panelGrid columns="2" cellpadding="10px" border="1"> <h:outputText value="Max: "></h:outputText> <h:inputText value="#{inputNumberSpinner.max}"> @@ -52,5 +47,4 @@ <h:outputText value="Switch Styles:" /> <h:commandButton action="#{inputNumberSpinner.doStyles}" value="#{inputNumberSpinner.btnLabel}" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="iNSpinnerStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSpinner straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="iNSpinnerStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSpinner.bTest1}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{inputNumberSpinner.bTest5}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5INSpinner}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="insertSubviewID" - - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="insertSubviewID"> <h:messages /> <rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="InsertPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="InsertPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Highlight:" /> <h:selectOneMenu value="#{insert.highlight}"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="listShuttleSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttleSubviewID"> <rich:listShuttle id="listShuttleID" var="item" sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}" bottomControlLabel="#{listShuttle.bottomControlLabel}" copyAllControlLabel="#{listShuttle.copyAllControlLabel}" copyControlLabel="#{listShuttle.copyControlLabel}" downControlLabel="#{listShuttle.downControlLabel}" Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,12 +1,12 @@ -<f:subview id="listShuttlePropertySubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttlePropertySubviewID"> <h:panelGrid columns="2"> <h:column></h:column> <h:panelGroup> <a4j:commandButton value="reRender" reRender="listShuttleID"></a4j:commandButton> - <a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> - <h:commandButton action="submit();" value="submit();" /> - <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> + <a4j:commandButton immediate="true" reRender="listShuttleID" value="immediate submit(); (a4j)"></a4j:commandButton> + <h:commandButton value="submit();" /> + <h:commandButton immediate="true" value="immediate submit();" /> </h:panelGroup> <h:outputText value="Enter quantity of lines" /> @@ -103,4 +103,25 @@ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support> </h:inputText> </h:panelGrid> + <h:panelGrid columns="3"> + <h:column></h:column> + <h:outputText value="JavaScript API"></h:outputText> + <h:column></h:column> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.doHide()" value="Hide"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.doShow()" value="Show"></a4j:commandLink> + <a4j:commandLink onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.isShown)" value="isShown"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.Enable()" value="Enable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.Disable()" value="Disable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.isEnabled()" value="isEnabled"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.moveUp" value="moveUp"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.moveDown" value="moveDown"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.moveTop" value="moveTop"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.moveBottom" value="moveBottom"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.copy" value="copy"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.remove" value="remove"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.copyAll" value="copyAll"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.removeAll" value="removeAll"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.getSelection" value="getSelection"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:listShuttleSubviewID:listShuttleID').component.getItems" value="getItems"></a4j:commandLink> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="listShuttleStraightforwardSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttleStraightforwardSubviewID"> <h:panelGrid columns="3"> <a4j:commandButton value="Show selection (reRender)" reRender="infoLSID"></a4j:commandButton> <h:column> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="messageSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="messageSubviewID"> <rich:panel> <h:outputText value="Rich Message Demo:" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="MessagePropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="msgPropertyID" switchType="client" opened="true" label="modalPanel property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="MessagePropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="1." /> <h:selectOneMenu id="select1" value="#{message.select1}"> @@ -87,5 +82,4 @@ <h:commandButton value="submit" /> <a4j:commandButton value="submit ajax" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="MessageStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="MessageStraightforwardSubviewID"> <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,13 +1,13 @@ -<f:subview id="modalPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <h:messages /> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="modalPanelSubviewID"> + <h:messages /> <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}" rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" left="#{modalPanel.left}" top="#{modalPanel.top}" shadowDepth="#{modalPanel.shadowDepth}" shadowOpacity="#{modalPanel.shadowOpacity}" - showWhenRendered="#{modalPanel.showWhenRendered}" onhide="print('onhideInputID', 'onhide work!')" - onshow="print('onshowInputID', 'onshow work!')"> + showWhenRendered="#{modalPanel.showWhenRendered}" onhide="showEvent('onhideInputID', 'onhide work!')" + onshow="showEvent('onshowInputID', 'onshow work!')"> <f:facet name="header"> <h:outputText value="Heder goes here..." /> </f:facet> @@ -21,6 +21,7 @@ <f:selectItem itemLabel="2" itemValue="2" /> <f:selectItem itemLabel="3" itemValue="3" /> </h:selectOneListbox> + <f:verbatim> <br /> <br /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="ModalPanelPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="ModalPanelPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="shadowDepth" /> <h:inputText value="#{modalPanel.shadowDepth}" > @@ -68,14 +63,12 @@ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> </h:inputText> - <h:outputText value="autosized" /> - <h:selectBooleanCheckbox value="#{modalPanel.autosized}" > - + <h:outputText value="autosized:" /> + <h:selectBooleanCheckbox value="#{modalPanel.autosized}" onchange="submit();"> </h:selectBooleanCheckbox> - <h:outputText value="Resizeable:" /> + <h:outputText value="resizeable:" /> <h:selectBooleanCheckbox value="#{modalPanel.resizeable}" onchange="submit();"> - </h:selectBooleanCheckbox> <h:outputText value="Moveable:" /> @@ -83,5 +76,4 @@ <a4j:support event="onclick" reRender="modalPanelID"></a4j:support> </h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="ModalPanelStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="ModalPanelStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{modalPanel.bTest1}" value="run" reRender="modalPanelID,mpPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{modalPanel.bTest5}" value="run" reRender="modalPanelID,mpPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5ModalPanel}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,6 @@ -<f:subview id="orderingListSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListSubviewID"> + <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> @@ -10,12 +10,12 @@ bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}" topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}" controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}" - downControlLabel="#{orderingList.downControlLabel}" + downControlLabel="#{orderingList.downControlLabel}" orderControlsVisible="#{orderingList.orderControlsVisible}" fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}" rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" selection="#{orderingList.selection}" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onorderchanged="print('onorderchangedInputID', 'onorderchanged work!')" ontopclick="print('ontopclickInputID', 'ontopclick work!')" onupclick="print('onupclickInputID', 'onupclick work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')" onbottomclick="print('onbottomclickInputID', 'onbottomclick work!')" onheaderclick="print('onheaderclickInputID', 'onheaderclick work!')"> + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onorderchanged="showEvent('onorderchangedInputID', 'onorderchanged work!')" ontopclick="showEvent('ontopclickInputID', 'ontopclick work!')" onupclick="showEvent('onupclickInputID', 'onupclick work!')" ondownclick="showEvent('ondownclickInputID', 'ondownclick work!')" onbottomclick="showEvent('onbottomclickInputID', 'onbottomclick work!')" onheaderclick="showEvent('onheaderclickInputID', 'onheaderclick work!')"> <f:facet name="header"> <h:outputText value="header" /> </f:facet> @@ -23,7 +23,7 @@ <h:outputText value="footer" /> </f:facet> - <h:column width="100px"> + <h:column> <f:facet name="header"> <h:outputText value="Number" /> </f:facet> @@ -37,7 +37,7 @@ <h:inputText value="#{item.str0}" /> </h:column> - <h:column width="100px"> + <h:column> <f:facet name="header"> <h:outputText value="Button" /> </f:facet> @@ -62,7 +62,7 @@ <f:facet name="header"> <h:outputText value="select" /> </f:facet> - <h:selectOneMenu value="#{item.str2}"> + <h:selectOneMenu value="#{item.str2}" > <f:selectItem itemLabel="select0" itemValue="select0" /> <f:selectItem itemLabel="select1" itemValue="select1" /> <f:selectItem itemLabel="select2" itemValue="select2" /> @@ -86,4 +86,21 @@ <h:graphicImage value="#{item.str3}" /> </h:column> </rich:orderingList> + <h:panelGrid columns="3"> + <h:column></h:column> + <h:outputText value="JavaScript API"></h:outputText> + <h:column></h:column> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.doHide()" value="Hide"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.doShow()" value="Show"></a4j:commandLink> + <a4j:commandLink onclick="alert($('formID:orderingListSubviewID:orderingListID').component.isShown)" value="isShown"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.Enable()" value="Enable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.Disable()" value="Disable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.isEnabled()" value="isEnabled"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.moveUp" value="moveUp"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.moveDown" value="moveDown"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.moveTop" value="moveTop"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.moveBottom" value="moveBottom"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.getSelection" value="getSelection"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:orderingListSubviewID:orderingListID').component.getItems" value="getItems"></a4j:commandLink> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="orderingListPropertySubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Enter quantity of lines" /> <h:panelGroup> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="orderingListStraightforwardSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> @@ -100,9 +100,9 @@ <h:panelGroup> <a4j:commandButton value="reRender" reRender="orderingListID"></a4j:commandButton> - <a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> - <h:commandButton action="submit();" value="submit();" /> - <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> + <a4j:commandButton immediate="true" reRender="orderingListID" value="immediate submit(); (a4j)"></a4j:commandButton> + <h:commandButton value="submit();" /> + <h:commandButton immediate="true" value="immediate submit();" /> </h:panelGroup> </h:panelGrid> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,6 @@ -<f:subview id="paint2DSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <rich:paint2D id="paint2dID" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="paint2DSubviewID"> + <rich:paint2D id="paint2dID" cacheable="#{paint2D.cacheable}" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}" rendered="#{paint2D.rendered}" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="Paint2DPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="paint2DPropertyID" switchType="client" opened="true" label="paint2D property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="Paint2DPropertySubviewID"> <h:panelGrid columns="2" cellpadding="5px" border="2"> <h:outputText value="Text"></h:outputText> <h:inputText value="#{paintData.text}"> @@ -30,7 +25,10 @@ <h:inputText value="#{paint2D.hspace}"> <a4j:support event="onchange" reRender="paint2dID"></a4j:support> </h:inputText> - + + <h:outputText value="cacheable:"></h:outputText> + <h:selectBooleanCheckbox value="#{paint2D.cacheable}" onchange="submit();"/> + <h:outputText value="Align:"></h:outputText> <h:selectOneMenu value="#{paint2D.align}"> <f:selectItem itemLabel="left" itemValue="left" /> @@ -81,5 +79,4 @@ <a4j:support event="onclick" reRender="paint2dID"></a4j:support> </h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="Paint2DStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="Paint2DStraightforwardSubviewID"> <rich:simpleTogglePanel switchType="client" opened="true" label="paint2D straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,85 @@ -<f:subview id="panelSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelSubviewID"> + <h:panelGrid columnClasses="panel" border="0" columns="3"> + <rich:panel styleClass="top"> + <f:facet name="header"> + <h:panelGroup> + <f:verbatim>dsdsdsdsd<br />sdsd </f:verbatim> + </h:panelGroup> + + </f:facet> + + <f:verbatim>This is <b>default</b> panel. content here</f:verbatim> + </rich:panel> + <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> + <f:facet name="header"> + <h:outputText value="Header of the Panel" /> + </f:facet> + <f:verbatim>This panel contains custom headerClass and bodyClass</f:verbatim> + </rich:panel> + <rich:panel styleClass="top2" headerClass="hea2" bodyClass="bo2"> + <f:facet name="header"> + <h:outputText value="Header of the Panel" /> + </f:facet> + <f:verbatim> This panel also contains custom headerClass and bodyClass. The background is not a 3D anymore.</f:verbatim> + </rich:panel> + + <h:panelGroup> + <h:form> + <rich:panel + onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" + onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" + style="width:200px;" headerClass="hea2" bodyClass="bo3"> + <f:facet name="header"> + <h:outputText value="Header of the Panel" /> + </f:facet> + <f:verbatim>Base on the previous layout, but form element and javascript behaviour are added</f:verbatim> + <br /> + <h:inputText /> + </rich:panel> + </h:form> + </h:panelGroup> + + <rich:panel style="width:200px;" headerClass="hea" bodyClass="bo3"> + <f:facet name="header"> + <h:outputText value="Scrolling Text Panel" /> + </f:facet> + <f:verbatim> + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + </f:verbatim> + </rich:panel> + + <rich:panel styleClass="top"> + <f:verbatim>This is a panel without the header</f:verbatim> + + </rich:panel> + </h:panelGrid> + <rich:panel style="position: absolute; top: 116px; right: 100px; " + styleClass="top"> + <f:facet name="header"> + <h:outputText value="Header of the Panel" /> + </f:facet> + <f:verbatim> + This is a panel with absolute position on the screen.<br /> + Resize the browser's window for fun. + </f:verbatim> + </rich:panel> <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> <rich:panel rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onclick="print('onclickInputID', 'onclick work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onclick="showEvent('onclickInputID', 'onclick work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <f:facet name="header"> <h:outputText id="t1" value="#{panel.title[0]} (Panel 1)" /> </f:facet> @@ -36,9 +111,8 @@ <rich:panel id="panelId" rendered="#{panel.rendered}" style="width:#{panel.width};height:#{panel.height}" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onclick="print('onclickInputID', 'onclick work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onclick="showEvent('onclickInputID', 'onclick work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <f:verbatim>This is panel 2 example...(Test events)</f:verbatim> - </rich:panel> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="panel2SubviewID" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panel2SubviewID"> <h:panelGrid columnClasses="panel" border="0" columns="3"> <rich:panel styleClass="top"> <f:facet name="header"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="PanelPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="panelPropertyID" switchType="client" opened="true" label="panel property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="PanelPropertySubviewID"> <h:panelGrid columns="2" cellpadding="10px"> <h:outputText value="Title"></h:outputText> <h:inputText valueChangeListener="#{panel.makeTitle}"> @@ -24,5 +19,4 @@ <h:outputText value="Rendered:"></h:outputText> <h:selectBooleanCheckbox value="#{panel.rendered}" onclick="submit()"></h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="PanelStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="panel straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="PanelStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panel.bTest1}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{panel.bTest5}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> <h:outputText value="#{msg.t5Panel}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,10 @@ -<f:subview id="panelBarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarSubviewID"> + <h:messages></h:messages> <rich:panelBar id="pBId" height="#{panelBar.height}" width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}" - styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="print('onclickInputID', 'onclick work!')"> + styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="showEvent('onclickInputID', 'onclick work!')"> <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}" headerClass="#{panelBar.headerStyle}"> <h:outputText value="Some text..."></h:outputText> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="panelBarPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="pbPropertyID" switchType="client" opened="true" label="panelBar property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarPropertySubviewID"> <h:panelGrid columns="2" cellspacing="10px"> <h:outputText value="Label: "></h:outputText> <h:inputText valueChangeListener="#{panelBar.makeLabels}"> @@ -29,5 +24,4 @@ <h:outputText value="Switch Styles:" /> <h:commandButton action="#{panelBar.doStyles}" value="#{panelBar.btnLabel}" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="panelBarStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="panelBar straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelBar.bTest1}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{panelBar.bTest5}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> <h:outputText value="#{msg.t5PanelBar}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,6 @@ -<f:subview id="panelMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> - <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuSubviewID"> + <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" @@ -12,12 +12,12 @@ onclick="" ondblclick="" ongroupcollapse="" ongroupexpand="" onitemhover="" onkeydown="" onkeypress="" onkeyup="" onmousedown="" onmousemove="" onmouseout="" onmouseover="" onmouseup=""> - <rich:panelMenuItem label="Item 1(Test event)" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1(Test event)" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"></rich:panelMenuItem> <rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> <h:outputText value="Disabled Item" /> </rich:panelMenuItem> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="panelMenuPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="pmPropertyID" switchType="client" opened="true" label="panelMenu property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Width"></h:outputText> <h:inputText value="#{panelMenu.width}"> @@ -269,5 +264,11 @@ <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> </h:selectOneMenu> </h:panelGrid> - </rich:simpleTogglePanel> + <h:panelGrid columns="3"> + <h:column></h:column> + <h:outputText value="JavaScript API"></h:outputText> + <h:column></h:column> + <a4j:commandLink onclick="PanelMenu.doExpand($('formID:panelMenuSubviewID:panelMenuID'));return false;" value="doExpand"></a4j:commandLink> + <a4j:commandLink onclick="PanelMenu.doCollapse($('formID:panelMenuSubviewID:panelMenuID'));return false;" value="doCollapse"></a4j:commandLink> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="panelMenuStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="panelMenu straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelMenu.bTest1}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{panelMenu.bTest5}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> <h:outputText value="#{msg.t5PanelMenu}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,43 +1,60 @@ -<f:subview id="scrollableDataTableSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> - <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}" - hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" reRender="inputID" - oncomplete="print('oncompleteInputID', 'oncomplete work!')" onselectionchange="print('onselectionchangeInputID', 'onselectionchange work!')"> - <rich:column width="100px"> - <f:facet name="header"> - <h:outputText value="Number" /> - </f:facet> - <h:outputText value="#{sdt.data1}" /> - </rich:column> - - <rich:column width="100px"> - <f:facet name="header"> - <h:outputText value="Name" /> - </f:facet> - <h:outputText value="#{sdt.data0}" /> - </rich:column> - <rich:column width="100px" sortable="false"> - <f:facet name="header"> - <h:outputText value="Status" /> - </f:facet> - <h:selectOneMenu value="#{sdt.data2}"> - <f:selectItem itemLabel="error" itemValue="error"/> - <f:selectItem itemLabel="fatal" itemValue="fatal"/> - <f:selectItem itemLabel="info" itemValue="info"/> - <f:selectItem itemLabel="passed" itemValue="passed"/> - <f:selectItem itemLabel="warn" itemValue="warn"/> - </h:selectOneMenu> - </rich:column> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="scrollableDataTableSubviewID"> + <rich:scrollableDataTable id="sdt" var="sdt" rowKeyVar="key" onRowDblClick="alert('row:#{key}')" + ajaxSingle="#{scrollableDT.ajaxSingle}" + value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" + width="#{scrollableDT.width}" height="#{scrollableDT.height}" + hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" + reRender="inputID" frozenColCount="#{scrollableDT.frozenColCount}" + first="#{scrollableDT.first}" ignoreDupResponses="#{scrollableDT.ignoreDupResponses}" + bypassUpdates="#{scrollableDT.bypassUpdates}" rendered="#{scrollableDT.rendered}" + limitToList="#{scrollableDT.limitToList}" + timeout="#{scrollableDT.timeout}" + selection="#{scrollableDT.selection}" + oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + onselectionchange="showEvent('onselectionchangeInputID', 'onselectionchange work!')"> + <f:facet name="header"> + <h:outputText value="facet header"></h:outputText> + </f:facet> + + <rich:column> + <f:facet name="header"><h:outputText value="#"/></f:facet> + <h:outputText value="#{sdt.int0}"></h:outputText> + <f:facet name="footer"><h:outputText value="#"/></f:facet> + </rich:column> - <rich:column width="30px" sortable="false"> - <f:facet name="header"> - <h:outputText value="Icon" /> - </f:facet> - <h:graphicImage value="#{sdt.data3}" /> - </rich:column> - </rich:scrollableDataTable> + <rich:column> + <f:facet name="header"><h:outputText value="Text"></h:outputText> </f:facet> + <h:outputText value="#{sdt.str0}"></h:outputText> + <f:facet name="footer"><h:outputText value="Text"></h:outputText> </f:facet> + </rich:column> + + <rich:column> + <f:facet name="header"><h:outputText value="Link"></h:outputText> </f:facet> + <a4j:commandLink value="#{sdt.str1}" reRender="sdt"></a4j:commandLink> + <f:facet name="footer"><h:outputText value="Link"></h:outputText> </f:facet> + </rich:column> + + <rich:column> + <f:facet name="header"><h:outputText value="Select"></h:outputText> </f:facet> + <h:selectOneMenu value="#{sdt.str2}"> + <f:selectItem itemLabel="select0" itemValue="select0" /> + <f:selectItem itemLabel="select1" itemValue="select1" /> + <f:selectItem itemLabel="select2" itemValue="select2" /> + <f:selectItem itemLabel="select3" itemValue="select3" /> + <f:selectItem itemLabel="select4" itemValue="select4" /> + </h:selectOneMenu> + <f:facet name="footer"><h:outputText value="Select"></h:outputText> </f:facet> + </rich:column> + + <rich:column> + <f:facet name="header"><h:outputText value="Select"></h:outputText> </f:facet> + <h:graphicImage value="#{sdt.str3}"></h:graphicImage> + <f:facet name="footer"><h:outputText value="Select"></h:outputText> </f:facet> + </rich:column> + + <f:facet name="footer"> + <h:outputText value="facet footer"></h:outputText> + </f:facet> + </rich:scrollableDataTable> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,18 +1,52 @@ -<f:subview id="scrollableDataTablePropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="scrollableDataTablePropertySubviewID"> <h:panelGrid columns="2"> - <h:outputText value="rows" /> - <h:inputText value="#{scrollableDT.rows}" /> + <h:outputText value="length:"></h:outputText> + <h:inputText value="#{scrollableDT.dataLength}" onchange="submit();"> + </h:inputText> - <h:outputText value="width" /> - <h:inputText value="#{scrollableDT.width}" /> + <h:outputText value="rows:" /> + <h:inputText value="#{scrollableDT.rows}" onchange="submit();"> + </h:inputText> - <h:outputText value="hideWhenScrolling" /> - <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" /> + <h:outputText value="first:"></h:outputText> + <h:inputText value="#{scrollableDT.first}" onchange="submit();"> + </h:inputText> + + <h:outputText value="timeout"></h:outputText> + <h:inputText value="#{scrollableDT.timeout}" onchange="submit();"> + </h:inputText> + + <h:outputText value="width:" /> + <h:inputText value="#{scrollableDT.width}" onchange="submit();"> + </h:inputText> + + <h:outputText value="height:"></h:outputText> + <h:inputText value="#{scrollableDT.height}" onchange="submit();"> + </h:inputText> + + <h:outputText value="frozenColCount"></h:outputText> + <h:inputText value="#{scrollableDT.frozenColCount}" onchange="submit();"> + </h:inputText> + + <h:outputText value="limitToList"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.limitToList}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="bypassUpdates:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.bypassUpdates}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="ajaxSingle:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.ajaxSingle}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.rendered}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="hideWhenScrolling:" /> + <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" onchange="submit();"> + </h:selectBooleanCheckbox> </h:panelGrid> <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,14 +1,13 @@ -<f:subview id="separatorSubviewID" xmlns:rich="http://richfaces.org/rich" - xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptf... xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="separatorSubviewID"> <h:outputText value="Some text one..." styleClass="text"></h:outputText> <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" - onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" - onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" - onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:separator> + onclick="showEvent('onclickInputID', 'onclick work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" + onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="SeparatorPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="separatorPropertyID" switchType="client" opened="true" label="separator property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="SeparatorPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Width (px or %): "></h:outputText> <h:inputText value="#{separator.width}"> @@ -45,5 +40,4 @@ <h:outputText value="Switch Styles:" /> <h:commandButton action="#{separator.doStyles}" value="#{separator.btnLabel}" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="SeparatorStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="separator straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="SeparatorStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{separator.bTest1}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{separator.bTest5}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5Separator}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,13 +1,13 @@ -<f:subview id="simpleTogglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="simpleTogglePanelSubviewID"> <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" - opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + opened="false" onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <f:facet name="closeMarker"> <h:outputText value="Close It" /> </f:facet> @@ -26,22 +26,22 @@ <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" - opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + opened="false" onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> </rich:simpleTogglePanel> <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" - focus="#{simpleTogglePanel.focus}" onclick="print('onclickInputID', 'onclick work!')" - oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" - onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" - onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + focus="#{simpleTogglePanel.focus}" onclick="showEvent('onclickInputID', 'onclick work!')" + oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" + onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> </f:facet> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="stpPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="stpPropertyID" switchType="client" opened="true" label="spacer property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="stpPropertySubviewID"> <h:panelGrid columns="2" border="1"> <h:outputText value="Width:"> </h:outputText> @@ -30,5 +25,4 @@ <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()"> </h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="stpStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="stpStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{simpleTogglePanel.bTest1}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{simpleTogglePanel.bTest5}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5SimpleTP}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="spacerSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:sql="http://java.sun.com/jsp/jstl/sql"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerSubviewID"> <style type="text/css"> .text { font-size: 20px; @@ -10,13 +10,13 @@ } </style> <h:outputText value="Some text one..." styleClass="text"></h:outputText> - <rich:spacer id="spacerId" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}" - styleClass="#{spacer.style}" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + <rich:spacer id="spacerId" title="#{spacer.title}" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}" + styleClass="#{spacer.style}" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> </rich:spacer> <h:outputText value="Some text two..." styleClass="text"></h:outputText> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="spacerPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerPropertySubviewID"> <rich:simpleTogglePanel id="spacerPropertyID" switchType="client" opened="true" label="spacer property"> <h:panelGrid columns="2"> <h:outputText value="Width (px or %):"></h:outputText> @@ -15,6 +11,11 @@ <h:inputText value="#{spacer.height}"> <a4j:support event="onchange" reRender="spacerId"></a4j:support> </h:inputText> + + <h:outputText value="title:"></h:outputText> + <h:inputText value="#{spacer.title}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> <h:outputText value="Rendered:"></h:outputText> <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="spacerStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{spacer.bTest1}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{spacer.bTest5}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> <h:outputText value="#{msg.t5Spacer}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,35 +1,28 @@ -<f:subview id="suggestionBoxSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> - <h:messages showDetail="true"/> - <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionBoxSubviewID"> + <h:messages showDetail="true" /> + <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter <br /> - </f:verbatim> - <h:inputText value="#{sb.property}" id="text" /> - <rich:suggestionbox id="suggestionBoxId" for="text" var="result" - zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" - suggestionAction="#{sb.autocomplete}" - width="#{sb.width}" height="#{sb.height}" border="#{sb.border}" - cellpadding="#{sb.cellpadding}" cellspacing="#{sb.cellspacing}" - first="#{sb.first}" minChars="1" tokens=", ]" - bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}" - summary="summary" shadowOpacity="#{sb.shadowOpacity}" - shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}" - nothingLabel="nothingLabel work! " oncomplete="print('oncompleteInputID', 'oncomplete work!')" - onselect="print('onselectInputID', 'onselect work!')" > - <h:column> - <h:outputText value="#{result.city}" /> - </h:column> - <h:column> - <h:outputText value="#{result.contry}" /> - </h:column> - <h:column> - <h:outputText value="#{result.flag}" /> - </h:column> - - </rich:suggestionbox> - <div - style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> + </f:verbatim> + <h:inputText value="#{sb.property}" id="text" /> + <rich:suggestionbox id="suggestionBoxId" eventsQueue="myEventsQueue" ajaxSingle="#{sb.ajaxSingle}" dir="#{sb.dir}" + rendered="#{sb.rendered}" requestDelay="#{sb.requestDelay}" selfRendered="#{sb.selfRendered}" value="#{sb.value}" for="text" + var="result" fetchValue="#{result.text}" suggestionAction="#{sb.autocomplete}" width="#{sb.width}" height="#{sb.height}" + border="#{sb.border}" zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" cellpadding="#{sb.cellpadding}" + cellspacing="#{sb.cellspacing}" first="#{sb.first}" minChars="#{sb.minchars}" tokens="#{sb.tokens}" bgcolor="#{sb.bgColor}" + focus="#{sb.forcus}" title="#{result.text}" summary="summary" shadowOpacity="#{sb.shadowOpacity}" + shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}" nothingLabel="nothingLabel work! " + oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" onselect="showEvent('onselectInputID', 'onselect work!')"> + <h:column> + <h:outputText value="#{result.city}" /> + </h:column> + <h:column> + <h:outputText value="#{result.contry}" /> + </h:column> + <h:column> + <h:outputText value="#{result.flag}" /> + </h:column> + + </rich:suggestionbox> + <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,5 @@ -<f:subview id="suggestionboxPropertySubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="sbPropertyID" switchType="client" opened="true" label="suggestionBox property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionboxPropertySubviewID"> <h:panelGrid columns="2" cellpadding="5px"> <h:outputText value="z-index"></h:outputText> @@ -10,45 +9,65 @@ <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> </h:selectOneRadio> - <f:verbatim>Frequency</f:verbatim> + <h:outputText value="requestDelay"></h:outputText> + <h:inputText value="#{sb.requestDelay}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <h:outputText value="value"/> + <h:inputText value="#{sb.value}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <h:outputText value="Frequency"/> <h:inputText value="#{sb.frequency}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> - <f:verbatim>Border</f:verbatim> + <h:outputText value="Border"/> <h:inputText value="#{sb.border}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> - <f:verbatim>Width</f:verbatim> + <h:outputText value="Width"/> <h:inputText value="#{sb.width}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> - <f:verbatim>Height</f:verbatim> + <h:outputText value="Height"/> <h:inputText value="#{sb.height}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> - <f:verbatim>Cellpadding</f:verbatim> + <h:outputText value="Cellpadding"/> <h:inputText value="#{sb.cellpadding}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> - <f:verbatim>Cellspacing</f:verbatim> + <h:outputText value="Cellspacing"/> <h:inputText value="#{sb.cellspacing}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> - <f:verbatim>First</f:verbatim> + <h:outputText value="First" /> <h:inputText value="#{sb.first}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> + + <h:outputText value="tokens:"></h:outputText> + <h:inputText value="#{sb.tokens}"></h:inputText> <f:verbatim>MinChars</f:verbatim> <h:inputText value="#{sb.minchars}"> <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> </h:inputText> + + <h:outputText value="dir"></h:outputText> + <h:selectOneMenu value="#{sb.dir}"> + <f:selectItem itemLabel="RTL" itemValue="RTL" /> + <f:selectItem itemLabel="LTR" itemValue="LTR" /> + </h:selectOneMenu> + <h:outputText value="Background Colour"></h:outputText> <h:selectOneMenu value="#{sb.bgColor}"> @@ -90,6 +109,14 @@ <f:selectItem itemLabel="7" itemValue="6" /> <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> </h:selectOneRadio> + + <h:outputText value="ajaxSingle"></h:outputText> + <h:selectBooleanCheckbox value="#{sb.ajaxSingle}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="selfRendered"></h:outputText> + <h:selectBooleanCheckbox value="#{sb.selfRendered}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{sb.rendered}" onchange="submit();"></h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,7 +1,5 @@ -<f:subview id="suggestionboxStraightforwardSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="suggestionBox straightforward"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionboxStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{sb.bTest1}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> @@ -23,5 +21,4 @@ <a4j:commandButton action="#{sb.bTest5}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> <h:outputText value="#{msg.t5SB}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,44 +1,44 @@ -<f:subview id="tabPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelSubviewID"> <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" - contentClass="#{tabPanel.contentStyle}" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + contentClass="#{tabPanel.contentStyle}" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" - onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" - ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> + onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" + ontabenter="showEvent('ontabenterInputID', 'ontabenter work!')" ontableave="showEvent('ontableaveInputID', 'ontableave work!')"> <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> </rich:tab> <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" - onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" - ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> + onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" + ontabenter="showEvent('ontabenterInputID', 'ontabenter work!')" ontableave="showEvent('ontableaveInputID', 'ontableave work!')"> <f:facet name="header"> <h:outputText value="client switchType from facet" /> </f:facet> <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" height="383"></h:graphicImage> </rich:tab> <rich:tab id="tabThree" label="Tab with some text" disabled="#{tabPanel.disabledTab}" - onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" - ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> + onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" + ontabenter="showEvent('ontabenterInputID', 'ontabenter work!')" ontableave="showEvent('ontableaveInputID', 'ontableave work!')"> <h:outputText value=" Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="tabPanelStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="tpPropertyID" switchType="client" opened="true" label="tabPanel property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelStraightforwardSubviewID"> <h:panelGrid columns="2" cellspacing="10px"> <h:outputText value="Width (px or %):"></h:outputText> <h:inputText value="#{tabPanel.width}" onchange="submit();" /> @@ -63,5 +58,4 @@ <h:outputText value="Switch Styles:" /> <h:commandButton action="#{tabPanel.doStyles}" value="#{tabPanel.btnLabel}" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="tabPanelPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelPropertySubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{tabPanel.bTest1}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{tabPanel.bTest5}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> <h:outputText value="#{msg.t5TabPanel}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,13 +1,13 @@ -<f:subview id="togglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelSubviewID"> + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" - style="width:300px!important; overflow: hidden;" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + style="width:300px!important;" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <f:facet name="blank"> <rich:panel> <f:facet name="header"> @@ -22,7 +22,7 @@ </f:facet> <f:facet name="asus"> - <rich:panel> + <rich:panel style="overflow: auto"> <f:facet name="header"> <h:panelGroup> <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID:panel1"> @@ -55,12 +55,12 @@ </f:verbatim> <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + stateOrder="#{togglePanel.stateOrder}" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <f:facet name="asus"> <rich:panel> <f:facet name="header"> @@ -146,5 +146,4 @@ </f:facet> </rich:togglePanel> - <ui:debug hotkey="L"></ui:debug> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="togglePanelPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="tPanelPropertyID" switchType="client" opened="true" label="tooglePanel property"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelPropertySubviewID"> <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> <h:outputText value="InitialState:"></h:outputText> <h:selectOneRadio value="#{togglePanel.initialState}"> @@ -29,5 +24,4 @@ <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> </h:selectOneRadio> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,11 +1,6 @@ -<f:subview id="togglePanelStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="tooglePanel straightforward"> - <h:panelGrid columns="2"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelStraightforwardSubviewID"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{togglePanel.bTest1}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t1TogglePanel}"/> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{togglePanel.bTest5}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5TogglePanel}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,15 +1,13 @@ -<f:subview id="toolBarSubviewID" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolBarSubviewID"> <h:messages></h:messages> <rich:toolBar id="toolBarId" width="#{toolBar.width}" height="#{toolBar.height}" rendered="#{toolBar.rendered}" itemSeparator="#{toolBar.itemSeparator}" contentClass="#{toolBar.contentStyle}" - separatorClass="#{toolBar.separatorStyle}"> + separatorClass="#{toolBar.separatorStyle}" + contentStyle="contentStyle" style="style" styleClass="styleClass"> <h:outputText value="ToolBar" style="font-style: italic"></h:outputText> <rich:toolBarGroup> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="toolBarPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolBarPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Image location:"></h:outputText> <h:selectOneRadio value="#{toolBar.location}"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,69 +1,82 @@ -<f:subview id="tooltipSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:messages></h:messages> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tooltipSubviewID"> + <h:messages></h:messages> - <h:outputText value="DEFAULT VALUE:"></h:outputText> + <h:outputText value="DEFAULT VALUE:"></h:outputText> - <f:verbatim> - <br /> - </f:verbatim> + <f:verbatim> + <br /> + </f:verbatim> - <h:inputText value="Text" id="inp1" size="50"> - <rich:toolTip value="toolTip for input text" onclick="print('onclickInputID', 'onclick work!')" - oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" - onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> + <h:inputText value="Text" id="inp1" size="50"> + <rich:toolTip id="toolTipID" value="toolTip for input text" onclick="showEvent('onclickInputID', 'onclick work!')" + + oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" + onhide="showEvent('onhideInputID', 'onhide work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')" + onshow="showEvent('onshowInputID', 'onshow work!')"> <f:facet name="defaultContent"> <f:verbatim>DEFAULT VALUE</f:verbatim> </f:facet> </rich:toolTip> - </h:inputText> + </h:inputText> + <h:panelGrid columns="2"> + <h:outputText value="JavaScript API"></h:outputText> + <h:column></h:column> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doShow(event)" value="doShow"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doHide(event)" value="doHide"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doEnable" value="doEnable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doDisable" value="doDisable"></a4j:commandLink> + </h:panelGrid> + <h:selectOneListbox value="1" id="ddl"> + <rich:toolTip value="1231231" onclick="showEvent('onclickInputID', 'onclick work!')" + oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" + onhide="showEvent('onhideInputID', 'onhide work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')" + onshow="showEvent('onshowInputID', 'onshow work!')"> + <f:facet name="defaultContent"> + <f:verbatim>DEFAULT VALUE DropDown</f:verbatim> + </f:facet> + </rich:toolTip> + </h:selectOneListbox> - <h:selectOneListbox value="1" id="ddl"> - <rich:toolTip value="1231231" onclick="print('onclickInputID', 'onclick work!')" - oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" - onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> - <f:facet name="defaultContent"> - <f:verbatim>DEFAULT VALUE DropDown</f:verbatim> - </f:facet> - </rich:toolTip> - </h:selectOneListbox> + <f:verbatim> + <br /> + <br /> + </f:verbatim> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <h:outputText value=" Test tooltip:"></h:outputText> + <f:verbatim> + <br /> + </f:verbatim> - <h:outputText value=" Test tooltip:"></h:outputText> - <f:verbatim> - <br /> - </f:verbatim> + <rich:panel style="width:50px; height:50px; background-color: gray"> + <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" event="#{tooltip.event}" + hideDelay="#{tooltip.hideDelay}" showDelay="#{tooltip.showDelay}" layout="#{tooltip.layout}" + horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" + direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}" + onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onhide="showEvent('onhideInputID', 'onhide work!')" + onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')" + onshow="showEvent('onshowInputID', 'onshow work!')"> + <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> + </rich:toolTip> + </rich:panel> - <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" - layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" - followMouse="#{tooltip.followMouse}" direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" - rendered="#{tooltip.rendered}" onclick="print('onclickInputID', 'onclick work!')" - oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" - onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" - onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" - onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> - <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> - </rich:toolTip> - </rich:panel> + <f:verbatim> + <br /> + </f:verbatim> - <f:verbatim> - <br /> - </f:verbatim> - </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,79 +1,90 @@ -<f:subview id="toolTipStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="toolTipPropertyID" switchType="client" opened="true" label="toolTip property"> - <h:panelGrid columns="2"> - <h:outputText value="Text:"></h:outputText> - <h:inputText value="#{tooltip.value}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - <h:outputText value="Delay"></h:outputText> - <h:inputText value="#{tooltip.delay}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolTipStraightforwardSubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="Text:"></h:outputText> + <h:inputText value="#{tooltip.value}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Layout:"></h:outputText> - <h:selectOneRadio value="#{tooltip.layout}"> - <f:selectItem itemLabel="inline" itemValue="inline" /> - <f:selectItem itemLabel="block" itemValue="block" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <h:outputText value="Delay"></h:outputText> + <h:inputText value="#{tooltip.delay}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Mode:"></h:outputText> - <h:selectOneRadio value="#{tooltip.mode}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <h:outputText value="showDelay"></h:outputText> + <h:inputText value="#{tooltip.showDelay}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Horizontal offset:"></h:outputText> - <h:inputText value="#{tooltip.horizontalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> + <h:outputText value="hideDelay"></h:outputText> + <h:inputText value="#{tooltip.hideDelay}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Vertical offset:"></h:outputText> - <h:inputText value="#{tooltip.verticalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> + <h:outputText value="event:" /> + <h:selectOneMenu value="#{tooltip.event}" onchange="submit();"> + <f:selectItem itemLabel="onmouseover" itemValue="oncontextmenu" /> + <f:selectItem itemLabel="onclick" itemValue="onclick" /> + <f:selectItem itemLabel="onmouseup" itemValue="onmousemove" /> + </h:selectOneMenu> - <h:outputText value="Follow mouse:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> + <h:outputText value="Layout:"></h:outputText> + <h:selectOneRadio value="#{tooltip.layout}"> + <f:selectItem itemLabel="inline" itemValue="inline" /> + <f:selectItem itemLabel="block" itemValue="block" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> - <h:outputText value="Direction:" /> - <h:selectOneRadio value="#{tooltip.direction}"> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <h:outputText value="Mode:"></h:outputText> + <h:selectOneRadio value="#{tooltip.mode}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> - <h:outputText value="Style:"></h:outputText> - <h:selectOneRadio value="#{tooltip.style}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="border:3px; font:bold 14px;" itemValue="border:3px; font:bold 14px;" /> - <f:selectItem itemLabel="border:green 3px solid; background-color:yellow;" - itemValue="border:green 3px solid; background-color:yellow;" /> - <f:selectItem itemLabel="border:green 2px solid; font-family:monospace;" - itemValue="border:green 2px solid; font-family:monospace;" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <h:outputText value="Horizontal offset:"></h:outputText> + <h:inputText value="#{tooltip.horizontalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Disambled:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.disabled}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> + <h:outputText value="Vertical offset:"></h:outputText> + <h:inputText value="#{tooltip.verticalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.rendered}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> - </h:panelGrid> - </rich:simpleTogglePanel> + <h:outputText value="Follow mouse:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Direction:" /> + <h:selectOneRadio value="#{tooltip.direction}"> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Style:"></h:outputText> + <h:selectOneRadio value="#{tooltip.style}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="border:3px; font:bold 14px;" itemValue="border:3px; font:bold 14px;" /> + <f:selectItem itemLabel="border:green 3px solid; background-color:yellow;" + itemValue="border:green 3px solid; background-color:yellow;" /> + <f:selectItem itemLabel="border:green 2px solid; font-family:monospace;" + itemValue="border:green 2px solid; font-family:monospace;" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Disambled:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.disabled}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.rendered}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,10 +1,5 @@ -<f:subview id="toolTipPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="toolTipStraightforwardID" switchType="client" opened="true" label="toolTip straightforward"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolTipPropertySubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{tooltip.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> @@ -26,5 +21,4 @@ <a4j:commandButton action="#{tooltip.bTest5}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> <h:outputText value="#{msg.t5Tooltip}"/> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,5 +1,5 @@ -<f:subview id="treeSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:dnd="http://richfaces.ajax4jsf.org/drag-drop"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="treeSubviewID"> <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> @@ -11,14 +11,14 @@ ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator" immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" iconCollapsed="#{bean.iconCollapsed}" iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" dropListener="#{bean.processDrop}" - onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" - ondragend="print('ondragendInputID', 'ondragend work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')" - ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" - ondrop="print('ondropInputID', 'ondrop work!')" ondropend="print('ondropendInputID', 'ondropend work!')" - onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" - onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + onclick="showEvent('onclickInputID', 'onclick work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick 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!')" + onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"> <f:facet name="icon"> <h:outputText value="icon" rendered="#{bean.renderFacets}" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,8 +1,4 @@ -<f:subview id="treePropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="treePropertySubviewID"> + </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,14 +1,13 @@ -<f:subview id="virtualEarthSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthSubviewID"> <h:panelGrid columns="2"> <rich:virtualEarth style="width:800px;" version="#{virtualEarth.version}" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" - mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" - onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onmousedown="print('onmousedownInputID', 'onmousedown work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/> + mapStyle="Hybrid" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup 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!')"/> </h:panelGrid> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,9 +1,5 @@ -<f:subview id="virtualEarthPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthPropertySubviewID"> <h:panelGroup> <f:verbatim> Dashboard:<br /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2008-01-22 08:44:45 UTC (rev 5527) @@ -125,10 +125,6 @@ <to-view-id>/pages/Select/Map.xhtml</to-view-id> </navigation-case> <navigation-case> - <from-outcome>RichTest</from-outcome> - <to-view-id>/RichTest/RichTest.xhtml</to-view-id> - </navigation-case> - <navigation-case> <from-outcome>CustomizePage</from-outcome> <to-view-id>/CustomizePage/CustomizePage.xhtml</to-view-id> </navigation-case> @@ -142,20 +138,6 @@ </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/Panel/Panel.xhtml</from-view-id> - <navigation-case> - <from-outcome>Sample2</from-outcome> - <to-view-id>/Panel/Panel2.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/Panel/panel2.xhtml</from-view-id> - <navigation-case> - <from-outcome>BackP</from-outcome> - <to-view-id>/Panel/Panel.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> <from-view-id>*</from-view-id> <navigation-case> <from-outcome>main</from-outcome> @@ -168,9 +150,4 @@ <lifecycle> <phase-listener id="phaseTracker">util.phaseTracker.PhaseTracker</phase-listener> </lifecycle> - <application> - <locale-config> - <default-locale>en</default-locale> - </locale-config> - </application> </faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-01-22 08:44:45 UTC (rev 5527) @@ -33,20 +33,21 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-RichPanelsBean.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-RichTest.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</param-value> + <param-value>/WEB-INF/faces-config-RichPanelsBean.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-RichTest.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</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,11 +1,8 @@ -<f:subview contentType="text/html" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="jQuerySubviewID"> <style> .divSize_1 { width: 150px; @@ -15,7 +12,7 @@ } .divColor_1 { - + background-color: #1E90FF; } @@ -44,7 +41,6 @@ color: #228B22; } </style> - <h:panelGrid id="panelGridID" columns="2" border="1"> <h:outputText value="add text: [li],work!, e.g. A. one [li],work!" /> <h:panelGroup> @@ -80,16 +76,15 @@ <rich:jQuery selector="li" timing="onload" query="find('ol').end().append('[li],work!')" /> - + <rich:jQuery selector="body" timing="onload" query="addClass('body')"/> <rich:jQuery selector="tr:nth-child(odd)" timing="onload" query="addClass('oddTable')" /> <rich:jQuery selector="#panelGridID tr" query="mouseover(function(){jQuery(this).addClass('activeTable')})"/> <rich:jQuery selector="#panelGridID tr" query="mouseout(function(){jQuery(this).removeClass('activeTable')})"/> <rich:jQuery selector="#div_2_ID" timing="onload" query="mouseover(function(){jQuery(this).fadeOut({height: 'hide'}, 500).text('New text').animate({height: 'show'}, 500)})" /> - <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('&lt;p class=\'fontColor\'&gt;add text3&lt;p&gt;')"/> + <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('&lt;p class=\'fontColor\'&gt;add text3&lt;p&gt;')"/> <rich:jQuery selector="#div_1_ID" timing="onload" query="addClass('divSize_1')" /> <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> <rich:jQuery selector="#form\\:panelGridID #div_2_ID" timing="onload" query="addClass('divSize_2')" /> -</f:subview> - +</f:subview> \ No newline at end of file Deleted: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryProperty.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryProperty.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,7 +0,0 @@ -<f:subview id="jQueryPropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> -</f:subview> \ No newline at end of file Deleted: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryStraightforward.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQueryStraightforward.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,7 +0,0 @@ -<f:subview id="jQueryStraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> -</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -9,7 +9,7 @@ <head> <title></title> <script type="text/javascript"> - function print(elementID, value) { + function showEvent(elementID, value) { var oldObject = window.document.getElementById(elementID); var newObject = window.document.createElement('input'); newObject.type = "text"; Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -7,7 +7,7 @@ <title></title> <script type="text/javascript"> - function print(elementID, value) { + function showEvent(elementID, value) { var oldObject = window.document.getElementById(elementID); if(oldObject == null || oldObject.type == "text") return; var newObject = window.document.createElement('input'); @@ -22,7 +22,7 @@ </head> <body> <div id="divOpthID" align="right" style="z-index: 200"><ui:include src="/pages/RichMenu/RichMenu.xhtml" /></div> - <h:form> + <h:form id="formID"> <h:panelGrid id="richGridID" columns="1"> <h:column rendered="#{richBean.reComponent}"> <ui:include src="${richBean.pathComponent}" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -1,6 +1,10 @@ <h:form id="forvDivOpthID" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:panelGrid columns="4" border="1"> + <h:panelGrid columns="5" border="1"> + <h:panelGrid columns="1"> + <h:commandButton value="submit" style="width : 85px; height : 21px;"></h:commandButton> + <a4j:commandButton value="submit[a4j]" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> + </h:panelGrid> <h:column> <a4j:status startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status> </h:column> @@ -29,43 +33,7 @@ <h:panelGrid columns="1"> <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="Blank" itemLabel="Blank" /> - <f:selectItem itemValue="ComponentControl" itemLabel="ComponentControl" /> - <f:selectItem itemValue="OrderingList" itemLabel="OrderingList" /> - <f:selectItem itemValue="ListShuttle" itemLabel="ListShuttle" /> - <f:selectItem itemValue="ContextMenu" itemLabel="ContextMenu" /> - <f:selectItem itemValue="Calendar" itemLabel="Calendar" /> - <f:selectItem itemValue="DataFilterSlider" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="DataScroller" itemLabel="Date Scroller" /> - <f:selectItem itemValue="DataTable" itemLabel="Date Table" /> - <f:selectItem itemValue="DataDefinitionList" itemLabel="DataDefinitionList" /> - <f:selectItem itemValue="DataOrderedList" itemLabel="DataOrderedList" /> - <f:selectItem itemValue="DragAndDrop" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="DropDownMenu" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="Effect" itemLabel="Effect" /> - <f:selectItem itemValue="Gmap" itemLabel="Gmap" /> - <f:selectItem itemValue="InputNumberSlider" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="InputNumberSpinner" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="Insert" itemLabel="Insert" /> - <f:selectItem itemValue="Message" itemLabel="Message" /> - <f:selectItem itemValue="ModalPanel" itemLabel="Modal Panel" /> - <f:selectItem itemValue="Paint2D" itemLabel="Paint2D" /> - <f:selectItem itemValue="Panel" itemLabel="Panel" /> - <f:selectItem itemValue="Panel2" itemLabel="Panel2" /> - <f:selectItem itemValue="PanelBar" itemLabel="Panel Bar" /> - <f:selectItem itemValue="PanelMenu" itemLabel="Panel Menu" /> - <f:selectItem itemValue="Separator" itemLabel="Separator" /> - <f:selectItem itemValue="SimpleTogglePanel" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="Spacer" itemLabel="Spacer" /> - <f:selectItem itemValue="SuggestionBox" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="TabPanel" itemLabel="Tab Panel" /> - <f:selectItem itemValue="TogglePanel" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="ToolBar" itemLabel="Tool Bar" /> - <f:selectItem itemValue="Tooltip" itemLabel="Tooltip" /> - <f:selectItem itemValue="Tree" itemLabel="Tree" /> - <f:selectItem itemValue="VirtualEarth" itemLabel="Virtual Earth" /> - <f:selectItem itemValue="ScrollableDataTable" itemLabel="ScrollableDataTable" /> - <f:selectItem itemValue="jQuery" itemLabel="jQuery" /> + <f:selectItems value="#{richBean.list}"/> </h:selectOneMenu> </h:panelGrid> </h:panelGrid> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -10,7 +10,7 @@ <title></title> <script type="text/javascript"> - function print(elementID, value) { + function showEvent(elementID, value) { var oldObject = window.document.getElementById(elementID); var newObject = window.document.createElement('input'); newObject.type = "text"; Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2008-01-22 08:44:45 UTC (rev 5527) @@ -9,7 +9,7 @@ <head> <title></title> <script type="text/javascript"> - function print(elementID, value) { + function showEvent(elementID, value) { var oldObject = window.document.getElementById(elementID); var newObject = window.document.createElement('input'); newObject.type = "text"; Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css 2008-01-22 08:42:45 UTC (rev 5526) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css 2008-01-22 08:44:45 UTC (rev 5527) @@ -29,7 +29,7 @@ .infoLabel { color: #00FF00; -width: inherit; + width: inherit; } .fatalLabel {