[richfaces-svn-commits] JBoss Rich Faces SVN: r5369 - in trunk/test-applications/jsp/src/main: java/columns and 33 other directories.

Author: ayanul Date: 2008-01-15 03:13:07 -0500 (Tue, 15 Jan 2008) New Revision: 5369 Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java trunk/test-applications/jsp/src/main/java/columns/Columns.java trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java trunk/test-applications/jsp/src/main/java/rich/MapComponent.java trunk/test-applications/jsp/src/main/java/rich/RichBean.java trunk/test-applications/jsp/src/main/java/sb/Data.java trunk/test-applications/jsp/src/main/java/sb/Sb.java trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java trunk/test-applications/jsp/src/main/java/util/data/Data.java trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp trunk/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp Log: add ja api update attribute Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -72,10 +72,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 +122,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: trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java =================================================================== --- trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -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: trunk/test-applications/jsp/src/main/java/columns/Columns.java =================================================================== --- trunk/test-applications/jsp/src/main/java/columns/Columns.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/columns/Columns.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -27,9 +27,9 @@ this.end = "10"; this.width = "100"; this.title = "Title columns"; - this.colspan = 5; - this.rowspan = 5; - this.breakBefore = true; + this.colspan = 1; + this.rowspan = 1; + this.breakBefore = false; this.sortable = true; this.dataTableRendered = true; this.length1 = 5; Modified: trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java =================================================================== --- trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -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: trunk/test-applications/jsp/src/main/java/rich/MapComponent.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/MapComponent.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/rich/MapComponent.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.Set; public class MapComponent { private Map<String, ArrayList<String>> m; @@ -18,4 +19,8 @@ public ArrayList<String> get(String key){ return m.get(key); } + + public Set getSet() { + return m.keySet(); + } } Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -1,6 +1,7 @@ package rich; import java.util.ArrayList; +import java.util.List; import org.richfaces.VersionBean; @@ -12,13 +13,15 @@ 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})); @@ -120,4 +123,12 @@ public void setVersion(String version) { this.version = version; } + + public boolean isLog() { + return log; + } + + public void setLog(boolean log) { + this.log = log; + } } Modified: trunk/test-applications/jsp/src/main/java/sb/Data.java =================================================================== --- trunk/test-applications/jsp/src/main/java/sb/Data.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/sb/Data.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -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: trunk/test-applications/jsp/src/main/java/sb/Sb.java =================================================================== --- trunk/test-applications/jsp/src/main/java/sb/Sb.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/sb/Sb.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -11,7 +11,6 @@ private ArrayList cities; private ArrayList data; - private ArrayList tokens; private int first; private int zindex; private double frequency; @@ -27,6 +26,7 @@ private String shadowOpacity; private String bgColor; private String shadowDepth; + private Object tokens; private boolean focus; /* @@ -50,6 +50,7 @@ public Sb() { + tokens = "[ ,"; border = "1"; width = "200"; height = "150"; @@ -198,14 +199,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!!!"); } @@ -338,4 +331,16 @@ 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; + } } Modified: trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -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: trunk/test-applications/jsp/src/main/java/util/data/Data.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-01-15 08:13:07 UTC (rev 5369) @@ -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: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -5,94 +5,97 @@ <f:subview id="calendarSubviewID"> - <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}"/> + <h:messages /> + <rich:messages showDetail="true"></rich:messages> - <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:panelGrid columns="2"> + <h:outputText value="Client mode" rendered="#{calendarBean.renderedClient}" /> + <h:outputText value="Ajax mode" rendered="#{calendarBean.renderedAjax}" /> - <f:facet name="optionalHeader"> - <h:outputText value="optionalHeader 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: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> - - <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: trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,7 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="calendarPropertySubviewID"> - <rich:simpleTogglePanel id="calendarPropertyID" switchType="client" opened="true" label="calendar property"> + <h:panelGrid columns="2"> <h:panelGroup> <a4j:commandButton value="reRender" reRender="calendarClientID,calendarAjaxID"></a4j:commandButton> @@ -30,9 +30,38 @@ </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="isDayEnabled: "></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.isDayEnabled}"></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.todayControlMode}"> + <f:selectItem itemLabel="scroll" itemValue="scroll" /> + <f:selectItem itemLabel="select" itemValue="select" /> + <f:selectItem itemLabel="hidden" itemValue="hidden" /> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Custom day labels" /> <h:selectOneRadio value="#{calendarBean.weekDay}"> <f:selectItem itemLabel="none" itemValue="none" /> <f:selectItem itemLabel="day labels" itemValue="long" /> @@ -71,6 +100,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}" /> @@ -142,5 +180,27 @@ <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.enable()" value="enable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.disable()" value="disable"></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())" value="getSelectedDate"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.enableDate" value="enableDate"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.disableDate" value="disableDate"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.enableDates" value="enableDates"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:calendarSubviewID:calendarClientID').component.disableDates" value="disableDates"></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.getData())" value="getData"></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: trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="calendarStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="calendar straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{calendarBean.bTest1}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -12,16 +12,28 @@ <rich:dataTable id="richColumnsID" value="#{columns.data1}" var="d1" rendered="#{columns.dataTableRendered}"> <h:column> + <f:facet name="header"> + <h:outputText value="header (h)"></h:outputText> + </f:facet> <h:outputText value="h: #{d1.int0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="footer (h)"></h:outputText> + </f:facet> </h:column> - + <rich:column> + <f:facet name="header"> + <h:outputText value="header (rich)"></h:outputText> + </f:facet> <h:outputText value="rich: #{d1.int0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="footer (rich)"></h:outputText> + </f:facet> </rich:column> <rich:columns value="#{columns.data2}" var="d2" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" - columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" title="#{columns.title}" - begin="#{columns.begin}" end="100" width="#{columns.width}"> + columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" + begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}"> <f:facet name="header"> <h:outputText value="header #{d2.int0}"></h:outputText> </f:facet> @@ -36,16 +48,28 @@ <h:dataTable id="hColumnsID" value="#{columns.data1}" var="d1" rendered="#{!columns.dataTableRendered}" border="1"> <h:column> + <f:facet name="header"> + <h:outputText value="header (h)"></h:outputText> + </f:facet> <h:outputText value="h: #{d1.int0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="footer (h)"></h:outputText> + </f:facet> </h:column> - + <rich:column> + <f:facet name="header"> + <h:outputText value="header (rich)"></h:outputText> + </f:facet> <h:outputText value="rich: #{d1.int0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="footer (rich)"></h:outputText> + </f:facet> </rich:column> <rich:columns value="#{columns.data2}" var="d2" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" - columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" title="#{columns.title}" - begin="#{columns.begin}" end="100" width="#{columns.width}"> + columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" + begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}"> <f:facet name="header"> <h:outputText value="header #{d2.int0}"></h:outputText> </f:facet> @@ -61,7 +85,7 @@ <f:verbatim><br/></f:verbatim> <h:outputText value="test columns (*) "></h:outputText> - <rich:dataTable value="#{columns.data1}" var="data" > + <rich:dataTable value="#{columns.data1}" var="data"> <rich:columns columns="#{columns.columns}"> <h:outputText value="#{data.str0}"></h:outputText> </rich:columns> Modified: trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -22,10 +22,6 @@ <h:commandButton action="#{columns.addNewItem2}" value="ok" onclick="submit();"></h:commandButton> </h:panelGroup> - <h:outputText value="title:"></h:outputText> - <h:inputText value="#{columns.title}" onchange="submit();"> - </h:inputText> - <h:outputText value="columns (*):"></h:outputText> <h:inputText value="#{columns.columns}" onchange="submit();"> </h:inputText> Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,50 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="calendarJSAPIID"> + <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> + <br /> + <a href="#" id="doEnableCalendarID">Calendar (enable)</a> + <br /> + <a href="#" id="doDisableCalendarID">Calendar (disable)</a> + <br /> + <a href="#" id="doCurrentYearCalendarID">Calendar (currentYear)</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" /> + <rich:componentControl attachTo="doEnableCalendarID" for="ccCalendarID" event="onclick" operation="enable" /> + <rich:componentControl attachTo="doDisableCalendarID" for="ccCalendarID" event="onclick" operation="disable" /> + <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="disable" /> + <rich:componentControl attachTo="doCurrentYearCalendarID" for="ccCalendarID" event="onclick" operation="getCurrentYear" /> + <f:verbatim> +selectDate(date) Selects the date specified. If the date isn't in current month - performs request to select +isDateEnabled(date) Checks if given date is selectable +enableDate(date) Enables date cell control on the calendar +disableDate(date) Disables date cell control on the calendar +enableDates(date[]) Enables dates cell controls set on the calendar +disableDates(date[]) Disables dates cell controls set on the calendar +getSelectedDate() Returns currently selected date +Object getData() Returns additional data for the date +getCurrentMonth() Returns number of the month currently being viewed +getCurrentYear() Returns number of the year currently being viewed +</f:verbatim> +</f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -28,34 +28,14 @@ <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 /> @@ -78,4 +58,6 @@ </rich:contextMenu> <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="show" params="expand:'show work'" /> + + <jsp:include page="CalendarJSAPI.jsp" /> </f:subview> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="contextMenuJSAPIID"> +</f:subview> Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="ListShuttleJSAPIID"> +</f:subview> Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="modalPanelJSAPIID"> +</f:subview> Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="orderinJSAPIID"> +</f:subview> Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="PanelMenuJSAPIID"> +</f:subview> Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="scrollableDataTableJSAPIID"> +</f:subview> Added: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="toolTipJSAPIID"> +</f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -10,6 +10,9 @@ <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"> @@ -39,8 +42,10 @@ </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}" Modified: trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -27,91 +27,7 @@ </head> <body> <h:form id="test"> - <rich:dataTable id="richColumnsID" value="#{columns.data1}" var="d1" - rendered="#{columns.dataTableRendered}"> - <h:column> - <h:outputText value="h: #{d1.int0}"></h:outputText> - </h:column> - <rich:column> - <h:outputText value="rich: #{d1.int0}"></h:outputText> - </rich:column> - - <rich:columns value="#{columns.data2}" var="d2" - breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" - columns="#{columns.columns}" index="index" - rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" - title="#{columns.title}" begin="#{columns.begin}" end="100" - width="#{columns.width}"> - <f:facet name="header"> - <h:outputText value="header #{d2.int0}"></h:outputText> - </f:facet> - <h:outputText value="#{index}. "></h:outputText> - <h:outputText value="#{d1.str0}, "></h:outputText> - <h:outputText value="#{d2.str0}"></h:outputText> - <f:facet name="footer"> - <h:outputText value="footer #{d2.int0}"></h:outputText> - </f:facet> - </rich:columns> - </rich:dataTable> - <h:commandButton value="submit"></h:commandButton> - <a4j:commandButton value="submit [a4j]" reRender="columnsID"></a4j:commandButton> - <h:panelGrid columns="2"> - <f:facet name="header"> - <h:outputText value="columns"></h:outputText> - </f:facet> - <h:outputText value="Enter quantity of lines [data 1]" /> - <h:panelGroup> - <h:inputText value="#{columns.length1}" /> - <h:commandButton action="#{columns.addNewItem1}" value="ok" - onclick="submit();"></h:commandButton> - </h:panelGroup> - - <h:outputText value="Enter quantity of lines [data 2]" /> - <h:panelGroup> - <h:inputText value="#{columns.length2}" /> - <h:commandButton action="#{columns.addNewItem2}" value="ok" - onclick="submit();"></h:commandButton> - </h:panelGroup> - - <h:outputText value="title:"></h:outputText> - <h:inputText value="#{columns.title}" onchange="submit();"> - </h:inputText> - - <h:outputText value="columns (*):"></h:outputText> - <h:inputText value="#{columns.columns}" onchange="submit();"> - </h:inputText> - - <h:outputText value="rowspan:"></h:outputText> - <h:inputText value="#{columns.rowspan}" onchange="submit();"> - </h:inputText> - - <h:outputText value="colspan:"></h:outputText> - <h:inputText value="#{columns.colspan}" onchange="submit();"> - </h:inputText> - - <h:outputText value="begin:"></h:outputText> - <h:inputText value="#{columns.begin}" onchange="submit();"> - </h:inputText> - - <h:outputText value="end:"></h:outputText> - <h:inputText value="#{columns.end}" onchange="submit();"> - </h:inputText> - - <h:outputText value="width:"></h:outputText> - <h:inputText value="#{columns.width}" onchange="submit();"> - </h:inputText> - - <h:outputText value="sortable"></h:outputText> - <h:selectBooleanCheckbox value="#{columns.sortable}" - onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="breakBefore:"></h:outputText> - <h:selectBooleanCheckbox value="#{columns.breakBefore}" - onchange="submit();"> - </h:selectBooleanCheckbox> - </h:panelGrid> </h:form> </body> </f:view> Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,8 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="datascrollerPropertySubviewID"> - <rich:simpleTogglePanel id="dTablePropertyID" switchType="client" opened="true" - label="datascroller property"> <h:commandButton action="#{dataScroller.CutArray}" value="CutArray" /> <h:commandButton action="#{dataScroller.RestoreArray}" @@ -45,5 +43,4 @@ <a4j:support event="onclick" reRender="dataTableId"></a4j:support> </h:selectOneRadio> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,8 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="datascrollerStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" - label="datascroller straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataScroller.bTest1}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> @@ -27,5 +25,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: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="dataTablePropertySubviewID"> - <rich:simpleTogglePanel id="dtPropertyID" switchType="client" opened="true" label="dataTable property"> <h:panelGrid columns="2" style="top"> <h:outputText value="Align:"></h:outputText> <h:selectOneMenu value="#{dataTable.align}"> @@ -35,5 +34,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: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="StraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataTable.bTest1}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -64,5 +64,4 @@ </rich:dropDownMenu> </rich:panel> </h:panelGrid> - <a4j:log></a4j:log> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="dropDownMenuPropertySubviewID"> - <rich:simpleTogglePanel id="ddMenuPropertyID" switchType="client" opened="true" label="dropDownMenu property"> <h:panelGrid columns="2"> <h:outputText value="HideDelay (ms):" /> <h:inputText value="#{dDMenu.hideDelay}"> @@ -87,5 +86,4 @@ </h:selectBooleanCheckbox> <h:commandButton action="#{dDMenu.changeIcons}" value="ChangeIcons" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="dropDownMenuStraightforwardSubviewID"> - <rich:simpleTogglePanel id="ddMenuStraightforwardID" switchType="client" opened="true" label="dropDownMenu straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dDMenu.bTest1}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="inputNumberSliderPropertySubviewID"> - <rich:simpleTogglePanel id="iNSliderPropertyID" switchType="client" opened="true" label="inputNumberSlider property"> <h:panelGrid columns="2" cellspacing="10px" border="1"> <h:outputText value="value" /> <h:inputText value="#{inputNumberSlider.value}"> @@ -102,5 +101,4 @@ reRender="SliderId,slBtn"> </a4j:commandButton> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="inputNumberSliderStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSlider straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSlider.bTest1}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="iNSpinnerPropertySubviewID"> - <rich:simpleTogglePanel id="iNSpinnerPropertyID" switchType="client" opened="true" label="inputNumberSpinner property"> <h:panelGrid columns="2" cellpadding="10px" border="1"> <h:outputText value="Max: "></h:outputText> <h:inputText value="#{inputNumberSpinner.max}"> @@ -52,5 +51,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: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="iNSpinnerStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSpinner straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSpinner.bTest1}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -8,9 +8,9 @@ <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" /> @@ -107,4 +107,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: trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="MessagePropertySubviewID"> - <rich:simpleTogglePanel id="msgPropertyID" switchType="client" opened="true" label="modalPanel property"> <h:panelGrid columns="2"> <h:outputText value="1." /> <h:selectOneMenu id="select1" value="#{message.select1}"> @@ -87,5 +86,4 @@ <h:commandButton value="submit" /> <a4j:commandButton value="submit ajax" /> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,7 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="modalPanelSubviewID"> - <h:messages /> + <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}" @@ -25,6 +25,7 @@ <f:selectItem itemLabel="2" itemValue="2" /> <f:selectItem itemLabel="3" itemValue="3" /> </h:selectOneListbox> + <jsp:include page="/Calendar/Calendar.jsp" /> <f:verbatim> <br /> <br /> Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="ModalPanelPropertySubviewID"> - <rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property"> <h:panelGrid columns="2"> <h:outputText value="shadowDepth" /> <h:inputText value="#{modalPanel.shadowDepth}" > @@ -83,5 +82,4 @@ <a4j:support event="onclick" reRender="modalPanelID"></a4j:support> </h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="ModalPanelStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{modalPanel.bTest1}" value="run" reRender="modalPanelID,mpPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -66,13 +66,13 @@ <f:facet name="header"> <h:outputText value="select" /> </f:facet> - <h:selectOneMenu value="#{item.str2}" reRender="orderingListID"> + <h:selectOneMenu value="#{item.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" /> - <a4j:support event="onclick" action="submit();"></a4j:support> + <a4j:support event="onclick" reRender="orderingListID"></a4j:support> </h:selectOneMenu> </h:column> @@ -90,4 +90,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: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -104,9 +104,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: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="Paint2DPropertySubviewID"> - <rich:simpleTogglePanel id="paint2DPropertyID" switchType="client" opened="true" label="paint2D property"> <h:panelGrid columns="2" cellpadding="5px" border="2"> <h:outputText value="Text"></h:outputText> <h:inputText value="#{paintData.text}"> @@ -81,5 +80,4 @@ <a4j:support event="onclick" reRender="paint2dID"></a4j:support> </h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="PanelPropertySubviewID"> - <rich:simpleTogglePanel id="panelPropertyID" switchType="client" opened="true" label="panel property"> <h:panelGrid columns="2" cellpadding="10px"> <h:outputText value="Title"></h:outputText> <h:inputText valueChangeListener="#{panel.makeTitle}"> @@ -24,5 +23,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: trunk/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="PanelStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="panel straightforward"> <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 +25,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: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="panelBarPropertySubviewID"> - <rich:simpleTogglePanel id="pbPropertyID" switchType="client" opened="true" label="panelBar property"> <h:panelGrid columns="2" cellspacing="10px"> <h:outputText value="Label: "></h:outputText> <h:inputText valueChangeListener="#{panelBar.makeLabels}"> @@ -29,5 +28,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: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="panelBarStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="panelBar straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelBar.bTest1}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -170,4 +170,5 @@ </rich:panelMenuGroup> </rich:panelMenuGroup> </rich:panelMenu> + </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="panelMenuPropertySubviewID"> - <rich:simpleTogglePanel id="pmPropertyID" switchType="client" opened="true" label="panelMenu property"> <h:panelGrid columns="2"> <h:outputText value="Width"></h:outputText> <h:inputText value="#{panelMenu.width}"> @@ -269,5 +268,14 @@ <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="$('formID:panelMenuSubviewID:panelMenuID').component.doExpand()" value="doExpand"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:panelMenuSubviewID:panelMenuID').component.doExpand" value="doExpand"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:panelMenuSubviewID:panelMenuID').component.expand" value="doExpand"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:panelMenuSubviewID:panelMenuID').component.doExpand(event)" value="doExpand"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:panelMenuSubviewID:panelMenuID').component.doCollapse()" value="doCollapse"></a4j:commandLink> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="panelMenuStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="panelMenu straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelMenu.bTest1}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,41 +4,62 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="scrollableDataTableSubviewID"> - <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}" - hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" reRender="inputID" - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" onselectionchange="showEvent('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: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="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> + <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 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="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: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -5,14 +5,52 @@ <f:subview 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: trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="SeparatorPropertySubviewID"> - <rich:simpleTogglePanel id="separatorPropertyID" switchType="client" opened="true" label="separator property"> <h:panelGrid columns="2"> <h:outputText value="Width (px or %): "></h:outputText> <h:inputText value="#{separator.width}"> @@ -45,5 +44,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: trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="SeparatorStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="separator straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{separator.bTest1}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="stpPropertySubviewID"> - <rich:simpleTogglePanel id="stpPropertyID" switchType="client" opened="true" label="spacer property"> <h:panelGrid columns="2" border="1"> <h:outputText value="Width:"> </h:outputText> @@ -30,5 +29,4 @@ <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()"> </h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="stpStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{simpleTogglePanel.bTest1}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="spacerStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{spacer.bTest1}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -9,12 +9,12 @@ <br /> </f:verbatim> <h:inputText value="#{sb.property}" id="text" /> - <rich:suggestionbox id="suggestionBoxId" for="text" var="result" - suggestionAction="#{sb.autocomplete}" - width="#{sb.width}" height="#{sb.height}" border="#{sb.border}" + <rich:suggestionbox id="suggestionBoxId" 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="1" tokens=", ]" + 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}" Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="suggestionboxPropertySubviewID"> - <rich:simpleTogglePanel id="sbPropertyID" switchType="client" opened="true" label="suggestionBox property"> <h:panelGrid columns="2" cellpadding="5px"> <h:outputText value="z-index"></h:outputText> @@ -48,6 +47,9 @@ <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}"> @@ -95,5 +97,4 @@ <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> </h:selectOneRadio> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,8 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="suggestionboxStraightforwardSubviewID"> - - <rich:simpleTogglePanel switchType="client" opened="true" label="suggestionBox straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{sb.bTest1}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> @@ -27,5 +25,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: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="tabPanelStraightforwardSubviewID"> - <rich:simpleTogglePanel id="tpPropertyID" switchType="client" opened="true" label="tabPanel property"> <h:panelGrid columns="2" cellspacing="10px"> <h:outputText value="Width (px or %):"></h:outputText> <h:inputText value="#{tabPanel.width}" onchange="submit();" /> @@ -63,5 +62,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: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="tabPanelPropertySubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{tabPanel.bTest1}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="togglePanelPropertySubviewID"> - <rich:simpleTogglePanel id="tPanelPropertyID" switchType="client" opened="true" label="tooglePanel property"> <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> <h:outputText value="InitialState:"></h:outputText> <h:selectOneRadio value="#{togglePanel.initialState}"> @@ -29,5 +28,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: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,8 +4,7 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="togglePanelStraightforwardSubviewID"> - <rich:simpleTogglePanel switchType="client" opened="true" label="tooglePanel straightforward"> - <h:panelGrid columns="2"> + <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 +25,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: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -25,7 +25,14 @@ </f:facet> </rich:toolTip> </h:inputText> - + <h:panelGrid columns="3"> + <h:outputText value="JavaScript API"></h:outputText> + <h:column></h:column> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:inp1').component.doShow()" value="doShow"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:inp1').component.doHide()" value="doHide"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:inp1').component.doEnable()" value="doEnable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:inp1').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!')" Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="toolTipStraightforwardSubviewID"> - <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}"> @@ -75,5 +74,4 @@ <a4j:support event="onclick" reRender="tooltipID" /> </h:selectBooleanCheckbox> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,7 +4,6 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="toolTipPropertySubviewID"> - <rich:simpleTogglePanel id="toolTipStraightforwardID" switchType="client" opened="true" label="toolTip straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{tooltip.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> @@ -26,5 +25,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: trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -22,42 +22,45 @@ oldObject.parentNode.replaceChild(newObject,oldObject); } </script> - <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> + <link rel="stylesheet" + href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> </head> <body> - <div id="divOpthID" align="right" style="z-index: 200"> - <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> - </div> - <h:form> + <div id="divOpthID" align="right" style="z-index: 200"><jsp:include + page="/pages/RichMenu/RichMenu.jsp" /></div> + <h:form id="formID"> <h:panelGrid id="richGridID" columns="1"> <h:column rendered="#{richBean.reComponent}"> <jsp:include page="${richBean.pathComponent}" /> </h:column> <h:column rendered="#{!richBean.reComponent}"></h:column> - + <h:column rendered="#{richBean.reStraightforward}"> <jsp:include page="${richBean.pathStraightforward}" /> </h:column> <h:column rendered="#{!richBean.reStraightforward}"></h:column> - + <h:column rendered="#{richBean.reProperty}"> <jsp:include page="${richBean.pathProperty}" /> </h:column> <h:column rendered="#{!richBean.reProperty}"></h:column> </h:panelGrid> </h:form> - <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="true" style="overflow: true;"> + <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" + minWidth="200" moveable="true" style="overflow: true;"> <f:facet name="header"> <h:outputText value="Events ..." /> </f:facet> <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');" /> + <h:graphicImage value="/pics/error.gif" + onclick="Richfaces.hideModalPanel('eventInfoID');" /> </f:facet> <jsp:include page="/pages/Action/EventInfo.jsp" /> </rich:modalPanel> - <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> + <a4j:commandButton value="Show event" + onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </body> </f:view> </html> Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-01-15 00:29:48 UTC (rev 5368) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-01-15 08:13:07 UTC (rev 5369) @@ -4,10 +4,14 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <h:form id="forvDivOpthID"> - <h:panelGrid columns="4" border="1"> - <h:column> + <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:panelGrid columns="1"> <a4j:status startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status> - </h:column> + </h:panelGrid> <h:panelGrid columns="1"> <h:panelGroup> <h:outputText value="#{richBean.reComponent ? 'Component hide' : 'Component show'}" />