February 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r6107 - in trunk/test-applications/facelets/src/main: java/combobox and 57 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2008-02-15 04:43:47 -0500 (Fri, 15 Feb 2008) New Revision: 6107 Added: trunk/test-applications/facelets/src/main/java/progressBar/ trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java trunk/test-applications/facelets/src/main/java/util/event/ trunk/test-applications/facelets/src/main/java/util/event/Event.java trunk/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTrackerComponent.java trunk/test-applications/facelets/src/main/java/util/ptComponent/ trunk/test-applications/facelets/src/main/java/util/ptComponent/PTComponent.java trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ProgressBar/ trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Event.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PTComponent.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ProgressBar.xml Removed: trunk/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml Modified: trunk/test-applications/facelets/src/main/java/combobox/Combobox.java trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java trunk/test-applications/facelets/src/main/java/message/Message.java trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java trunk/test-applications/facelets/src/main/java/pickList/PickList.java trunk/test-applications/facelets/src/main/java/rich/RichBean.java trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java trunk/test-applications/facelets/src/main/java/util/data/Data.java trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Blank/Blank.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankProperty.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml Log: +update test +add progressBar Modified: trunk/test-applications/facelets/src/main/java/combobox/Combobox.java =================================================================== --- trunk/test-applications/facelets/src/main/java/combobox/Combobox.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/combobox/Combobox.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -46,7 +46,7 @@ this.tabindex = 2; this.size = 5; this.showDelay = "200"; - this.required = true; + this.required = false; this.requiredMessage = "requiredMessage"; this.rendered = true; this.selectFirstOnUpdate = true; Modified: trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java =================================================================== --- trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -19,6 +19,7 @@ private String mode; private boolean rendered; private boolean disabled; + private boolean disabledDDM; private boolean check; public DDMenu() { @@ -37,6 +38,7 @@ iconFolder = null; rendered = true; disabled = false; + disabledDDM = false; check = false; } @@ -248,4 +250,12 @@ setPopupWidth("auto"); setDisabled(true); } + + public boolean isDisabledDDM() { + return disabledDDM; + } + + public void setDisabledDDM(boolean disabledDDM) { + this.disabledDDM = disabledDDM; + } } Modified: trunk/test-applications/facelets/src/main/java/message/Message.java =================================================================== --- trunk/test-applications/facelets/src/main/java/message/Message.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/message/Message.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -7,7 +7,6 @@ private boolean showDetail; private boolean showSummary; private boolean tooltip; - private boolean globalOnly; private String select1; private String select2; private String select3; @@ -21,7 +20,6 @@ showDetail = true; showSummary = false; tooltip = true; - globalOnly = false; select1 = "error"; select2 = "error"; select3 = "error"; @@ -186,12 +184,4 @@ setSelect4("passed"); setSelect5("warn"); } - - public boolean isGlobalOnly() { - return globalOnly; - } - - public void setGlobalOnly(boolean globalOnly) { - this.globalOnly = globalOnly; - } } Modified: trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java =================================================================== --- trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,7 +1,7 @@ package modalPanel; public class ModalPanel { - + private String id; private boolean autosized; private boolean keepVisualState; private String left; @@ -222,4 +222,12 @@ public void setZindex(int zindex) { this.zindex = zindex; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } Modified: trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java =================================================================== --- trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -8,7 +8,7 @@ private String width; private String mode; private String align; - private String rendered; + private boolean rendered; private String iconItemPosition; private String iconItemTopPosition; private String iconGroupPosition; @@ -18,13 +18,13 @@ private String inputText; private boolean disabled; private boolean expandSingle; - + public PanelMenu() { width = "500px"; mode = "none"; expandMode = "none"; align = ""; - rendered = "true"; + rendered = true; disabled = false; tabIndex = "1"; iconGroupPosition = "left"; @@ -39,64 +39,83 @@ icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); } - + public boolean isDisabled() { return disabled; } + public String getWidth() { return width; } + public void setWidth(String width) { this.width = width; } + public void setDisabled(boolean disabled) { this.disabled = disabled; } + public boolean isExpandSingle() { return expandSingle; } + public void setExpandSingle(boolean expandSingle) { this.expandSingle = expandSingle; } + public String getAlign() { return align; } + public void setAlign(String align) { this.align = align; } - public String getRendered() { + + public boolean isRendered() { return rendered; } - public void setRendered(String rendered) { + + public void setRendered(boolean rendered) { this.rendered = rendered; } + public Icon getIcon() { return icon; } + public void setIcon(Icon icon) { this.icon = icon; } + public String getIconGroupPosition() { return iconGroupPosition; } + public void setIconGroupPosition(String iconGroupPosition) { this.iconGroupPosition = iconGroupPosition; } + public String getIconGroupTopPosition() { return iconGroupTopPosition; } + public void setIconGroupTopPosition(String iconGroupTopPosition) { this.iconGroupTopPosition = iconGroupTopPosition; } + public String getIconItemPosition() { return iconItemPosition; } + public void setIconItemPosition(String iconItemPosition) { this.iconItemPosition = iconItemPosition; } + public String getIconItemTopPosition() { return iconItemTopPosition; } + public void setIconItemTopPosition(String iconItemTopPosition) { this.iconItemTopPosition = iconItemTopPosition; } @@ -104,7 +123,7 @@ public String getMode() { return mode; } - + public void setMode(String mode) { this.mode = mode; } @@ -133,14 +152,14 @@ this.inputText = inputText; } - public void bTest1(){ + public void bTest1() { icon.setCollapsed(icon.iconCollapse); icon.setExpanded(icon.iconExpand); icon.setItem(icon.iconItem); icon.setIcon(icon.iconFileManager); icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); - + setWidth("400px"); setAlign("right"); setDisabled(false); @@ -154,14 +173,14 @@ setTabIndex("3"); } - public void bTest2(){ + public void bTest2() { icon.setCollapsed(icon.iconExpand); icon.setExpanded(icon.iconCollapse); icon.setItem(icon.iconHeader); icon.setIcon(icon.iconFileManagerReject); icon.setCollapsedGroup(icon.iconAjaxStoped); icon.setDisabledGroup(icon.iconAjaxProcess); - + setWidth("250px"); setAlign("bottom"); setDisabled(false); @@ -172,17 +191,17 @@ setIconItemPosition("right"); setIconItemTopPosition("left"); setMode("server"); - setTabIndex("2"); + setTabIndex("2"); } - public void bTest3(){ + public void bTest3() { icon.setCollapsed(icon.iconCollapse); icon.setExpanded(icon.iconExpand); icon.setItem(icon.iconItem); icon.setIcon(icon.iconFileManager); icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); - + setWidth("400px"); setAlign("middle"); setDisabled(false); @@ -193,18 +212,18 @@ setIconItemPosition("right"); setIconItemTopPosition("left"); setMode("none"); - setTabIndex("2"); - + setTabIndex("2"); + } - public void bTest4(){ + public void bTest4() { icon.setCollapsed(icon.iconExpand); icon.setExpanded(icon.iconCollapse); icon.setItem(icon.iconHeader); icon.setIcon(icon.iconFileManagerReject); icon.setCollapsedGroup(icon.iconAjaxStoped); icon.setDisabledGroup(icon.iconAjaxProcess); - + setWidth("250px"); setAlign("top"); setDisabled(true); @@ -215,18 +234,18 @@ setIconItemPosition("left"); setIconItemTopPosition("left"); setMode("ajax"); - setTabIndex("2"); - + setTabIndex("2"); + } - public void bTest5(){ + public void bTest5() { icon.setCollapsed(icon.iconCollapse); icon.setExpanded(icon.iconExpand); icon.setItem(icon.iconItem); icon.setIcon(icon.iconFileManager); icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); - + setWidth("250px"); setAlign("right"); setDisabled(false); @@ -237,7 +256,7 @@ setIconItemPosition("right"); setIconItemTopPosition("right"); setMode("none"); - setTabIndex("2"); + setTabIndex("2"); } } \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/java/pickList/PickList.java =================================================================== --- trunk/test-applications/facelets/src/main/java/pickList/PickList.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/pickList/PickList.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -19,19 +19,18 @@ public String removeAllControlLabel; public String removeControlLabel; public boolean rendered; - public String showButtonLabels; + public boolean showButtonLabels; public int size; public String sourceListWidth; public boolean switchByClick; public String targetListWidth; public String title; - public String [] value; private ArrayList<SelectItem> data; - - public PickList() { - this.copyAllControlLabel = "copyAllControlLabel"; + + public PickList() { + this.copyAllControlLabel = "copyAllControlLabel"; this.copyControlLabel = "copyControlLabel"; - this.dir = "LTR"; + this.dir = "alert('work')"; this.disabled = false; this.displayValueOnly = false; this.fastOrderControlsVisible = true; @@ -42,7 +41,7 @@ this.removeAllControlLabel = "removeAllControlLabel"; this.removeControlLabel = "removeControlLabel"; this.rendered = true; - this.showButtonLabels = "showButtonLabels"; + this.showButtonLabels = true; this.size = 10; this.sourceListWidth = "300"; this.switchByClick = false; @@ -55,7 +54,7 @@ } public void valueChangeListener(ValueChangeEvent event) { - + //event.getNewValue(); } public String getCopyAllControlLabel() { @@ -202,24 +201,18 @@ this.title = title; } - public String [] getValue() { - return value; + public boolean isShowButtonLabels() { + return showButtonLabels; } - public void setValue(String [] value) { - this.value = value; + public void setShowButtonLabels(boolean showButtonLabels) { + this.showButtonLabels = showButtonLabels; } - public String getShowButtonLabels() { - return showButtonLabels; - } public ArrayList<SelectItem> getData() { - return data; + return data; } public void setData(ArrayList<SelectItem> data) { this.data = data; } - public void setShowButtonLabels(String showButtonLabels) { - this.showButtonLabels = showButtonLabels; - } } Added: trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java =================================================================== --- trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,144 @@ +package progressBar; + +import javax.faces.event.ActionEvent; + +import util.data.Data; + +public class ProgressBar { + private boolean ajaxSingle; + private Integer value; + private boolean enabled; + private String mode; + private String interval; + private String maxValue; + private String minValue; + private boolean dualColoredLabel; + private boolean rendered; + private String listnerInfo; + private boolean ignoreDupResponses; + private boolean permanent; + + public boolean isIgnoreDupResponses() { + return ignoreDupResponses; + } + + public void setIgnoreDupResponses(boolean ignoreDupResponses) { + this.ignoreDupResponses = ignoreDupResponses; + } + + public String getListnerInfo() { + return listnerInfo; + } + + public void setListnerInfo(String listnerInfo) { + this.listnerInfo = listnerInfo; + } + + public String getLoadInfo() { + return Data.cityAfrica[value % 62]; + } + + public ProgressBar() { + ajaxSingle = false; + value = 0; + enabled = false; + mode = "ajax"; + interval = "500"; + maxValue = "100"; + minValue = "0"; + dualColoredLabel = false; + rendered = true; + ignoreDupResponses = false; + permanent = false; + } + + public String action() { + System.out.println("action"); + return null; + } + + public void actionListener(ActionEvent actionEvent){ + System.out.println("actionEvent"); + } + + public boolean isAjaxSingle() { + return ajaxSingle; + } + + public void setAjaxSingle(boolean ajaxSingle) { + this.ajaxSingle = ajaxSingle; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + + public String getInterval() { + return interval; + } + + public void setInterval(String interval) { + this.interval = interval; + } + + public String getMaxValue() { + return maxValue; + } + + public void setMaxValue(String maxValue) { + this.maxValue = maxValue; + } + + public String getMinValue() { + return minValue; + } + + public void setMinValue(String minValue) { + this.minValue = minValue; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public Integer getValue() { + // without a vodka bottle you will not understand :) + return enabled ? (permanent ? new Integer(maxValue) - 1 : value++) : value; + } + + public void setValue(Integer value) { + this.value = value; + } + + public boolean isDualColoredLabel() { + return dualColoredLabel; + } + + public void setDualColoredLabel(boolean dualColoredLabel) { + this.dualColoredLabel = dualColoredLabel; + } + + public boolean isPermanent() { + return permanent; + } + + public void setPermanent(boolean permanent) { + this.permanent = permanent; + } +} Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -12,19 +12,20 @@ private static final String EXT = ".xhtml"; private String version = VersionBean.SCM_REVISION; private String src; + private String srcContainer; private MapComponent map; + private List<SelectItem> list; 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() { + list = new ArrayList<SelectItem>(); src = "Blank"; + srcContainer = "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})); @@ -64,8 +65,13 @@ map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true})); map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false})); map.add("Columns", add("/Columns/Columns", new boolean [] {true, false})); - map.add("PickList", add("/PickList/PickList", new boolean [] {false, false})); - map.add("Combobox", add("/Combobox/Combobox", new boolean [] {false, false})); + map.add("PickList", add("/PickList/PickList", new boolean [] {true, false})); + map.add("Combobox", add("/Combobox/Combobox", new boolean [] {true, false})); + map.add("ProgressBar", add("/ProgressBar/ProgressBar", new boolean [] {false, false})); + Iterator<String> iterator = map.getSet().iterator(); + while(iterator.hasNext()){ + list.add(new SelectItem(iterator.next())); + } } public String getSrc() { @@ -128,21 +134,31 @@ this.version = version; } - public boolean isLog() { - return log; + public List<SelectItem> getList(){ + return list; } + + public String getSrcContainer() { + return srcContainer; + } - public void setLog(boolean log) { - this.log = log; + public void setSrcContainer(String srcContainer) { + this.srcContainer = srcContainer; } - public List<SelectItem> getList(){ + public String getPathComponentContainer() { + return map.get(srcContainer).get(0); + } + + public List<SelectItem> getListContainer() { Iterator<String> iterator = map.getSet().iterator(); - List<SelectItem> list = new ArrayList<SelectItem>(); + List<SelectItem> l = new ArrayList<SelectItem>(); + String str; while(iterator.hasNext()){ - list.add(new SelectItem(iterator.next())); + str = iterator.next(); + if(!str.equals(src)) + l.add(new SelectItem(str)); } - return list; + return l; } - } Modified: trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -24,7 +24,7 @@ private int first; private boolean rendered; - private String timeout; + private int timeout; private String height; private boolean limitToList; private DataComponentState componentState; @@ -43,7 +43,7 @@ data = new ArrayList<Data>(); first = 0; rendered = true; - timeout = "10"; + timeout = 500; height = "400px"; limitToList = false; bypassUpdates = false; @@ -84,11 +84,11 @@ this.rendered = rendered; } - public String getTimeout() { + public int getTimeout() { return timeout; } - public void setTimeout(String timeout) { + public void setTimeout(int timeout) { this.timeout = timeout; } Modified: trunk/test-applications/facelets/src/main/java/util/data/Data.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/data/Data.java 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/java/util/data/Data.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -4,7 +4,7 @@ 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[] 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", "Nigeria", "Republic of the Congo", "Reunion", "Rwanda", "Niger", "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"}; Added: trunk/test-applications/facelets/src/main/java/util/event/Event.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/event/Event.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/util/event/Event.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,1067 @@ +package util.event; + +import javax.faces.model.SelectItem; +import java.util.ArrayList; + +/** + * User: ayanul Date: Feb 11, 2008 Time: 10:15:14 AM + */ +public class Event { + private String onmouseup; + private String ontabenter; + private String ontableave; + private String onLoadMap; + private String onselectionchange; + private String ondownclick; + private String onupclick; + private String oninit; + private String ongroupactivate; + private String onitemselect; + private String onsubmit; + private String onRowClick; + private String onRowDblClick; + private String onRowMouseDown; + private String onRowMouseMove; + private String onRowMouseOut; + private String onRowMouseOver; + private String onRowMouseUp; + private String onselect; + private String onchange; + private String onfocus; + private String onblur; + private String onclick; + private String oncollapse; + private String oncomplete; + private String ondblclick; + private String ondragend; + private String ondragenter; + private String ondragexit; + private String ondragstart; + private String ondrop; + private String ondropend; + private String onexpand; + private String onkeydown; + private String onkeypress; + private String onkeyup; + private String onmousedown; + private String onmousemove; + private String onmouseout; + private String onmouseover; + private String onselected; + private String onhide; + private String onshow; + private String onlistcall; + private String onitemselected; + private String oninputblur; + private String oninputchange; + private String oninputclick; + private String oninputfocus; + private String oninputkeydown; + private String oninputkeypress; + private String oninputkeyup; + private String oninputselect; + private String ondateselected; + private String ondateselect; + private String ontimeselect; + private String ontimeselected; + private String onchanged; + private String ondatemouseover; + private String ondatemouseout; + private String oncurrentdateselect; + private String onbeforedomupdate; + private String onslide; + private String ondropover; + private String ondropout; + private String onerror; + private String ontopclick; + private String onbottomclick; + private String onorderchanged; + private String onmove; + private String onheaderclick; + private String onmaskclick; + private String onresize; + private String onmaskmouseover; + private String onmaskmouseout; + private String onmaskmousemove; + private String onmaskmouseup; + private String onmaskmousedown; + private String onmaskdblclick; + private String onmaskcontextmenu; + private String onitemchange; + private String onitemhover; + private String ongroupexpand; + private String oncontextmenu; + private String ongroupcollapse; + private String onSlideSubmit; + + // showEvent('onkeypressInputID', 'onkeypress work!') + public Event() { + onLoadMap = "showEvent('onLoadMapInputID', 'onLoadMap work!')"; + onRowClick = "showEvent('onRowClickInputID', 'onRowClick work!')"; + onRowDblClick = "showEvent('onRowDblClickInputID', 'onRowDblClick work!')"; + onRowMouseDown = "showEvent('onRowMouseDownInputID', 'onRowMouseDown work!')"; + onRowMouseMove = "showEvent('onRowMouseMoveInputID', 'onRowMouseMove work!')"; + onRowMouseOut = "showEvent('onRowMouseOutInputID', 'onRowMouseOut work!')"; + onRowMouseOver = "showEvent('onRowMouseOverInputID', 'onRowMouseOver work!')"; + onRowMouseUp = "showEvent('onRowMouseUpInputID', 'onRowMouseUp work!')"; + onbeforedomupdate = "showEvent('onbeforedomupdateInputID', 'onbeforedomupdate work!')"; + onblur = "showEvent('onblurInputID', 'onblur work!')"; + onbottomclick = "showEvent('onbottomclickInputID', 'onbottomclick work!')"; + onchange = "showEvent('onchangeInputID', 'onchange work!')"; + onchanged = "showEvent('onchangedInputID', 'onchanged work!')"; + onclick = "showEvent('onclickInputID', 'onclick work!')"; + oncollapse = "showEvent('oncollapseInputID', 'oncollapse work!')"; + oncomplete = "showEvent('oncompleteInputID', 'oncomplete work!')"; + oncontextmenu = "showEvent('oncontextmenuInputID', 'oncontextmenu work!')"; + oncurrentdateselect = "showEvent('oncurrentdateselectInputID', 'oncurrentdateselect work!')"; + ondatemouseout = "showEvent('ondatemouseoutInputID', 'ondatemouseout work!')"; + ondatemouseover = "showEvent('ondatemouseoverInputID', 'ondatemouseover work!')"; + ondateselect = "showEvent('ondateselectInputID', 'ondateselect work!')"; + ondateselected = "showEvent('ondateselectedInputID', 'ondateselected work!')"; + ondblclick = "showEvent('ondblclickInputID', 'ondblclick work!')"; + ondownclick = "showEvent('ondownclickInputID', 'ondownclick work!')"; + ondragend = "showEvent('ondragendInputID', 'ondragend work!')"; + ondragenter = "showEvent('ondragenterInputID', 'ondragenter work!')"; + ondragexit = "showEvent('ondragexitInputID', 'ondragexit work!')"; + ondragstart = "showEvent('ondragstartInputID', 'ondragstart work!')"; + ondrop = "showEvent('ondropInputID', 'ondrop work!')"; + ondropend = "showEvent('ondropendInputID', 'ondropend work!')"; + ondropout = "showEvent('ondropoutInputID', 'ondropout work!')"; + ondropover = "showEvent('ondropoverInputID', 'ondropover work!')"; + onerror = "showEvent('onerrorInputID', 'onerror work!')"; + onexpand = "showEvent('onexpandInputID', 'onexpand work!')"; + onfocus = "showEvent('onfocusInputID', 'onfocus work!')"; + ongroupactivate = "showEvent('ongroupactivateInputID', 'ongroupactivate work!')"; + ongroupexpand = "showEvent('ongroupexpandInputID', 'ongroupexpand work!')"; + onheaderclick = "showEvent('onheaderclickInputID', 'onheaderclick work!')"; + onhide = "showEvent('onhideInputID', 'onhide work!')"; + oninit = "showEvent('oninitInputID', 'oninit work!')"; + oninputblur = "showEvent('oninputblurInputID', 'oninputblur work!')"; + oninputchange = "showEvent('oninputchangeInputID', 'oninputchange work!')"; + oninputclick = "showEvent('oninputclickInputID', 'oninputclick work!')"; + oninputfocus = "showEvent('oninputfocusInputID', 'oninputfocus work!')"; + oninputkeydown = "showEvent('oninputkeydownInputID', 'oninputkeydown work!')"; + oninputkeypress = "showEvent('oninputkeypressInputID', 'oninputkeypress work!')"; + oninputkeyup = "showEvent('oninputkeyupInputID', 'oninputkeyup work!')"; + oninputselect = "showEvent('oninputselectInputID', 'oninputselect work!')"; + onitemchange = "showEvent('onitemchangeInputID', 'onitemchange work!')"; + onitemhover = "showEvent('onitemhoverInputID', 'onitemhover work!')"; + onitemselect = "showEvent('onitemselectInputID', 'onitemselect work!')"; + onitemselected = "showEvent('onitemselectedInputID', 'onitemselected work!')"; + onkeydown = "showEvent('onkeydownInputID', 'onkeydown work!')"; + onkeypress = "showEvent('onkeypressInputID', 'onkeypress work!')"; + onkeyup = "showEvent('onkeyupInputID', 'onkeyup work!')"; + onlistcall = "showEvent('onlistcallInputID', 'onlistcall work!')"; + onmaskclick = "showEvent('onmaskclickInputID', 'onmaskclick work!')"; + onmaskcontextmenu = "showEvent('onmaskcontextmenuInputID', 'onmaskcontextmenu work!')"; + onmaskdblclick = "showEvent('onmaskdblclickInputID', 'onmaskdblclick work!')"; + onmaskmousedown = "showEvent('onmaskmousedownInputID', 'onmaskmousedown work!')"; + onmaskmousemove = "showEvent('onmaskmousemoveInputID', 'onmaskmousemove work!')"; + onmaskmouseout = "showEvent('onmaskmouseoutInputID', 'onmaskmouseout work!')"; + onmaskmouseover = "showEvent('onmaskmouseoverInputID', 'onmaskmouseover work!')"; + onmaskmouseup = "showEvent('onmaskmouseupInputID', 'onmaskmouseup work!')"; + onmousedown = "showEvent('onmousedownInputID', 'onmousedown work!')"; + onmousemove = "showEvent('onmousemoveInputID', 'onmousemove work!')"; + onmouseout = "showEvent('onmouseoutInputID', 'onmouseout work!')"; + onmouseover = "showEvent('onmouseoverInputID', 'onmouseover work!')"; + onmouseup = "showEvent('onmouseupInputID', 'onmouseup work!')"; + onmove = "showEvent('onmoveInputID', 'onmove work!')"; + onorderchanged = "showEvent('onorderchangedInputID', 'onorderchanged work!')"; + onresize = "showEvent('onresizeInputID', 'onresize work!')"; + onselect = "showEvent('onselectInputID', 'onselect work!')"; + onselected = "showEvent('onselectedInputID', 'onselected work!')"; + onselectionchange = "showEvent('onselectionchangeInputID', 'onselectionchange work!')"; + onshow = "showEvent('onshowInputID', 'onshow work!')"; + onslide = "showEvent('onslideInputID', 'onslide work!')"; + onsubmit = "showEvent('onsubmitInputID', 'onsubmit work!')"; + ontabenter = "showEvent('ontabenterInputID', 'ontabenter work!')"; + ontableave = "showEvent('ontableaveInputID', 'ontableave work!')"; + ontimeselect = "showEvent('ontimeselectInputID', 'ontimeselect work!')"; + ontimeselected = "showEvent('ontimeselectedInputID', 'ontimeselected work!')"; + ontopclick = "showEvent('ontopclickInputID', 'ontopclick work!')"; + onupclick = "showEvent('onupclickInputID', 'onupclick work!')"; + ongroupcollapse = "showEvent('ongroupcollapseInputID', 'ongroupcollapse work!')"; + onSlideSubmit = "showEvent('onSlideSubmitInputID', 'onSlideSubmit work!')"; + } + + public String getOncontextmenu() { + return oncontextmenu; + } + + public void setOncontextmenu(String oncontextmenu) { + this.oncontextmenu = oncontextmenu; + } + + public String getOngroupexpand() { + return ongroupexpand; + } + + public void setOngroupexpand(String ongroupexpand) { + this.ongroupexpand = ongroupexpand; + } + + public String getOnitemhover() { + return onitemhover; + } + + public void setOnitemhover(String onitemhover) { + this.onitemhover = onitemhover; + } + + public String getOnitemchange() { + return onitemchange; + } + + public void setOnitemchange(String onitemchange) { + this.onitemchange = onitemchange; + } + + public String getOnheaderclick() { + return onheaderclick; + } + + public void setOnheaderclick(String onheaderclick) { + this.onheaderclick = onheaderclick; + } + + public String getOnmove() { + return onmove; + } + + public void setOnmove(String onmove) { + this.onmove = onmove; + } + + public String getOntopclick() { + return ontopclick; + } + + public void setOntopclick(String ontopclick) { + this.ontopclick = ontopclick; + } + + public String getOnerror() { + return onerror; + } + + public void setOnerror(String onerror) { + this.onerror = onerror; + } + + public String getOndropover() { + return ondropover; + } + + public void setOndropover(String ondropover) { + this.ondropover = ondropover; + } + + public String getOnslide() { + return onslide; + } + + public void setOnslide(String onslide) { + this.onslide = onslide; + } + + public String getOnbeforedomupdate() { + return onbeforedomupdate; + } + + public void setOnbeforedomupdate(String onbeforedomupdate) { + this.onbeforedomupdate = onbeforedomupdate; + } + + public ArrayList<SelectItem> getEvent(String event) { + ArrayList<SelectItem> arr = new ArrayList<SelectItem>(); + arr.add(new SelectItem("showEvent('" + event + "', '" + event + " work!'")); + arr.add(new SelectItem("alert('" + event + "')")); + arr.add(new SelectItem("")); + return arr; + + } + + public ArrayList<SelectItem> getOntabenterSI() { + return getEvent("ontabenter"); + } + + public ArrayList<SelectItem> getOntableaveSI() { + return getEvent("ontableave"); + } + + public ArrayList<SelectItem> getOnLoadMapSI() { + return getEvent("onLoadMap"); + } + + public ArrayList<SelectItem> getOnselectionchangeSI() { + return getEvent("onselectionchange"); + } + + public ArrayList<SelectItem> getOndownclickSI() { + return getEvent("ondownclick"); + } + + public ArrayList<SelectItem> getOnupclickSI() { + return getEvent("onupclick"); + } + + public ArrayList<SelectItem> getOninitSI() { + return getEvent("oninit"); + } + + public ArrayList<SelectItem> getOngroupactivateSI() { + return getEvent("ongroupactivate"); + } + + public ArrayList<SelectItem> getOnitemselectSI() { + return getEvent("onitemselect"); + } + + public ArrayList<SelectItem> getOnsubmitSI() { + return getEvent("onsubmit"); + } + + public ArrayList<SelectItem> getOnRowClickSI() { + return getEvent("onRowClick"); + } + + public ArrayList<SelectItem> getOnRowDblClickSI() { + return getEvent("onRowDblClick"); + } + + public ArrayList<SelectItem> getOnRowMouseDownSI() { + return getEvent("onRowMouseDown"); + } + + public ArrayList<SelectItem> getOnRowMouseMoveSI() { + return getEvent("onRowMouseMove"); + } + + public ArrayList<SelectItem> getOnRowMouseOutSI() { + return getEvent("onRowMouseOut"); + } + + public ArrayList<SelectItem> getOnRowMouseOverSI() { + return getEvent("onRowMouseOut"); + } + + public ArrayList<SelectItem> getOnRowMouseUpSI() { + return getEvent("onRowMouseUp"); + } + + public ArrayList<SelectItem> getOnselectSI() { + return getEvent("onselect"); + } + + public ArrayList<SelectItem> getOnchangeSI() { + return getEvent("onchange"); + } + + public ArrayList<SelectItem> getOnfocusSI() { + return getEvent("onfocus"); + } + + public ArrayList<SelectItem> getOnblurSI() { + return getEvent("onblur"); + } + + public ArrayList<SelectItem> getOnclickSI() { + return getEvent("onclick"); + } + + public ArrayList<SelectItem> getOncollapseSI() { + return getEvent("oncollapse"); + } + + public ArrayList<SelectItem> getOncompleteSI() { + return getEvent("oncomplete"); + } + + public ArrayList<SelectItem> getOndblclickSI() { + return getEvent("ondblclick"); + } + + public ArrayList<SelectItem> getOndragendSI() { + return getEvent("ondragend"); + } + + public ArrayList<SelectItem> getOndragenterSI() { + return getEvent("ondragenter"); + } + + public ArrayList<SelectItem> getOndragexitSI() { + return getEvent("ondragexit"); + } + + public ArrayList<SelectItem> getOndragstartSI() { + return getEvent("ondragstart"); + } + + public ArrayList<SelectItem> getOndropSI() { + return getEvent("ondrop"); + } + + public ArrayList<SelectItem> getOndropendSI() { + return getEvent("ondropend"); + } + + public ArrayList<SelectItem> getOnexpandSI() { + return getEvent("onexpand"); + } + + public ArrayList<SelectItem> getOnkeydownSI() { + return getEvent("onkeydown"); + } + + public ArrayList<SelectItem> getOnkeypressSI() { + return getEvent("onkeypress"); + } + + public ArrayList<SelectItem> getOnkeyupSI() { + return getEvent("onkeyup"); + } + + public ArrayList<SelectItem> getOnmousedownSI() { + return getEvent("onmousedown"); + } + + public ArrayList<SelectItem> getOnmousemoveSI() { + return getEvent("onmousemove"); + } + + public ArrayList<SelectItem> getOnmouseoutSI() { + return getEvent("onmouseout"); + } + + public ArrayList<SelectItem> getOnmouseoverSI() { + return getEvent("onmouseover"); + } + + public ArrayList<SelectItem> getOnselectedSI() { + return getEvent("onselected"); + } + + public ArrayList<SelectItem> getOnhideSI() { + return getEvent("onhide"); + } + + public ArrayList<SelectItem> getOnshowSI() { + return getEvent("onshow"); + } + + public ArrayList<SelectItem> getOnmouseupSI() { + return getEvent("onmouseup"); + } + + public ArrayList<SelectItem> getOnlistcallSI() { + return getEvent("onlistcall"); + } + + public ArrayList<SelectItem> getOnitemselectedSI() { + return getEvent("onitemselected"); + } + + public ArrayList<SelectItem> getOninputblurSI() { + return getEvent("oninputblur"); + } + + public String getOnmouseup() { + return onmouseup; + } + + public void setOnmouseup(String onmouseup) { + this.onmouseup = onmouseup; + } + + public String getOntabenter() { + return ontabenter; + } + + public void setOntabenter(String ontabenter) { + this.ontabenter = ontabenter; + } + + public String getOntableave() { + return ontableave; + } + + public void setOntableave(String ontableave) { + this.ontableave = ontableave; + } + + public String getOnLoadMap() { + return onLoadMap; + } + + public void setOnLoadMap(String onLoadMap) { + this.onLoadMap = onLoadMap; + } + + public String getOnselectionchange() { + return onselectionchange; + } + + public void setOnselectionchange(String onselectionchange) { + this.onselectionchange = onselectionchange; + } + + public String getOndownclick() { + return ondownclick; + } + + public void setOndownclick(String ondownclick) { + this.ondownclick = ondownclick; + } + + public String getOnupclick() { + return onupclick; + } + + public void setOnupclick(String onupclick) { + this.onupclick = onupclick; + } + + public String getOninit() { + return oninit; + } + + public void setOninit(String oninit) { + this.oninit = oninit; + } + + public String getOngroupactivate() { + return ongroupactivate; + } + + public void setOngroupactivate(String ongroupactivate) { + this.ongroupactivate = ongroupactivate; + } + + public String getOnitemselect() { + return onitemselect; + } + + public void setOnitemselect(String onitemselect) { + this.onitemselect = onitemselect; + } + + public String getOnsubmit() { + return onsubmit; + } + + public void setOnsubmit(String onsubmit) { + this.onsubmit = onsubmit; + } + + public String getOnRowClick() { + return onRowClick; + } + + public void setOnRowClick(String onRowClick) { + this.onRowClick = onRowClick; + } + + public String getOnRowDblClick() { + return onRowDblClick; + } + + public void setOnRowDblClick(String onRowDblClick) { + this.onRowDblClick = onRowDblClick; + } + + public String getOnRowMouseDown() { + return onRowMouseDown; + } + + public void setOnRowMouseDown(String onRowMouseDown) { + this.onRowMouseDown = onRowMouseDown; + } + + public String getOnRowMouseMove() { + return onRowMouseMove; + } + + public void setOnRowMouseMove(String onRowMouseMove) { + this.onRowMouseMove = onRowMouseMove; + } + + public String getOnRowMouseOut() { + return onRowMouseOut; + } + + public void setOnRowMouseOut(String onRowMouseOut) { + this.onRowMouseOut = onRowMouseOut; + } + + public String getOnRowMouseOver() { + return onRowMouseOver; + } + + public void setOnRowMouseOver(String onRowMouseOver) { + this.onRowMouseOver = onRowMouseOver; + } + + public String getOnRowMouseUp() { + return onRowMouseUp; + } + + public void setOnRowMouseUp(String onRowMouseUp) { + this.onRowMouseUp = onRowMouseUp; + } + + public String getOnselect() { + return onselect; + } + + public void setOnselect(String onselect) { + this.onselect = onselect; + } + + public String getOnchange() { + return onchange; + } + + public void setOnchange(String onchange) { + this.onchange = onchange; + } + + public String getOnfocus() { + return onfocus; + } + + public void setOnfocus(String onfocus) { + this.onfocus = onfocus; + } + + public String getOnblur() { + return onblur; + } + + public void setOnblur(String onblur) { + this.onblur = onblur; + } + + public String getOnclick() { + return onclick; + } + + public void setOnclick(String onclick) { + this.onclick = onclick; + } + + public String getOncollapse() { + return oncollapse; + } + + public void setOncollapse(String oncollapse) { + this.oncollapse = oncollapse; + } + + public String getOncomplete() { + return oncomplete; + } + + public void setOncomplete(String oncomplete) { + this.oncomplete = oncomplete; + } + + public String getOndblclick() { + return ondblclick; + } + + public void setOndblclick(String ondblclick) { + this.ondblclick = ondblclick; + } + + public String getOndragend() { + return ondragend; + } + + public void setOndragend(String ondragend) { + this.ondragend = ondragend; + } + + public String getOndragenter() { + return ondragenter; + } + + public void setOndragenter(String ondragenter) { + this.ondragenter = ondragenter; + } + + public String getOndragexit() { + return ondragexit; + } + + public void setOndragexit(String ondragexit) { + this.ondragexit = ondragexit; + } + + public String getOndragstart() { + return ondragstart; + } + + public void setOndragstart(String ondragstart) { + this.ondragstart = ondragstart; + } + + public String getOndrop() { + return ondrop; + } + + public void setOndrop(String ondrop) { + this.ondrop = ondrop; + } + + public String getOndropend() { + return ondropend; + } + + public void setOndropend(String ondropend) { + this.ondropend = ondropend; + } + + public String getOnexpand() { + return onexpand; + } + + public void setOnexpand(String onexpand) { + this.onexpand = onexpand; + } + + public String getOnkeydown() { + return onkeydown; + } + + public void setOnkeydown(String onkeydown) { + this.onkeydown = onkeydown; + } + + public String getOnkeypress() { + return onkeypress; + } + + public void setOnkeypress(String onkeypress) { + this.onkeypress = onkeypress; + } + + public String getOnkeyup() { + return onkeyup; + } + + public void setOnkeyup(String onkeyup) { + this.onkeyup = onkeyup; + } + + public String getOnmousedown() { + return onmousedown; + } + + public void setOnmousedown(String onmousedown) { + this.onmousedown = onmousedown; + } + + public String getOnmousemove() { + return onmousemove; + } + + public void setOnmousemove(String onmousemove) { + this.onmousemove = onmousemove; + } + + public String getOnmouseout() { + return onmouseout; + } + + public void setOnmouseout(String onmouseout) { + this.onmouseout = onmouseout; + } + + public String getOnmouseover() { + return onmouseover; + } + + public void setOnmouseover(String onmouseover) { + this.onmouseover = onmouseover; + } + + public String getOnselected() { + return onselected; + } + + public void setOnselected(String onselected) { + this.onselected = onselected; + } + + public String getOnhide() { + return onhide; + } + + public void setOnhide(String onhide) { + this.onhide = onhide; + } + + public String getOnshow() { + return onshow; + } + + public void setOnshow(String onshow) { + this.onshow = onshow; + } + + public String getOnlistcall() { + return onlistcall; + } + + public void setOnlistcall(String onlistcall) { + this.onlistcall = onlistcall; + } + + public String getOnitemselected() { + return onitemselected; + } + + public void setOnitemselected(String onitemselected) { + this.onitemselected = onitemselected; + } + + public String getOninputblur() { + return oninputblur; + } + + public void setOninputblur(String oninputblur) { + this.oninputblur = oninputblur; + } + + public String getOninputclick() { + return oninputclick; + } + + public void setOninputclick(String oninputclick) { + this.oninputclick = oninputclick; + } + + public String getOninputfocus() { + return oninputfocus; + } + + public void setOninputfocus(String oninputfocus) { + this.oninputfocus = oninputfocus; + } + + public String getOninputkeydown() { + return oninputkeydown; + } + + public void setOninputkeydown(String oninputkeydown) { + this.oninputkeydown = oninputkeydown; + } + + public String getOninputkeypress() { + return oninputkeypress; + } + + public void setOninputkeypress(String oninputkeypress) { + this.oninputkeypress = oninputkeypress; + } + + public String getOninputkeyup() { + return oninputkeyup; + } + + public void setOninputkeyup(String oninputkeyup) { + this.oninputkeyup = oninputkeyup; + } + + public String getOninputselect() { + return oninputselect; + } + + public void setOninputselect(String oninputselect) { + this.oninputselect = oninputselect; + } + + public String getOndateselected() { + return ondateselected; + } + + public void setOndateselected(String ondateselected) { + this.ondateselected = ondateselected; + } + + public String getOndateselect() { + return ondateselect; + } + + public void setOndateselect(String ondateselect) { + this.ondateselect = ondateselect; + } + + public String getOntimeselect() { + return ontimeselect; + } + + public void setOntimeselect(String ontimeselect) { + this.ontimeselect = ontimeselect; + } + + public String getOntimeselected() { + return ontimeselected; + } + + public void setOntimeselected(String ontimeselected) { + this.ontimeselected = ontimeselected; + } + + public String getOnchanged() { + return onchanged; + } + + public void setOnchanged(String onchanged) { + this.onchanged = onchanged; + } + + public String getOndatemouseover() { + return ondatemouseover; + } + + public void setOndatemouseover(String ondatemouseover) { + this.ondatemouseover = ondatemouseover; + } + + public String getOndatemouseout() { + return ondatemouseout; + } + + public void setOndatemouseout(String ondatemouseout) { + this.ondatemouseout = ondatemouseout; + } + + public String getOncurrentdateselect() { + return oncurrentdateselect; + } + + public void setOncurrentdateselect(String oncurrentdateselect) { + this.oncurrentdateselect = oncurrentdateselect; + } + + public String getOninputchange() { + return oninputchange; + } + + public void setOninputchange(String oninputchange) { + this.oninputchange = oninputchange; + } + + public String getOndropout() { + return ondropout; + } + + public void setOndropout(String ondropout) { + this.ondropout = ondropout; + } + + public String getOnbottomclick() { + return onbottomclick; + } + + public void setOnbottomclick(String onbottomclick) { + this.onbottomclick = onbottomclick; + } + + public String getOnorderchanged() { + return onorderchanged; + } + + public void setOnorderchanged(String onorderchanged) { + this.onorderchanged = onorderchanged; + } + + public String getOnmaskclick() { + return onmaskclick; + } + + public void setOnmaskclick(String onmaskclick) { + this.onmaskclick = onmaskclick; + } + + public String getOnresize() { + return onresize; + } + + public void setOnresize(String onresize) { + this.onresize = onresize; + } + + public String getOnmaskmouseover() { + return onmaskmouseover; + } + + public void setOnmaskmouseover(String onmaskmouseover) { + this.onmaskmouseover = onmaskmouseover; + } + + public String getOnmaskmouseout() { + return onmaskmouseout; + } + + public void setOnmaskmouseout(String onmaskmouseout) { + this.onmaskmouseout = onmaskmouseout; + } + + public String getOnmaskmousemove() { + return onmaskmousemove; + } + + public void setOnmaskmousemove(String onmaskmousemove) { + this.onmaskmousemove = onmaskmousemove; + } + + public String getOnmaskmouseup() { + return onmaskmouseup; + } + + public void setOnmaskmouseup(String onmaskmouseup) { + this.onmaskmouseup = onmaskmouseup; + } + + public String getOnmaskmousedown() { + return onmaskmousedown; + } + + public void setOnmaskmousedown(String onmaskmousedown) { + this.onmaskmousedown = onmaskmousedown; + } + + public String getOnmaskdblclick() { + return onmaskdblclick; + } + + public void setOnmaskdblclick(String onmaskdblclick) { + this.onmaskdblclick = onmaskdblclick; + } + + public String getOnmaskcontextmenu() { + return onmaskcontextmenu; + } + + public void setOnmaskcontextmenu(String onmaskcontextmenu) { + this.onmaskcontextmenu = onmaskcontextmenu; + } + + public String getOnSlideSubmit() { + return onSlideSubmit; + } + + public void setOnSlideSubmit(String onSlideSubmit) { + this.onSlideSubmit = onSlideSubmit; + } + + public String getOngroupcollapse() { + return ongroupcollapse; + } + + public void setOngroupcollapse(String ongroupcollapse) { + this.ongroupcollapse = ongroupcollapse; + } +} \ No newline at end of file Added: trunk/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTrackerComponent.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTrackerComponent.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/util/phaseTracker/PhaseTrackerComponent.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,61 @@ +/** + * + */ +package util.phaseTracker; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.Map; + +import javax.faces.component.UIPanel; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +/** + * @author user + * + */ +public class PhaseTrackerComponent extends UIPanel{ + +// private String var; +// +// public String getVar() { +// if (var == null) { +// return "pttc"; +// } +// return var; +// } +// +// public void setVar(String var) { +// this.var = var; +// } + + @Override + public void encodeAll(FacesContext context) throws IOException { + ResponseWriter responseWriter = context.getResponseWriter(); + StringWriter stringWriter = new StringWriter(); + ResponseWriter clonedWriter = responseWriter.cloneWithWriter(stringWriter); + context.setResponseWriter(clonedWriter); + + super.encodeAll(context); + clonedWriter.flush(); + context.setResponseWriter(responseWriter); + + String string = stringWriter.toString(); + responseWriter.write(string); + //System.out.println(string); + + ExternalContext externalContext = context.getExternalContext(); + Map<String, Object> requestMap = externalContext.getRequestMap(); + requestMap.put("pttc", string); +// requestMap.put(getAttributes().get("var"), string); + } + + @Override + public String getRendererType() { + return null; + } + + +} Added: trunk/test-applications/facelets/src/main/java/util/ptComponent/PTComponent.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/ptComponent/PTComponent.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/util/ptComponent/PTComponent.java 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,18 @@ +package util.ptComponent; + +import javax.faces.component.UIPanel; + +import util.phaseTracker.PhaseTrackerComponent; + +public class PTComponent { + private UIPanel component = new PhaseTrackerComponent(); + + + public UIPanel getComponent() { + return component; + } + + public void setComponent(UIPanel component) { + this.component = component; + } +} Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -5,30 +5,70 @@ <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:outputText value="Client mode" + rendered="#{calendarBean.renderedClient}" /> + <h:outputText value="Ajax mode" + rendered="#{calendarBean.renderedAjax}" /> - <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}"> + <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}" + showWeekDaysBar="#{calendarBean.showWeekDaysBar}" + showWeeksBar="#{calendarBean.showWeeksBar}" + todayControlMode="#{calendarBean.todayControlMode}" + immediate="#{calendarBean.immediate}" + onbeforedomupdate="#{event.onbeforedomupdate}" + onchanged="#{event.onchanged}" oncollapse="#{event.oncollapse}" + oncomplete="#{event.oncomplete}" + oncurrentdateselect="#{event.oncurrentdateselect}" + ondatemouseout="#{event.ondatemouseout}" + ondatemouseover="#{event.ondatemouseover}" + ondateselect="#{event.ondateselect}" + ondateselected="#{event.ondateselected}" onexpand="#{event.onexpand}" + oninputblur="#{event.oninputblur}" + oninputchange="#{event.oninputchange}" + oninputclick="#{event.oninputclick}" + oninputfocus="#{event.oninputfocus}" + oninputkeydown="#{event.oninputkeydown}" + oninputkeypress="#{event.oninputkeypress}" + oninputkeyup="#{event.oninputkeyup}" + oninputselect="#{event.oninputselect}" + ontimeselect="#{event.ontimeselect}" + ontimeselected="#{event.ontimeselected}"> <f:facet name="weekDay"> <f:verbatim> - <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> + <span style="padding: 2px; font-size: 4">{weekDayLabel + + weekDayLabelShort}</span> </f:verbatim> </f:facet> @@ -54,21 +94,57 @@ </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}"> + <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}" + onbeforedomupdate="#{event.onbeforedomupdate}" + onchanged="#{event.onchanged}" oncollapse="#{event.oncollapse}" + oncomplete="#{event.oncomplete}" + oncurrentdateselect="#{event.oncurrentdateselect}" + ondatemouseout="#{event.ondatemouseout}" + ondatemouseover="#{event.ondatemouseover}" + ondateselect="#{event.ondateselect}" + ondateselected="#{event.ondateselected}" onexpand="#{event.onexpand}" + oninputblur="#{event.oninputblur}" + oninputchange="#{event.oninputchange}" + oninputclick="#{event.oninputclick}" + oninputfocus="#{event.oninputfocus}" + oninputkeydown="#{event.oninputkeydown}" + oninputkeypress="#{event.oninputkeypress}" + oninputkeyup="#{event.oninputkeyup}" + oninputselect="#{event.oninputselect}" + ontimeselect="#{event.ontimeselect}" + ontimeselected="#{event.ontimeselected}"> + <f:facet name="weekDay"> <f:verbatim> - <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> + <span style="padding: 2px; font-size: 4">{weekDayLabel + + weekDayLabelShort}</span> </f:verbatim> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -29,7 +29,7 @@ <rich:columns value="#{columns.data2}" var="d2" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" - begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}"> + begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}" > <f:facet name="header"> <h:outputText value="header #{d2.int0}"></h:outputText> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,78 +1,21 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxSubviewID"> - <rich:comboBox id="comboboxID" disabled="#{combobox.disabled}" defaultLabel="#{combobox.defaultLabel}" - filterNewValues="#{combobox.filterNewValues}" hideDelay="#{combobox.hideDelay}" - directInputSuggestions="#{combobox.directInputSuggestions}" immediate="#{combobox.immediate}" inputSize="#{combobox.inputSize}" - width="#{combobox.width}" valueChangeListener="#{combobox.valueChangeListener}" value="#{combobox.value}" - tabindex="#{combobox.tabindex}" suggestionValues="#{combobox.suggestionValues}" size="#{combobox.size}" - showDelay="#{combobox.showDelay}" required="#{combobox.required}" requiredMessage="#{combobox.requiredMessage}" - rendered="#{combobox.rendered}" selectFirstOnUpdate="#{combobox.selectFirstOnUpdate}" maxlength="#{combobox.maxlength}" - enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}"> - <f:selectItem itemLabel="selectItem 1" itemValue="selectItem 1" /> - <f:selectItem itemLabel="selectItem 2" itemValue="selectItem 2" /> - <f:selectItem itemLabel="selectItem 3" itemValue="selectItem 3" /> - <f:selectItems value="#{combobox.selectItem}" /> - </rich:comboBox> - - <h:panelGrid columns="2"> - <h:outputText value="defaultLabel"></h:outputText> - <h:inputText value="#{combobox.defaultLabel}" onchange="submit();"></h:inputText> - - <h:outputText value="filterNewValues"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.filterNewValues}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="hideDelay"></h:outputText> - <h:inputText value="#{combobox.hideDelay}"></h:inputText> - - <h:outputText value="showDelay"></h:outputText> - <h:inputText value="#{combobox.showDelay}" onchange="submit();"></h:inputText> - - <h:outputText value="inputSize"></h:outputText> - <h:inputText value="#{combobox.inputSize}" onchange="submit();"></h:inputText> - - <h:outputText value="value"></h:outputText> - <h:inputText value="#{combobox.value}" onchange="submit();"></h:inputText> - - <h:outputText value="tabindex"></h:outputText> - <h:inputText value="#{combobox.tabindex}" onchange="submit();"></h:inputText> - - <h:outputText value="maxlength"></h:outputText> - <h:inputText value="#{combobox.maxlength}" onchange="submit();"></h:inputText> - - <h:outputText value="width"></h:outputText> - <h:inputText value="#{combobox.width}" onchange="submit();"></h:inputText> - - <h:outputText value="size"></h:outputText> - <h:inputText value="#{combobox.size}" onchange="submit();"></h:inputText> - - <h:outputText value="listHeight"></h:outputText> - <h:inputText value="#{combobox.listHeight}" onchange="submit();"></h:inputText> - - <h:outputText value="listWidth"></h:outputText> - <h:inputText value="#{combobox.listWidth}" onchange="submit();"></h:inputText> - - <h:outputText value="enableManualInput"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.enableManualInput}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="selectFirstOnUpdate"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.selectFirstOnUpdate}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="directInputSuggestions"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.directInputSuggestions}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="disabled"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.disabled}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.rendered}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="immediate"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.immediate}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="required"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.required}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="requiredMessage"></h:outputText> - <h:inputText value="#{combobox.requiredMessage}" onchange="submit();"></h:inputText> - </h:panelGrid> + <rich:comboBox id="comboboxID" disabled="#{combobox.disabled}" defaultLabel="#{combobox.defaultLabel}" + filterNewValues="#{combobox.filterNewValues}" + directInputSuggestions="#{combobox.directInputSuggestions}" immediate="#{combobox.immediate}" inputSize="#{combobox.inputSize}" + width="#{combobox.width}" valueChangeListener="#{combobox.valueChangeListener}" value="#{combobox.value}" + tabindex="#{combobox.tabindex}" suggestionValues="#{combobox.suggestionValues}" size="#{combobox.size}" + required="#{combobox.required}" requiredMessage="#{combobox.requiredMessage}" + rendered="#{combobox.rendered}" selectFirstOnUpdate="#{combobox.selectFirstOnUpdate}" maxlength="#{combobox.maxlength}" + enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}" + onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onfocus="#{event.onfocus}" onitemselected="#{event.onitemselected}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" + onkeyup="#{event.onkeyup}" onlistcall="#{event.onlistcall}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" + onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}"> + <f:selectItem itemValue="selectItem 1"/> + <f:selectItem itemValue="selectItem 2"/> + <f:selectItem itemValue="selectItem 3"/> + <f:selectItems value="#{combobox.selectItem}"/> + </rich:comboBox> + </f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,58 @@ + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="defaultLabel"></h:outputText> + <h:inputText value="#{combobox.defaultLabel}" onchange="submit();"></h:inputText> + + <h:outputText value="filterNewValues"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.filterNewValues}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="inputSize"></h:outputText> + <h:inputText value="#{combobox.inputSize}" onchange="submit();"></h:inputText> + + <h:outputText value="value"></h:outputText> + <h:inputText value="#{combobox.value}" onchange="submit();"></h:inputText> + + <h:outputText value="tabindex"></h:outputText> + <h:inputText value="#{combobox.tabindex}" onchange="submit();"></h:inputText> + + <h:outputText value="maxlength"></h:outputText> + <h:inputText value="#{combobox.maxlength}" onchange="submit();"></h:inputText> + + <h:outputText value="width"></h:outputText> + <h:inputText value="#{combobox.width}" onchange="submit();"></h:inputText> + + <h:outputText value="size"></h:outputText> + <h:inputText value="#{combobox.size}" onchange="submit();"></h:inputText> + + <h:outputText value="listHeight"></h:outputText> + <h:inputText value="#{combobox.listHeight}" onchange="submit();"></h:inputText> + + <h:outputText value="listWidth"></h:outputText> + <h:inputText value="#{combobox.listWidth}" onchange="submit();"></h:inputText> + + <h:outputText value="enableManualInput"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.enableManualInput}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="selectFirstOnUpdate"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.selectFirstOnUpdate}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="directInputSuggestions"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.directInputSuggestions}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="disabled"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.disabled}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="immediate"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.immediate}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="required"></h:outputText> + <h:selectBooleanCheckbox value="#{combobox.required}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage"></h:outputText> + <h:inputText value="#{combobox.requiredMessage}" onchange="submit();"></h:inputText> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,59 +1,91 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="componentControlSubviewID"> - <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> - <h:outputLink id="hideButton1ID" onclick="return false;" value="#"> - <f:verbatim>Close 1</f:verbatim> - </h:outputLink> - <f:verbatim> - <br /> - </f:verbatim> - <h:outputLink id="hideButton2ID" onclick="return false;" value="#"> - <f:verbatim>Close 2</f:verbatim> - </h:outputLink> - </rich:modalPanel> - - <h:commandButton id="showButtonID" value="show ModalPanel" > - <rich:componentControl for="ccModalPanelID" event="onclick" disableDefault="true" operation="show" params="show:'componentControl work(show)'" /> - </h:commandButton> - <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide" - params="hide:'componentControl work(hide)'" /> + <h:inputText value="test"> + <rich:componentControl name="controlMe" event="onclick" attachTiming="onload" for="ccToltipID" operation="show" /> + </h:inputText> + <rich:panel> + <rich:toolTip id="ccToltipID" followMouse="false" direction="top-right" value="Help me, help!"> + </rich:toolTip> + </rich:panel> + + <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> + <h:outputLink id="hideButton1ID" onclick="return false;" value="#"> + <f:verbatim>Close 1</f:verbatim> + </h:outputLink> <f:verbatim> <br /> - <br /> </f:verbatim> + <h:outputLink id="hideButton2ID" onclick="return false;" value="#"> + <f:verbatim>Close 2</f:verbatim> + </h:outputLink> + </rich:modalPanel> - <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> + <h:commandButton id="showButtonID" value="show ModalPanel"> + <rich:componentControl for="ccModalPanelID" event="onclick" disableDefault="true" operation="show" + params="show:'componentControl work(show)'" /> + </h:commandButton> + <rich:componentControl attachTiming="onload" attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" + operation="hide" params="hide:'componentControl work(hide)'" /> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <f:verbatim> + <br /> + <br /> + </f:verbatim> - <rich:panelMenu id="ccContextMenuPanelMenuID"> - <h:outputText value="click text" /> - </rich:panelMenu> + <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" /> + <h:panelGrid columns="2"> + <h:outputText value="popup calendar" /> + <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" /> + </h:panelGrid> - <rich:contextMenu id="ccContextMenuID" submitMode="ajax" onexpand="alert(event.parameters.expand)"> - <rich:menuItem icon="/pics/header.png" value="tab1"> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="/pics/info.gif" value="a"> - </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="b"> - </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="c"> - </rich:menuItem> - </rich:contextMenu> - <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" - operation="show" params="expand:'show work'" /> - - + <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="doTodayCalendarRenderedID">Calendar (today) rendered="false"</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="doTodayCalendarRenderedID" for="ccCalendarID" rendered="false" event="onclick" operation="today" /> + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + + <rich:panelMenu id="ccContextMenuPanelMenuID"> + <h:outputText value="click text" /> + </rich:panelMenu> + + <rich:contextMenu id="ccContextMenuID" submitMode="ajax" onexpand="alert(event.parameters.expand)"> + <rich:menuItem icon="/pics/header.png" value="tab1"> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="/pics/info.gif" value="a"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="b"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="c"> + </rich:menuItem> + </rich:contextMenu> + <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="show" + params="expand:'show work'" /> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -2,12 +2,14 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="contextMenuSubviewID"> <h:panelGrid columns="2"> <rich:panel style="width: 130px; height: 50px; background-color: #98FB98;"> - <h:outputText value="panel with contextMenu(DEFAULT)" /> - <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}"> + <h:outputText value="panel with contextMenu(DEFAULT)" /><f:verbatim><br/></f:verbatim> + <h:outputText value="testing events" /> + <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID"> <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"> + <rich:menuItem onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}"><h:outputText value="event item"/></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 /> @@ -38,7 +40,7 @@ </rich:menuItem> </rich:menuGroup> </rich:contextMenu> - <a4j:commandLink onclick="$('formID:contextMenuSubviewID:contextMenuDefaultID').component.doShow()" value="JSAPI Show"></a4j:commandLink> + <a4j:commandLink onclick="$(formID:contextMenuSubviewID:contextMenuDefaultID).component.doShow()" value="JSAPI Show"></a4j:commandLink> </rich:panel> Modified: trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -3,11 +3,32 @@ <html> <f:view> <head> - </head> + <f:loadBundle basename="message" var="msg" /> + <title></title> + <script type="text/javascript"> + function showEvent(elementID, value) { + var oldObject = window.document.getElementById(elementID); + if(oldObject == null || oldObject.type == "text") return; + var newObject = window.document.createElement('input'); + if(oldObject.type) newObject.type = "text"; + if(oldObject.size) newObject.size = oldObject.size; + if(oldObject.value) newObject.value = value; + if(oldObject.id) newObject.id = oldObject.id; + oldObject.parentNode.replaceChild(newObject,oldObject); + } + </script> + <body> + <h:panelGroup binding="#{pTComponent.component}"> + + <f:attribute name="var" value="body" /> <h:form id="test"> - + </h:form> + </h:panelGroup> + + <h:outputText value="#{pttc}" escape="true"></h:outputText> + </body> </f:view> </html> Modified: trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,66 +1,78 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderSubviewID"> - <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" - for="carList" forValRef="inventoryList.carInventory" filterBy="getMileage" manualInput="true" onSlide="true" onChange="true" - storeResults="true" trackStyleClass="track" width="400px" styleClass="slider-container" startRange="10000" endRange="60000" - increment="10000" rangeStyleClass="range" trailer="true" trailerStyleClass="trailer" handleStyleClass="handle" - handleValue="10000" id="dfsID"> - </rich:dataFilterSlider> + <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" + rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" + for="carList" forValRef="inventoryList.carInventory" + filterBy="getMileage" manualInput="true" storeResults="true" + trackStyleClass="track" width="400px" styleClass="slider-container" + startRange="10000" endRange="60000" increment="10000" + rangeStyleClass="range" trailer="true" trailerStyleClass="trailer" + handleStyleClass="handle" handleValue="10000" id="dfsID" + onbeforedomupdate="#{event.onbeforedomupdate}" + onchange="#{event.onchange}" onclick="#{event.onclick}" + oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" + onerror="#{event.onerror}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" + onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}" onslide="#{event.onslide}" + onSlideSubmit="#{event.onSlideSubmit}"> + </rich:dataFilterSlider> - <h:panelGrid id="list-body"> - <h:dataTable id="carIndex" rows="10" - binding="#{inventoryList.carMakeIndexUIData}" - value="#{inventoryList.carMakeIndex}" var="category" - styleClass="list-table1" columnClasses="column-index" - rowClasses="list-row3"> + <h:panelGrid id="list-body"> + <h:dataTable id="carIndex" rows="10" + binding="#{inventoryList.carMakeIndexUIData}" + value="#{inventoryList.carMakeIndex}" var="category" + styleClass="list-table1" columnClasses="column-index" + rowClasses="list-row3"> - <h:column> - <a4j:commandLink actionListener="#{inventoryList.filterCarList}" - reRender="carList"> - <h:outputText value="#{category}" /> - <f:attribute name="filterRule" value="showTable" /> + <h:column> + <a4j:commandLink actionListener="#{inventoryList.filterCarList}" + reRender="carList"> + <h:outputText value="#{category}" /> + <f:attribute name="filterRule" value="showTable" /> - </a4j:commandLink> - </h:column> - </h:dataTable> + </a4j:commandLink> + </h:column> + </h:dataTable> - <h:dataTable id="carList" rows="10" - value="#{inventoryList.carInventory}" var="category" - rowClasses="list-row1, list-row2" columnClasses="column" - headerClass="list-header" styleClass="list-table2"> - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" value="Make" /> - </f:facet> - <h:outputText value="#{category.make}" /> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" value="Model" /> - </f:facet> - <h:outputText value="#{category.model}" /> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" - value="#{inventoryList.priceColumnName}" /> - </f:facet> - <h:outputText value="#{category.price}" /> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" - value="#{inventoryList.mileageColumnName}" /> - </f:facet> - <h:outputText value="#{category.mileage}" /> - </h:column> - </h:dataTable> - </h:panelGrid> - <h:outputText value="click reRender for update page(RF-1365)" /> - <h:commandButton value="reRender" /> + <h:dataTable id="carList" rows="10" + value="#{inventoryList.carInventory}" var="category" + rowClasses="list-row1, list-row2" columnClasses="column" + headerClass="list-header" styleClass="list-table2"> + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Make" /> + </f:facet> + <h:outputText value="#{category.make}" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Model" /> + </f:facet> + <h:outputText value="#{category.model}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" + value="#{inventoryList.priceColumnName}" /> + </f:facet> + <h:outputText value="#{category.price}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" + value="#{inventoryList.mileageColumnName}" /> + </f:facet> + <h:outputText value="#{category.mileage}" /> + </h:column> + </h:dataTable> + </h:panelGrid> + <h:outputText value="click reRender for update page(RF-1365)" /> + <h:commandButton value="reRender" /> + </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,26 +1,26 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataScrollerSubviewID"> - <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" - var="dT" cellpadding="5px" rows="5" border="1"> - <f:facet name="header"> - <rich:datascroller reRender="dataTableId" fastControls="#{dataScroller.fastControls}" - align="#{dataScroller.align}" rendered="#{dataScroller.render}" - limitToList="#{dataScroller.limitToList}" - renderIfSinglePage="#{dataScroller.renderIfSinglePage}" - maxPages="#{dataScroller.maxPages}" - scrollerListener="#{dataScroller.ScrollerListener}" - onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"/> - </f:facet> - <h:column> - <h:outputText value="#{dT.data0}" /> - </h:column> - <h:column> - <h:outputText value="#{dT.data1}" /> - </h:column> - </h:dataTable> + <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" + var="dT" cellpadding="5px" rows="5" border="1"> + <f:facet name="header"> + <rich:datascroller fastControls="#{dataScroller.fastControls}" + align="#{dataScroller.align}" rendered="#{dataScroller.render}" + limitToList="#{dataScroller.limitToList}" + renderIfSinglePage="#{dataScroller.renderIfSinglePage}" + maxPages="#{dataScroller.maxPages}" + scrollerListener="#{dataScroller.ScrollerListener}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" + ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"/> + </f:facet> + <h:column> + <h:outputText value="#{dT.data0}" /> + </h:column> + <h:column> + <h:outputText value="#{dT.data1}" /> + </h:column> + </h:dataTable> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -3,12 +3,8 @@ <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" onRowClick="showEvent('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" - onRowDblClick="showEvent('onRowDblClickInputID', 'onRowDblClick work!')" - onRowMouseDown="showEvent('onRowMouseDownInputID', 'onRowMouseDown work!')" - onRowMouseMove="showEvent('onRowMouseMoveInputID', 'onRowMouseMove work!')" - onRowMouseOut="showEvent('onRowMouseOutInputID', 'onRowMouseOut work!')" - onRowMouseOver="showEvent('onRowMouseOverInputID', 'onRowMouseOver work!')" - onRowMouseUp="showEvent('onRowMouseUpInputID', 'onRowMouseUp work!')"> +onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}" +onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:facet name="caption"> <h:outputText value="caption facet" /> </f:facet> @@ -51,7 +47,7 @@ <rich:column styleClass="column" headerClass="cheader" footerClass="cfooter" rendered="#{dataTable.r2rendered}"> <h:outputText value="#{dataTableID.day}" /> </rich:column> - <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> + <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onRowClick="#{event.onRowClick}" onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}"> <f:facet name="header"> <h:outputText value="facet(header)" /> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -18,9 +18,8 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drag1"> <h:outputText value="#{type} - drag" /> - <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}"> + <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}" + oncomplete="#{event.oncomplete}" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}"> </rich:dragSupport> </h:panelGrid> </h:column> @@ -30,11 +29,9 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drop2"> <h:outputText value="#{type} - drop" /> - <rich:dropSupport reRender="dragValueText" ondragenter="showEvent('InputID', ' work!')" ondragexit="showEvent('InputID', ' work!')" - ondrop="showEvent('InputID', ' work!')" ondropend="showEvent('InputID', ' work!')" - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')" - action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value"> + <rich:dropSupport reRender="dragValueText" + action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value" + ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> </rich:dropSupport> </h:panelGrid> </h:column> @@ -76,10 +73,7 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid1"> <f:verbatim>Accepts file and folder... Customizes</f:verbatim> <rich:dropSupport id="zone1" - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')" ondragenter="showEvent('ondragenterInputID', 'ondragenter work!')" - ondragexit="showEvent('ondragexitInputID', 'ondragexit work!')" ondropend="showEvent('ondropendInputID', 'ondropend work!')" - ondrop="showEvent('ondropInputID', 'ondrop work!')" + oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondropend="#{event.ondropend}" ondrop="#{event.ondrop}" onbeforedomupdate="#{event.onbeforedomupdate}" acceptedTypes="file, folder" typeMapping="{file: testDrop}"> <rich:dndParam name="testDrop"> <h:graphicImage height="16" width="16" @@ -96,11 +90,7 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid3"> <f:verbatim>Accepts none... Customizes</f:verbatim> - <rich:dropSupport typeMapping="{file: testDrop}" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragenter="showEvent('ondragenterInputID', 'ondragenter work!')" - ondragexit="showEvent('ondragexitInputID', 'ondragexit work!')" - ondrop="showEvent('ondropInputID', 'ondrop work!')" ondropend="showEvent('ondropendInputID', 'ondropend work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dropSupport typeMapping="{file: testDrop}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondropend="#{event.ondropend}" ondrop="#{event.ondrop}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="testDrop"> <h:graphicImage height="16" width="16" value="#{icon.iconFileManagerReject}" /> </rich:dndParam> @@ -109,19 +99,13 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid4"> <f:verbatim>Accepts file and folder</f:verbatim> - <rich:dropSupport acceptedTypes="file, folder" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragenter="showEvent('ondragenterInputID', 'ondragenter work!')" - ondragexit="showEvent('ondragexitInputID', 'ondragexit work!')" - ondrop="showEvent('ondropInputID', 'ondrop work!')" ondropend="showEvent('ondropendInputID', 'ondropend work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dropSupport acceptedTypes="file, folder" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondropend="#{event.ondropend}" ondrop="#{event.ondrop}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="testDrop" value="testDropValue" /> </rich:dropSupport> </h:panelGrid> <h:panelGrid id="grid5"> - <rich:dragSupport dragType="file" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> </rich:dragSupport> @@ -129,9 +113,7 @@ </h:panelGrid> <h:panelGrid id="grid6"> - <rich:dragSupport dragType="file" dragIndicator="indicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" dragIndicator="indicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> </rich:dragSupport> @@ -139,9 +121,7 @@ </h:panelGrid> <h:panelGrid id="grid7"> - <rich:dragSupport dragType="folder" dragIndicator="indicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="folder" dragIndicator="indicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> </rich:dragSupport> @@ -151,9 +131,7 @@ <h:outputText /> <h:panelGrid id="grid8"> - <rich:dragSupport dragType="folder" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="folder" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> </rich:dragSupport> @@ -161,9 +139,7 @@ </h:panelGrid> <h:panelGrid id="grid9"> - <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}"> <rich:dndParam name="testDrag" value="testDragValue" /> <rich:dndParam name="marker" value="testMarkerValue" /> <rich:dndParam name="label" value="testDragValue" /> @@ -172,9 +148,7 @@ </h:panelGrid> <h:panelGrid id="grid10"> - <rich:dragSupport dragType="folder" dragIndicator="defaultIndicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="folder" dragIndicator="defaultIndicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="testDragValue for Folder" /> </rich:dragSupport> <f:verbatim>Folder Draggable with defaultIndicator</f:verbatim> @@ -183,9 +157,7 @@ </h:panelGrid> <h:panelGrid id="renderedId"> - <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - onsubmit="showEvent('onsubmitInputID', 'onsubmit work!')"> + <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="marker" value="testMarkerValue" /> <rich:dndParam name="label" value="testDragValue" /> </rich:dragSupport> Modified: trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -3,20 +3,12 @@ <h:panelGrid columns="2"> <rich:spacer width="400px" height="400px"></rich:spacer> <rich:panel> - <rich:dropDownMenu id="ddmId" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" + <rich:dropDownMenu id="ddmId" disabled="#{dDMenu.disabledDDM}" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}" popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" - verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}" - oncollapse="showEvent('oncollapseInputID', 'oncollapse work!')" onexpand="showEvent('onexpandInputID', 'onexpand work!')" - ongroupactivate="showEvent('ongroupactivateInputID', 'ongroupactivate work!')" - onitemselect="showEvent('onitemselectInputID', 'onitemselect work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')"> - <rich:menuItem icon="#{dDMenu.icon}" onclick="showEvent('onclickInputID', 'onclick work (item)!')" - oncomplete="showEvent('oncompleteInputID', 'oncomplete work (item)!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work (item)!')" - onmousemove="showEvent('onmousemoveInputID', ' work (item)!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work (item)!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work (item)!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work (item)!')" - onselect="showEvent('onselectInputID', 'onselect work (item)!')"> + verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}" + oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> + <rich:menuItem icon="#{dDMenu.icon}" onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}!')" oncomplete="#{event.oncomplete}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}"> <h:outputText value="Item1(test events)" /> </rich:menuItem> <rich:menuSeparator /> Modified: trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -73,9 +73,13 @@ <h:outputText value="Rendered:" /> <h:selectBooleanCheckbox value="#{dDMenu.rendered}" onclick="submit()"> - </h:selectBooleanCheckbox> - + + <h:outputText value="Disable some ddmenu:"></h:outputText> + <h:selectBooleanCheckbox value="#{dDMenu.disabledDDM}"> + <a4j:support reRender="ddmId" event="onclick" /> + </h:selectBooleanCheckbox> + <h:outputText value="Disable some items:" /> <h:selectBooleanCheckbox value="#{dDMenu.disabled}"> <a4j:support reRender="ddmId" event="onclick" /> Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -4,13 +4,8 @@ warningMessage="#{gmap.warningMessage}" rendered="#{gmap.rendered}" zoom="#{gmap.zoom}" enableContinuousZoom="#{gmap.continuousZoom}" enableDoubleClickZoom="#{gmap.doubleClickZoom}" enableDragging="#{gmap.dragging}" gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" - showGScaleControl="#{gmap.showGScaleControl}" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" + showGScaleControl="#{gmap.showGScaleControl}" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" /> <h:panelGroup> Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -11,7 +11,8 @@ step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}" barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}" handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}" - maxlength="#{inputNumberSlider.maxlength}" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" > + maxlength="#{inputNumberSlider.maxlength}" + onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onerror="#{event.onerror}" onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}" onslide="#{event.onslide}"> </rich:inputNumberSlider> <h:panelGroup> <a4j:commandButton value="valueChangeListener (show)" reRender="valueCLID" /> Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -8,13 +8,6 @@ inputClass="#{inputNumberSpinner.inputStyle}" styleClass="#{inputNumberSpinner.style}" enableManualInput="#{inputNumberSpinner.manualInput}" inputSize="#{inputNumberSpinner.inputSize}" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onblur="showEvent('onblurInputID', 'onblur work!')" - onchange="showEvent('onchangeInputID', 'onchange work!')" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onerror="showEvent('ondblclickInputID', 'ondblclick work!')" - onfocus="showEvent('onfocusInputID', 'onfocus work!')" onselect="showEvent('onselectInputID', 'onselect work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" ondownclick="showEvent('ondownclickInputID', 'ondownclick work!')" - onupclick="showEvent('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner> + onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onerror="#{event.onerror}" onfocus="#{event.onfocus}" onselect="#{event.onselect}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ondownclick="#{event.ondownclick}" onupclick="#{event.onupclick}"></rich:inputNumberSpinner> <rich:spacer height="20px"></rich:spacer> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -3,7 +3,7 @@ <h:messages /> <rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}"> - <rich:insert id="insertID" highlight="#{insert.highlight}" + <rich:insert id="insertID" highlight="#{insert.highlight}" rendered="#{insert.rendered}" src="#{insert.src}"></rich:insert> </rich:panel> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -12,9 +12,8 @@ targetListWidth="#{listShuttle.targetListWidth}" sourceListWidth="#{listShuttle.sourceListWidth}" listsHeight="#{listShuttle.listsHeight}" sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}" targetCaptionLabel="#{listShuttle.targetCaptionLabel}" - topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onorderchanged="showEvent('onorderchangedInputID', 'onorderchanged work!')" ontopclick="showEvent('ontopclickInputID', 'ontopclick work!')" onupclick="showEvent('onupclickInputID', 'onupclick work!')" ondownclick="showEvent('ondownclickInputID', 'ondownclick work!')" onbottomclick="showEvent('onbottomclickInputID', 'onbottomclick work!')" > + topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}" + onmousemove="#{event.onmousemove}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onorderchanged="#{event.onorderchanged}" ontopclick="#{event.ontopclick}" onupclick="#{event.onupclick}" ondownclick="#{event.ondownclick}" onbottomclick="#{event.onbottomclick}"> <h:column> <f:facet name="header"> Modified: trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -36,7 +36,7 @@ <rich:separator></rich:separator> <h:outputText value="Rich Messages Demo" /> - <rich:messages layout="#{message.layout}" globalOnly="#{message.globalOnly}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" + <rich:messages layout="#{message.layout}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel" infoLabelClass="infoLabel" warnLabelClass="fatalLabel" warnMarkerClass="markerWarn" infoMarkerClass="markerInfo" errorMarkerClass="markerError" fatalMarkerClass="markerFatal" errorClass="errorClass" fatalClass="fatalClass" Modified: trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -63,9 +63,6 @@ <h:outputText value="Title:" /> <h:inputText value="#{message.title}" /> - - <h:outputText value="globalOnly"></h:outputText> - <h:selectBooleanCheckbox value="#{message.globalOnly}"></h:selectBooleanCheckbox> <h:outputText value="Show Detail:" /> <h:selectBooleanCheckbox value="#{message.showDetail}" /> Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,13 +1,16 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="modalPanelSubviewID"> - <h:messages /> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="modalPanelSubviewID"> + + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}" /> + </h:selectOneMenu> + <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" - resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}" - rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" left="#{modalPanel.left}" - top="#{modalPanel.top}" shadowDepth="#{modalPanel.shadowDepth}" shadowOpacity="#{modalPanel.shadowOpacity}" - showWhenRendered="#{modalPanel.showWhenRendered}" onhide="showEvent('onhideInputID', 'onhide work!')" - onshow="showEvent('onshowInputID', 'onshow work!')"> + resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}" rendered="#{modalPanel.rendered}" + zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" shadowDepth="#{modalPanel.shadowDepth}" + shadowOpacity="#{modalPanel.shadowOpacity}" showWhenRendered="#{modalPanel.showWhenRendered}" + onhide="#{event.onhide}" onmaskclick="#{event.onmaskclick}" onmaskcontextmenu="#{event.onmaskcontextmenu}" onmaskdblclick="#{event.onmaskdblclick}" onmaskmousedown="#{event.onmaskmousedown}" onmaskmousemove="#{event.onmaskmousemove}" onmaskmouseout="#{event.onmaskmouseout}" onmaskmouseover="#{event.onmaskmouseover}" onmaskmouseup="#{event.onmaskmouseup}" onmove="#{event.onmove}" onresize="#{event.onresize}" onshow="#{event.onshow}"> <f:facet name="header"> <h:outputText value="Heder goes here..." /> </f:facet> @@ -21,28 +24,31 @@ <f:selectItem itemLabel="2" itemValue="2" /> <f:selectItem itemLabel="3" itemValue="3" /> </h:selectOneListbox> - + <f:verbatim> <br /> <br /> </f:verbatim> + <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> + + ui:include src="${richBean.pathComponentContainer}" /> </rich:modalPanel> <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show MP</a> - - <f:verbatim> + + <f:verbatim> <br /> <br /> </f:verbatim> - + <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('modalPanelID');" /> - <f:verbatim> + <f:verbatim> <br /> <br /> </f:verbatim> <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> - + </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -10,12 +10,10 @@ bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}" topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}" controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}" - downControlLabel="#{orderingList.downControlLabel}" + downControlLabel="#{orderingList.downControlLabel}" orderControlsVisible="#{orderingList.orderControlsVisible}" fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}" rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" selection="#{orderingList.selection}" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onorderchanged="showEvent('onorderchangedInputID', 'onorderchanged work!')" ontopclick="showEvent('ontopclickInputID', 'ontopclick work!')" onupclick="showEvent('onupclickInputID', 'onupclick work!')" ondownclick="showEvent('ondownclickInputID', 'ondownclick work!')" onbottomclick="showEvent('onbottomclickInputID', 'onbottomclick work!')" onheaderclick="showEvent('onheaderclickInputID', 'onheaderclick work!')"> + onmousemove="#{event.onmousemove}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onorderchanged="#{event.onorderchanged}" ontopclick="#{event.ontopclick}" onupclick="#{event.onupclick}" ondownclick="#{event.ondownclick}" onbottomclick="#{event.onbottomclick}" onheaderclick="#{event.onheaderclick}"> <f:facet name="header"> <h:outputText value="header" /> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,118 +1,124 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelSubviewID"> - <h:panelGrid columnClasses="panel" border="0" columns="3"> - <rich:panel styleClass="top"> - <f:facet name="header"> - <h:panelGroup> - <f:verbatim>dsdsdsdsd<br />sdsd </f:verbatim> - </h:panelGroup> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="panelSubviewID"> +<h:panelGrid columnClasses="panel" border="0" columns="3"> + <rich:panel styleClass="top"> + <f:facet name="header"> + <h:panelGroup> + <f:verbatim>dsdsdsdsd<br />sdsd </f:verbatim> + </h:panelGroup> - </f:facet> + </f:facet> - <f:verbatim>This is <b>default</b> panel. content here</f:verbatim> - </rich:panel> - <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim>This panel contains custom headerClass and bodyClass</f:verbatim> - </rich:panel> - <rich:panel styleClass="top2" headerClass="hea2" bodyClass="bo2"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim> This panel also contains custom headerClass and bodyClass. The background is not a 3D anymore.</f:verbatim> - </rich:panel> + <f:verbatim>This is <b>default</b> panel. content here</f:verbatim> + </rich:panel> + <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> + <f:facet name="header"> + <h:outputText value="Header of the Panel"/> + </f:facet> + <f:verbatim>This panel contains custom headerClass and bodyClass</f:verbatim> + </rich:panel> + <rich:panel styleClass="top2" headerClass="hea2" bodyClass="bo2"> + <f:facet name="header"> + <h:outputText value="Header of the Panel"/> + </f:facet> + <f:verbatim> This panel also contains custom headerClass and bodyClass. The background is not a 3D anymore.</f:verbatim> + </rich:panel> - <h:panelGroup> - <h:form> - <rich:panel - onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" - onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" - style="width:200px;" headerClass="hea2" bodyClass="bo3"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim>Base on the previous layout, but form element and javascript behaviour are added</f:verbatim> - <br /> - <h:inputText /> - </rich:panel> - </h:form> - </h:panelGroup> + <h:panelGroup> + <h:form> + <rich:panel + onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" + onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" + style="width:200px;" headerClass="hea2" bodyClass="bo3"> + <f:facet name="header"> + <h:outputText value="Header of the Panel"/> + </f:facet> + <f:verbatim>Base on the previous layout, but form element and javascript behaviour are added</f:verbatim> + <br/> + <h:inputText/> + </rich:panel> + </h:form> + </h:panelGroup> - <rich:panel style="width:200px;" headerClass="hea" bodyClass="bo3"> - <f:facet name="header"> - <h:outputText value="Scrolling Text Panel" /> - </f:facet> - <f:verbatim> - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - </f:verbatim> - </rich:panel> + <rich:panel style="width:200px;" headerClass="hea" bodyClass="bo3"> + <f:facet name="header"> + <h:outputText value="Scrolling Text Panel"/> + </f:facet> + <f:verbatim> + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + </f:verbatim> + </rich:panel> - <rich:panel styleClass="top"> - <f:verbatim>This is a panel without the header</f:verbatim> + <rich:panel styleClass="top"> + <f:verbatim>This is a panel without the header</f:verbatim> + </rich:panel> +</h:panelGrid> +<rich:panel style="position: absolute; top: 116px; right: 100px; " + styleClass="top"> + <f:facet name="header"> + <h:outputText value="Header of the Panel"/> + </f:facet> + <f:verbatim> + This is a panel with absolute position on the screen.<br /> + Resize the browser's window for fun. + </f:verbatim> +</rich:panel> +<h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> - </rich:panel> - </h:panelGrid> - <rich:panel style="position: absolute; top: 116px; right: 100px; " - styleClass="top"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim> - This is a panel with absolute position on the screen.<br /> - Resize the browser's window for fun. - </f:verbatim> - </rich:panel> - <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> +<rich:panel rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onclick="showEvent('onclickInputID', 'onclick work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" + onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> + <f:facet name="header"> + <h:outputText id="t1" value="#{panel.title[0]} (Panel 1)"/> + </f:facet> - <rich:panel rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onclick="showEvent('onclickInputID', 'onclick work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> - <f:facet name="header"> - <h:outputText id="t1" value="#{panel.title[0]} (Panel 1)" /> - </f:facet> + <rich:panel> + <f:facet name="header"> + <h:outputText id="t2" value="#{panel.title[1]}"/> + </f:facet> + <h:panelGrid columns="2"> + <h:outputText id="o1" value="width #{panel.title[2]}, eg. 250px"></h:outputText> + <h:inputText value="#{w}"> + <a4j:support event="onchange" reRender="p3"></a4j:support> + </h:inputText> - <rich:panel> - <f:facet name="header"> - <h:outputText id="t2" value="#{panel.title[1]}" /> - </f:facet> - <h:panelGrid columns="2"> - <h:outputText id="o1" value="width #{panel.title[2]}, eg. 250px"></h:outputText> - <h:inputText value="#{w}"> - <a4j:support event="onchange" reRender="p3"></a4j:support> - </h:inputText> + <h:outputText id="o2" value="height #{panel.title[2]}, eg. 200px"></h:outputText> + <h:inputText value="#{h}"> + <a4j:support event="onchange" reRender="p3"></a4j:support> + </h:inputText> + </h:panelGrid> - <h:outputText id="o2" value="height #{panel.title[2]}, eg. 200px"></h:outputText> - <h:inputText value="#{h}"> - <a4j:support event="onchange" reRender="p3"></a4j:support> - </h:inputText> - </h:panelGrid> + <rich:panel id="p3" style="width:#{w};height:#{h};overflow:auto;"> + <f:facet name="header"> + <h:outputText id="t3" value="#{panel.title[2]}"/> + </f:facet> + <h:graphicImage value="/pics/asus.jpg" width="150" height="100"></h:graphicImage> - <rich:panel id="p3" style="width:#{w};height:#{h};overflow:auto;"> - <f:facet name="header"> - <h:outputText id="t3" value="#{panel.title[2]}" /> - </f:facet> - <h:graphicImage value="/pics/asus.jpg" width="150" height="100"></h:graphicImage> - </rich:panel> - </rich:panel> - </rich:panel> + </rich:panel> + </rich:panel> + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}"/> + </h:selectOneMenu> + <ui:include src="${richBean.pathComponentContainer}"/> +</rich:panel> - <rich:panel id="panelId" rendered="#{panel.rendered}" - style="width:#{panel.width};height:#{panel.height}" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onclick="showEvent('onclickInputID', 'onclick work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> - <f:verbatim>This is panel 2 example...(Test events)</f:verbatim> - </rich:panel> +<rich:panel id="panelId" rendered="#{panel.rendered}" + style="width:#{panel.width};height:#{panel.height}" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + <f:verbatim>This is panel 2 example...(Test events)</f:verbatim> +</rich:panel> </f:subview> Deleted: trunk/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,91 +0,0 @@ - -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panel2SubviewID"> - <h:panelGrid columnClasses="panel" border="0" columns="3"> - <rich:panel styleClass="top"> - <f:facet name="header"> - <h:panelGroup> - <f:verbatim>dsdsdsdsd<br />sdsd </f:verbatim> - </h:panelGroup> - - </f:facet> - - <f:verbatim>This is <b>default</b> panel. content here</f:verbatim> - </rich:panel> - <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim>This panel contains custom headerClass and bodyClass</f:verbatim> - </rich:panel> - <rich:panel styleClass="top2" headerClass="hea2" bodyClass="bo2"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim> This panel also contains custom headerClass and bodyClass. The background is not a 3D anymore.</f:verbatim> - </rich:panel> - - <h:panelGroup> - <h:form> - <rich:panel - onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" - onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" - style="width:200px;" headerClass="hea2" bodyClass="bo3"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim>Base on the previous layout, but form element and javascript behaviour are added</f:verbatim> - <br /> - <h:inputText /> - </rich:panel> - </h:form> - </h:panelGroup> - - <rich:panel style="width:200px;" headerClass="hea" bodyClass="bo3"> - <f:facet name="header"> - <h:outputText value="Scrolling Text Panel" /> - </f:facet> - <f:verbatim> - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - </f:verbatim> - </rich:panel> - - <rich:panel styleClass="top"> - <f:verbatim>This is a panel without the header</f:verbatim> - - </rich:panel> - </h:panelGrid> - <rich:panel style="position: absolute; top: 116px; right: 100px; " - styleClass="top"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <f:verbatim> - This is a panel with absolute position on the screen.<br /> - Resize the browser's window for fun. - </f:verbatim> - </rich:panel> - <rich:panel style="width:#{panel.width};height:#{panel.height}"> - <f:facet name="header"> - <f:verbatim> - Test<br /> - Test<br /> - Test<br /> - </f:verbatim> - </f:facet> - <h:form> - <h:outputText value="inside the form" /> - </h:form> - </rich:panel> -</f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -4,7 +4,7 @@ <h:messages></h:messages> <rich:panelBar id="pBId" height="#{panelBar.height}" width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}" - styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="showEvent('onclickInputID', 'onclick work!')"> + styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="#{event.onclick}" onitemchange="#{event.onitemchange}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}" headerClass="#{panelBar.headerStyle}"> <h:outputText value="Some text..."></h:outputText> Modified: trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,169 +1,171 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuSubviewID"> - <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" - expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" - iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" - iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" - iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" - iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" - iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" - iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" - iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" - onclick="" ondblclick="" ongroupcollapse="" ongroupexpand="" onitemhover="" onkeydown="" onkeypress="" onkeyup="" - onmousedown="" onmousemove="" onmouseout="" onmouseover="" onmouseup=""> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="panelMenuSubviewID"> +<rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" + expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" + iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" + iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" + iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" + iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" + iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" + iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" + iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ongroupcollapse="#{event.ongroupcollapse}" ongroupexpand="#{event.ongroupexpand}" onitemhover="#{event.onitemhover}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <rich:panelMenuItem label="Item 1(Test event)" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"></rich:panelMenuItem> - <rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> - <h:outputText value="Disabled Item" /> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item Image"> - <h:graphicImage value="/pics/item.png"></h:graphicImage> - </rich:panelMenuItem> - <rich:panelMenuItem> - <h:outputText value="Item4" /> - </rich:panelMenuItem> - <rich:panelMenuItem label="CheckBox"> - <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> - </rich:panelMenuItem> - <rich:panelMenuItem> - <h:outputText value="CheckBox 2"></h:outputText> - <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> - </rich:panelMenuItem> - <rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> +<rich:panelMenuItem label="Item 1(Test event)" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onmouseup="#{event.onmouseup}"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1"> - <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> +<rich:panelMenuItem><h:outputText value="select "></h:outputText> <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}"/> +</h:selectOneMenu> +</rich:panelMenuItem> +<rich:panelMenuItem> + <ui:include src="${richBean.pathComponentContainer}"/> +</rich:panelMenuItem> +<rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> + <h:outputText value="Disabled Item"/> +</rich:panelMenuItem> +<rich:panelMenuItem label="Item Image"> + <h:graphicImage value="/pics/item.png"></h:graphicImage> +</rich:panelMenuItem> +<rich:panelMenuItem> + <h:outputText value="Item4"/> +</rich:panelMenuItem> +<rich:panelMenuItem label="CheckBox"> + <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> +</rich:panelMenuItem> +<rich:panelMenuItem> + <h:outputText value="CheckBox 2"></h:outputText> + <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> +</rich:panelMenuItem> +<rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}"> - <rich:panelMenuItem label="Imem 1_1"> - <h:inputText value="#{panelMenu.inputText}"></h:inputText> - </rich:panelMenuItem> +<rich:panelMenuGroup label="Group 1(expanded=true)" expanded="true"> + <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}"> + <rich:panelMenuItem label="Imem 1_1"> + <h:inputText value="#{panelMenu.inputText}"></h:inputText> + </rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1_1"> - <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1_2"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 4"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_1_1"> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');"> - <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_1_2"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 4"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3"> - <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');"> + <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group disabled" disabled="true"> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_3"> + <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group disabled" disabled="true"> + </rich:panelMenuGroup> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 2 "> - <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem> +</rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 2_2"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> +<rich:panelMenuGroup label="Group 2 "> + <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 2_2"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 3"> - <rich:panelMenuItem label="Item 3_1"> - <f:verbatim> - <br /> - text <br /> - text <br /> - text - </f:verbatim> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3_2"> - <h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenu> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> +</rich:panelMenuGroup> - <f:verbatim> - <br /> - <br /> - </f:verbatim> +<rich:panelMenuGroup label="Group 3"> + <rich:panelMenuItem label="Item 3_1"> + <f:verbatim> + <br/> + text <br/> + text <br/> + text + </f:verbatim> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3_2"> + <h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem> +</rich:panelMenuGroup> +</rich:panelMenu> - <h:outputText id="info" - value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText> -  - <f:verbatim> - <br /> - </f:verbatim> +<f:verbatim> + <br/> + <br/> +</f:verbatim> - <rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" - selectedChild="thisChild" styleClass="body"> - <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> - <rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> +<h:outputText id="info" + value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText> + +<f:verbatim> + <br/> +</f:verbatim> - <rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item "></rich:panelMenuItem> - </rich:panelMenuGroup> +<rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" + selectedChild="thisChild" styleClass="body"> + <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> + <rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" - iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item "></rich:panelMenuItem> + </rich:panelMenuGroup> -  - <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle"> - <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> - <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item "></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" + iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> - </rich:panelMenu> +  + <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle"> + <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item "></rich:panelMenuItem> + </rich:panelMenuGroup> + + <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> +</rich:panelMenu> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -2,77 +2,18 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="pickListSubviewID"> <rich:pickList id="pickListID" valueChangeListener="#{pickList.valueChangeListener}" copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}" - disabled="#{pickList.copyControlLabel}" displayValueOnly="#{pickList.displayValueOnly}" dir="#{pickList.dir}" - fastOrderControlsVisible="#{pickList.fastOrderControlsVisible}" immediate="#{pickList.immediate}" + disabled="#{pickList.copyControlLabel}" dir="#{pickList.dir}" immediate="#{pickList.immediate}" listsHeight="#{pickList.listsHeight}" moveControlsVerticalAlign="#{pickList.removeAllControlLabel}" removeAllControlLabel="#{pickList.removeAllControlLabel}" removeControlLabel="#{pickList.removeControlLabel}" - rendered="#{pickList.rendered}" showButtonLabels="#{pickList.showButtonLabels}" sourceListWidth="#{pickList.sourceListWidth}" - title="#{pickList.title}" switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}" - size="#{pickList.size}" > + rendered="#{pickList.rendered}" sourceListWidth="#{pickList.sourceListWidth}" title="#{pickList.title}" + switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}" size="#{pickList.size}" + onclick="#{event.onclick}" onblur="#{event.onblur}" onchange="#{event.onchange}" ondblclick="#{event.ondblclick}" + onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:selectItem itemValue="selectItem" itemLabel="selectItem" /> <f:selectItem itemValue="selectItem 1" itemLabel="selectItem 1" /> <f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" /> <f:selectItems value="#{pickList.data}" /> </rich:pickList> - - <h:commandButton value="submit"></h:commandButton> - - <h:panelGrid columns="2"> - <h:outputText value="title:"></h:outputText> - <h:inputText value="#{pickList.title}" onchange="submit();"></h:inputText> - - <h:outputText value="moveControlsVerticalAlign:"></h:outputText> - <h:inputText value="#{pickList.moveControlsVerticalAlign}" onchange="submit();"></h:inputText> - - <h:outputText value="showButtonLabels:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.showButtonLabels}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="copyAllControlLabel:"></h:outputText> - <h:inputText value="#{pickList.copyAllControlLabel}" onchange="submit();"></h:inputText> - - <h:outputText value="copyControlLabel:"></h:outputText> - <h:inputText value="#{pickList.copyControlLabel}" onchange="submit();"></h:inputText> - - <h:outputText value="removeControlLabel:"></h:outputText> - <h:inputText value="#{pickList.removeControlLabel}" onchange="submit();"></h:inputText> - - <h:outputText value="removeAllControlLabel:"></h:outputText> - <h:inputText value="#{pickList.removeAllControlLabel}" onchange="submit();"></h:inputText> - - <h:outputText value="switchByClick:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.switchByClick}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="listsHeight:"></h:outputText> - <h:inputText value="#{pickList.listsHeight}" onchange="submit();"></h:inputText> - - <h:outputText value="sourceListWidth:"></h:outputText> - <h:inputText value="#{pickList.sourceListWidth}" onchange="submit();"></h:inputText> - - <h:outputText value="targetListWidth:"></h:outputText> - <h:inputText value="#{pickList.targetListWidth}" onchange="sumbmit();"></h:inputText> - - <h:outputText value="fastOrderControlsVisible:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.fastOrderControlsVisible}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="dir:"></h:outputText> - <h:selectOneMenu value="#{pickList.dir}" onchange="submit();"> - <f:selectItem itemValue="LTR" itemLabel="LTR" /> - <f:selectItem itemValue="RTL" itemLabel="RTL" /> - </h:selectOneMenu> - - <h:outputText value="size:"></h:outputText> - <h:inputText value="#{pickList.size}" onchange="sumbit();"></h:inputText> - - <h:outputText value="displayValueOnly:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.displayValueOnly}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.rendered}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="immediate:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.immediate}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="disabled:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox> - </h:panelGrid> </f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,63 @@ + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="pickListPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="title:"></h:outputText> + <h:inputText value="#{pickList.title}" onchange="submit();"></h:inputText> + + <h:outputText value="moveControlsVerticalAlign:"></h:outputText> + <h:inputText value="#{pickList.moveControlsVerticalAlign}" onchange="submit();"></h:inputText> + + <h:outputText value="showButtonLabels:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.showButtonLabels}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="copyAllControlLabel:"></h:outputText> + <h:inputText value="#{pickList.copyAllControlLabel}" onchange="submit();"></h:inputText> + + <h:outputText value="copyControlLabel:"></h:outputText> + <h:inputText value="#{pickList.copyControlLabel}" onchange="submit();"></h:inputText> + + <h:outputText value="removeControlLabel:"></h:outputText> + <h:inputText value="#{pickList.removeControlLabel}" onchange="submit();"></h:inputText> + + <h:outputText value="removeAllControlLabel:"></h:outputText> + <h:inputText value="#{pickList.removeAllControlLabel}" onchange="submit();"></h:inputText> + + <h:outputText value="switchByClick:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.switchByClick}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="listsHeight:"></h:outputText> + <h:inputText value="#{pickList.listsHeight}" onchange="submit();"></h:inputText> + + <h:outputText value="sourceListWidth:"></h:outputText> + <h:inputText value="#{pickList.sourceListWidth}" onchange="submit();"></h:inputText> + + <h:outputText value="targetListWidth:"></h:outputText> + <h:inputText value="#{pickList.targetListWidth}" onchange="sumbmit();"></h:inputText> + + <h:outputText value="fastOrderControlsVisible:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.fastOrderControlsVisible}" + onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="dir:"></h:outputText> + + <h:selectOneMenu value="#{pickList.dir}" onchange="submit();"> + <f:selectItem itemValue="LTR" itemLabel="LTR"/> + <f:selectItem itemValue="RTL" itemLabel="RTL"/> + </h:selectOneMenu> + + <h:outputText value="size:"></h:outputText> + <h:inputText value="#{pickList.size}" onchange="sumbit();"></h:inputText> + + <h:outputText value="displayValueOnly:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.displayValueOnly}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="immediate:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.immediate}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="disabled:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox> + </h:panelGrid> +</f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,102 @@ + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="progressBarSubviewID"> + + <rich:progressBar id="progressBarID" + style="width: 450px; height: 19px;" value="#{progressBar.value}" + mode="#{progressBar.mode}" enabled="#{progressBar.enabled}" + actionListener="#{progressBar.actionListener}" + interval="#{progressBar.interval}" action="#{progressBar.action}" + maxValue="#{progressBar.maxValue}" minValue="#{progressBar.minValue}" + rendered="#{progressBar.rendered}" reRender="loadInfoPBID,valuePBID" + progressVar="progressVar" parameters="params:'%'" + reRenderAfterComplete="completedPBID" + ignoreDupResponses="#{progressBar.ignoreDupResponses}" + dualColoredLabel="#{progressBar.dualColoredLabel}" + onbeforedomupdate="#{event.onbeforedomupdate}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" + ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" + onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}" onsubmit="#{event.onsubmit}"> + <f:facet name="initial"> + <h:outputText value="Process not started"></h:outputText> + </f:facet> + <f:facet name="complete"> + <h:outputText value="Process completed"></h:outputText> + </f:facet> + <h:outputText + value="{minValue} {params} / {value} {params}/ {maxValue} {params}"></h:outputText> + <h:outputText id="loadInfoPBID" + value="[Load: #{progressBar.loadInfo}] " /> + <h:graphicImage value="/pics/ajax_process.gif" /> + </rich:progressBar> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputText + value="[parameters=params:'%'], [{minValue} {params} / {value} {params}/ {maxValue} {params}]" /> + <h:panelGrid columns="1"> + <a4j:commandButton value="getValue" + onclick="alert($('formID:progressBarSubviewID:progressBarID').component.getValue())"></a4j:commandButton> + <a4j:commandLink value="doShow" + onclick="$('formID:progressBarSubviewID:progressBarID').component.doShow(event)"></a4j:commandLink> + <a4j:commandLink value="disable" + onclick="$('formID:progressBarSubviewID:progressBarID').component.disable();"></a4j:commandLink> + <a4j:commandLink value="enable" + onclick="$('formID:progressBarSubviewID:progressBarID').component.enable(event);"></a4j:commandLink> + </h:panelGrid> + + <h:panelGrid columns="2"> + <h:outputText value="first value:" /> + <h:outputText value="#{progressBar.value}" /> + <h:outputText value="completed value:" /> + <h:outputText id="completedPBID" value="#{progressBar.value}" /> + </h:panelGrid> + + <h:panelGrid columns="2"> + <h:outputText value="value:" /> + <h:inputText id="valuePBID" value="#{progressBar.value}"> + <a4j:support event="onchange" reRender="progressBarID"></a4j:support> + </h:inputText> + + <h:outputText value="interval:" /> + <h:inputText value="#{progressBar.interval}"> + <a4j:support event="onchange" reRender="progressBarID"></a4j:support> + </h:inputText> + + <h:outputText value="mode:" /> + <h:selectOneRadio value="#{progressBar.mode}"> + <f:selectItem itemValue="ajax" itemLabel="ajax"/> + <f:selectItem itemValue="client" itemLabel="client" /> + <a4j:support event="onchange" reRender="progressBarID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="enabled" /> + <h:selectBooleanCheckbox value="#{progressBar.enabled}"> + <a4j:support event="onchange" reRender="progressBarID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="permanent:" /> + <h:selectBooleanCheckbox value="#{progressBar.permanent}" + onchange="submit();" /> + + <h:outputText value="minValue:" /> + <h:inputText value="#{progressBar.minValue}" onchange="submit();" /> + + <h:outputText value="maxValue:" /> + <h:inputText value="#{progressBar.maxValue}" onchange="submit();" /> + + <h:outputText value="dualColoredLabel:" /> + <h:selectBooleanCheckbox value="#{progressBar.dualColoredLabel}" + onchange="submit();" /> + + <h:outputText value="ignoreDupResponses" /> + <h:selectBooleanCheckbox value="#{progressBar.ignoreDupResponses}" + onchange="submit();" /> + + <h:outputText value="rendered:" /> + <h:selectBooleanCheckbox value="#{progressBar.rendered}" + onchange="submit();" /> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -11,31 +11,30 @@ limitToList="#{scrollableDT.limitToList}" timeout="#{scrollableDT.timeout}" selection="#{scrollableDT.selection}" - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - onselectionchange="showEvent('onselectionchangeInputID', 'onselectionchange work!')"> + onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onRowClick="#{event.onRowClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseUp="#{event.onRowMouseUp}" onselectionchange="#{event.onselectionchange}"> <f:facet name="header"> <h:outputText value="facet header"></h:outputText> </f:facet> - <rich:column> + <rich:column sortExpression="#{sdt.int0}" sortable="true"> <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> + <rich:column sortExpression="#{sdt.str0}" sortable="false"> <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> + <rich:column sortExpression="#{sdt.str1}"> <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> + <rich:column sortExpression="#{sdt.str2}"> <f:facet name="header"><h:outputText value="Select"></h:outputText> </f:facet> <h:selectOneMenu value="#{sdt.str2}"> <f:selectItem itemLabel="select0" itemValue="select0" /> @@ -47,7 +46,7 @@ <f:facet name="footer"><h:outputText value="Select"></h:outputText> </f:facet> </rich:column> - <rich:column> + <rich:column sortExpression="#{sdt.str3}"> <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> Modified: trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -3,11 +3,7 @@ <h:outputText value="Some text one..." styleClass="text"></h:outputText> <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" - onclick="showEvent('onclickInputID', 'onclick work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"></rich:separator> + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,67 +1,66 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="simpleTogglePanelSubviewID"> - <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" - width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" - opened="false" onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> - <f:facet name="closeMarker"> - <h:outputText value="Close It" /> - </f:facet> - <f:facet name="openMarker"> - <h:outputText value="Open It" /> - </f:facet> - <f:verbatim> - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - </f:verbatim> - </rich:simpleTogglePanel> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="simpleTogglePanelSubviewID"> - <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" - opened="false" onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> - <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> - </rich:simpleTogglePanel> + <rich:simpleTogglePanel id="stpIncludeID" switchType="client"> + <f:facet name="closeMarker"> + <h:outputText value="Close it"/> + </f:facet> - <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" - focus="#{simpleTogglePanel.focus}" onclick="showEvent('onclickInputID', 'onclick work!')" - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> - <f:facet name="closeMarker"> - <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> - </f:facet> - <f:facet name="openMarker"> - <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage> - </f:facet> - <rich:simpleTogglePanel id="INsTP"> - <h:panelGrid columns="2"> - <h:graphicImage value="/pics/podb109_61.jpg" width="250px" height="200px"></h:graphicImage> - <f:verbatim> - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - </f:verbatim> - </h:panelGrid> - </rich:simpleTogglePanel> - </rich:simpleTogglePanel> + <f:facet name="openMarker"> + <h:outputText value="Open it"/> + </f:facet> + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}"/> + </h:selectOneMenu> + <ui:include src="${richBean.pathComponentContainer}"/> + </rich:simpleTogglePanel> + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" + width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + <f:facet name="closeMarker"> + <h:outputText value="Close It"/> + </f:facet> + <f:facet name="openMarker"> + <h:outputText value="Open It"/> + </f:facet> + <f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> + </rich:simpleTogglePanel> - <rich:spacer height="20px"></rich:spacer> + <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" + opened="false" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> + </rich:simpleTogglePanel> + + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" + focus="#{simpleTogglePanel.focus}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + <f:facet name="closeMarker"> + <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> + </f:facet> + <f:facet name="openMarker"> + <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage> + </f:facet> + <rich:simpleTogglePanel id="INsTP"> + <h:panelGrid columns="2"> + <h:graphicImage value="/pics/podb109_61.jpg" width="250px" height="200px"></h:graphicImage> + <f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> + </h:panelGrid> + </rich:simpleTogglePanel> + </rich:simpleTogglePanel> + + <rich:spacer height="20px"></rich:spacer> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,6 +1,5 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerPropertySubviewID"> - <rich:simpleTogglePanel id="spacerPropertyID" switchType="client" opened="true" label="spacer property"> <h:panelGrid columns="2"> <h:outputText value="Width (px or %):"></h:outputText> <h:inputText value="#{spacer.width}"> @@ -24,5 +23,4 @@ <h:outputText value="Style" /> <a4j:commandButton id="btn" action="#{spacer.doStyle}" value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> </h:panelGrid> - </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -12,7 +12,7 @@ cellspacing="#{sb.cellspacing}" first="#{sb.first}" minChars="#{sb.minchars}" tokens="#{sb.tokens}" bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}" summary="summary" shadowOpacity="#{sb.shadowOpacity}" shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}" nothingLabel="nothingLabel work! " - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" onselect="showEvent('onselectInputID', 'onselect work!')"> + oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}"> <h:column> <h:outputText value="#{result.city}" /> </h:column> Modified: trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,53 +1,51 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelSubviewID"> - <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" - height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" - headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" - disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" - contentClass="#{tabPanel.contentStyle}" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="tabPanelSubviewID"> + <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" + height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" + headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" + disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" + contentClass="#{tabPanel.contentStyle}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> - <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" - onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - ontabenter="showEvent('ontabenterInputID', 'ontabenter work!')" ontableave="showEvent('ontableaveInputID', 'ontableave work!')"> - <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> - </rich:tab> - <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" - onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - ontabenter="showEvent('ontabenterInputID', 'ontabenter work!')" ontableave="showEvent('ontableaveInputID', 'ontableave work!')"> - <f:facet name="header"> - <h:outputText value="client switchType from facet" /> - </f:facet> - <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" height="383"></h:graphicImage> - </rich:tab> - <rich:tab id="tabThree" label="Tab with some text" disabled="#{tabPanel.disabledTab}" - onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - ontabenter="showEvent('ontabenterInputID', 'ontabenter work!')" ontableave="showEvent('ontableaveInputID', 'ontableave work!')"> - <h:outputText - value=" Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" onclick="#{event.onclick}" + oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" + ontableave="#{event.ontableave}"> + <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> + </rich:tab> + <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" onclick="#{event.onclick}" + oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" + ontableave="#{event.ontableave}"> + <f:facet name="header"> + <h:outputText value="client switchType from facet" /> + </f:facet> + <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" height="383"></h:graphicImage> + </rich:tab> + <rich:tab id="tabThree" label="Tab with some text" disabled="#{tabPanel.disabledTab}" onclick="#{event.onclick}" + oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" + ontableave="#{event.ontableave}"> + <h:outputText + value=" Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text..." /> - </rich:tab> - </rich:tabPanel> + </rich:tab> + <rich:tab id="tabInclude" label="test containers"> + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}" /> + </h:selectOneMenu> + <ui:include src="${richBean.pathComponentContainer}" /> + </rich:tab> + </rich:tabPanel> - <rich:spacer height="20px"></rich:spacer> + <rich:spacer height="20px"></rich:spacer> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,13 +1,44 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelSubviewID"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="togglePanelSubviewID"> + <rich:togglePanel id="panelIncludeID" switchType="#{togglePanel.switchType}" initialState="blankInclude" stateOrder="blankInclude,blank" + style="width:300px!important;" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> + <f:facet name="blankInclude"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <rich:toggleControl id="toggleControl_blankInclude" for="togglePanelSubviewID:panelIncludeID"> + <h:outputText value="Expand" style="font-weight: bold;" /> + <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + </rich:panel> + </f:facet> + + <f:facet name="include"> + <rich:panel style="overflow: auto"> + <f:facet name="header"> + <h:panelGroup> + <rich:toggleControl id="toggleControl_include" for="togglePanelSubviewID:panelIncludeID"> + <h:outputText value="Collapse" style="font-weight: bold;" /> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}" /> + </h:selectOneMenu> + <ui:include src="${richBean.pathComponentContainer}"/> + </rich:panel> + </f:facet> + </rich:togglePanel> + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" - style="width:300px!important;" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> + style="width:300px!important;" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:facet name="blank"> <rich:panel> <f:facet name="header"> @@ -54,13 +85,8 @@ <br /> </f:verbatim> - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:facet name="asus"> <rich:panel> <f:facet name="header"> @@ -146,4 +172,5 @@ </f:facet> </rich:togglePanel> + <ui:debug hotkey="L"></ui:debug> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -6,7 +6,7 @@ height="#{toolBar.height}" rendered="#{toolBar.rendered}" itemSeparator="#{toolBar.itemSeparator}" contentClass="#{toolBar.contentStyle}" - separatorClass="#{toolBar.separatorStyle}" + separatorClass="#{toolBar.separatorStyle}" contentStyle="contentStyle" style="style" styleClass="styleClass"> <h:outputText value="ToolBar" style="font-style: italic"></h:outputText> Modified: trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,82 +1,65 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tooltipSubviewID"> - <h:messages></h:messages> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="tooltipSubviewID"> + <h:messages></h:messages> - <h:outputText value="DEFAULT VALUE:"></h:outputText> + <h:outputText value="DEFAULT VALUE:"></h:outputText> - <f:verbatim> - <br /> - </f:verbatim> + <f:verbatim> + <br/> + </f:verbatim> - <h:inputText value="Text" id="inp1" size="50"> - <rich:toolTip id="toolTipID" value="toolTip for input text" onclick="showEvent('onclickInputID', 'onclick work!')" + <h:inputText value="Text" id="inp1" size="50"> + <rich:toolTip id="toolTipID" value="toolTip for input text" > + <f:facet name="defaultContent"> + <f:verbatim>DEFAULT VALUE</f:verbatim> + </f:facet> + </rich:toolTip> + </h:inputText> + <h:panelGrid columns="2"> + <h:outputText value="JavaScript API"></h:outputText> + <h:column></h:column> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doShow(event)" value="doShow"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doHide(event)" value="doHide"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doEnable" value="doEnable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doDisable" value="doDisable"></a4j:commandLink> + </h:panelGrid> + <h:selectOneListbox value="1" id="ddl"> + <rich:toolTip value="1231231"> + <f:facet name="defaultContent"> + <f:verbatim>DEFAULT VALUE DropDown</f:verbatim> + </f:facet> + </rich:toolTip> + </h:selectOneListbox> - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - onhide="showEvent('onhideInputID', 'onhide work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - onshow="showEvent('onshowInputID', 'onshow work!')"> - <f:facet name="defaultContent"> - <f:verbatim>DEFAULT VALUE</f:verbatim> - </f:facet> - </rich:toolTip> - </h:inputText> - <h:panelGrid columns="2"> - <h:outputText value="JavaScript API"></h:outputText> - <h:column></h:column> - <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doShow(event)" value="doShow"></a4j:commandLink> - <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doHide(event)" value="doHide"></a4j:commandLink> - <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doEnable" value="doEnable"></a4j:commandLink> - <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doDisable" value="doDisable"></a4j:commandLink> - </h:panelGrid> - <h:selectOneListbox value="1" id="ddl"> - <rich:toolTip value="1231231" onclick="showEvent('onclickInputID', 'onclick work!')" - oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - onhide="showEvent('onhideInputID', 'onhide work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - onshow="showEvent('onshowInputID', 'onshow work!')"> - <f:facet name="defaultContent"> - <f:verbatim>DEFAULT VALUE DropDown</f:verbatim> - </f:facet> - </rich:toolTip> - </h:selectOneListbox> + <f:verbatim> + <br/> + <br/> + </f:verbatim> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <h:outputText value=" Test tooltip:"></h:outputText> + <f:verbatim> + <br/> + </f:verbatim> - <h:outputText value=" Test tooltip:"></h:outputText> - <f:verbatim> - <br /> - </f:verbatim> + <rich:panel style="width:50px; height:50px; background-color: gray"> + <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" event="#{tooltip.event}" + hideDelay="#{tooltip.hideDelay}" showDelay="#{tooltip.showDelay}" layout="#{tooltip.layout}" + horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" + direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onhide="#{event.onhide}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onshow="#{event.onshow}"> + <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> + </rich:toolTip> + </rich:panel> - <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" event="#{tooltip.event}" - hideDelay="#{tooltip.hideDelay}" showDelay="#{tooltip.showDelay}" layout="#{tooltip.layout}" - horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" - direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}" - onclick="showEvent('onclickInputID', 'onclick work!')" oncomplete="showEvent('oncompleteInputID', 'oncomplete work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onhide="showEvent('onhideInputID', 'onhide work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - onshow="showEvent('onshowInputID', 'onshow work!')"> - <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> - </rich:toolTip> - </rich:panel> - - <f:verbatim> - <br /> - </f:verbatim> - + <f:verbatim> + <br/> + </f:verbatim> + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}"/> + </h:selectOneMenu> + <rich:panel style="width:50px; height:50px; background-color: gray"> + <rich:toolTip id="includeToolTIpID" followMouse="false" layout="block" hideDelay="2000" showDelay="0" value="test include"> + <ui:include src="${richBean.pathComponentContainer}"/> + </rich:toolTip> + </rich:panel> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -11,14 +11,7 @@ ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator" immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" iconCollapsed="#{bean.iconCollapsed}" iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" dropListener="#{bean.processDrop}" - onclick="showEvent('onclickInputID', 'onclick work!')" ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - ondragend="showEvent('ondragendInputID', 'ondragend work!')" ondragenter="showEvent('ondragenterInputID', 'ondragenter work!')" - ondragexit="showEvent('ondragexitInputID', 'ondragexit work!')" ondragstart="showEvent('ondragstartInputID', 'ondragstart work!')" - ondrop="showEvent('ondropInputID', 'ondrop work!')" ondropend="showEvent('ondropendInputID', 'ondropend work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ondragend="#{event.ondragend}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondragstart="#{event.ondragstart}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}"> <f:facet name="icon"> <h:outputText value="icon" rendered="#{bean.renderFacets}" /> @@ -38,7 +31,8 @@ <rich:treeNode type="input" dropListener="#{bean.processDrop}" oncollapse="Element.removeClassName(event['treeItem'].getElement(), 'colored')" - onexpand="Element.addClassName(event['treeItem'].getElement(), 'colored')"> + onexpand="Element.addClassName(event['treeItem'].getElement(), 'colored')" + onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" oncontextmenu="#{event.oncontextmenu}" ondblclick="#{event.ondblclick}" ondragend="#{event.ondragend}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondragstart="#{event.ondragstart}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselected="#{event.onselected}"> <h:outputText value="#{data} : " /> <h:inputText value="#{data.name}" required="true" styleClass="inputs"> </h:inputText> Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -3,13 +3,8 @@ <h:panelGrid columns="2"> <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" - dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" /> + dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"/> </h:panelGrid> Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Event.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Event.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Event.xml 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE faces-config PUBLIC + "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> + +<faces-config> + <managed-bean> + <managed-bean-name>event</managed-bean-name> + <managed-bean-class>util.event.Event</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PTComponent.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PTComponent.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PTComponent.xml 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>pTComponent</managed-bean-name> + <managed-bean-class>util.ptComponent.PTComponent</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ProgressBar.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ProgressBar.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ProgressBar.xml 2008-02-15 09:43:47 UTC (rev 6107) @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> +<managed-bean> + <managed-bean-name>progressBar</managed-bean-name> + <managed-bean-class>progressBar.ProgressBar</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> +</managed-bean> +</faces-config> + + \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-02-15 09:43:47 UTC (rev 6107) @@ -47,7 +47,8 @@ /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml, /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml, - /WEB-INF/faces-config-ComponentControl.xml, /WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml</param-value> + /WEB-INF/faces-config-ComponentControl.xml, /WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml, + /WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> Modified: trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,7 +1,4 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="jQuerySubviewID"> <style> .divSize_1 { @@ -12,7 +9,7 @@ } .divColor_1 { - + background-color: #1E90FF; } Modified: trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,54 +1,89 @@ -<f:subview id="EventInfoSubview" xmlns="http://www.w3.org/1999/xhtml" xmlns:rich="http://richfaces.org/rich" - xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <f:verbatim> - <div style="position: relative"><input id="onorderchangedInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ontopclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onupclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondownclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onbottomclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onheaderclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onmousemoveInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ontabenterInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ontableaveInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onLoadMapInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onselectionchangeInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondownclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onupclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="oninitInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ongroupactivateInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onitemselectInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onsubmitInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onRowClickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onRowDblClickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onRowMouseDownInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onRowMouseMoveInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onRowMouseOutInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onRowMouseOverInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onRowMouseUpInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onselectInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onchangeInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onfocusInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onblurInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="oncollapseInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="oncompleteInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondblclickInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondragendInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondragenterInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondragexitInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondragstartInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondropInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="ondropendInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onexpandInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onkeydownInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onkeypressInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onkeyupInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onmousedownInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onmouseoutInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onmouseupInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onselectedInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onhideInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onmouseupInputID" type="hidden" value="don't work!" size="42" /></div> - <div style="position: relative"><input id="onshowInputID" type="hidden" value="don't work!" size="42" /></div> - </f:verbatim> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="EventInfoSubview"> + <f:verbatim><div style="position: relative"><input id="onmouseupInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ontabenterInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ontableaveInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onLoadMapInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onselectionchangeInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondownclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onupclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninitInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ongroupactivateInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onitemselectInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onsubmitInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onRowClickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onRowDblClickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onRowMouseDownInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onRowMouseMoveInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onRowMouseOutInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onRowMouseOverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onRowMouseUpInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onselectInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onchangeInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onfocusInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onblurInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oncollapseInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oncompleteInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondblclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondragendInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondragenterInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondragexitInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondragstartInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondropInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondropendInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onexpandInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onkeydownInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onkeypressInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onkeyupInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmousedownInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmousemoveInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmouseoutInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmouseoverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onselectedInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onhideInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onshowInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onlistcallInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onitemselectedInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputblurInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputchangeInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputfocusInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputkeydownInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputkeypressInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputkeyupInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oninputselectInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondateselectedInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondateselectInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ontimeselectInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ontimeselectedInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onchangedInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondatemouseoverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondatemouseoutInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oncurrentdateselectInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onbeforedomupdateInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onslideInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondropoverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ondropoutInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onerrorInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ontopclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onbottomclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onorderchangedInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmoveInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onheaderclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onresizeInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskmouseoverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskmouseoutInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskmousemoveInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskmouseupInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskmousedownInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskdblclickInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onmaskcontextmenuInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onitemchangeInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onitemhoverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ongroupexpandInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="oncontextmenuInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ongroupcollapseInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="onSlideSubmitInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/pages/Blank/Blank.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Blank/Blank.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Blank/Blank.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,5 +1,3 @@ -<f:subview id="calendarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> - </h:form> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarSubviewID"> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankProperty.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankProperty.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,7 +1,3 @@ -<f:subview id="PropertySubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="PropertySubviewID"> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankStraightforward.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankStraightforward.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,7 +1,3 @@ -<f:subview id="StraightforwardSubviewID" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="StraightforwardSubviewID"> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -29,32 +29,28 @@ type="text/css" /> </head> <body> - <div id="divOpthID" align="right" style="z-index: 200"> - <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + <ui:include src="/pages/RichMenu/RichMenu.jsp" /> + <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> + <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> + <ui:include src="${richBean.pathComponent}" /> </div> + </div> + <h:form> + <ui:include src="${richBean.pathStraightforward}" /> + <ui:include src="${richBean.pathProperty}" /> + </h:form> + <rich:modalPanel id="eventInfoID" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> + </f:facet> + + <ui:include src="/pages/Action/EventInfo.jsp" /> - <div id="div_1_ID" style="position: relative; left:600px; top:500px; z-index:1;"> - <div id="div_2_ID" style="position: absolute; left:-580px; top:-450px;"> - <h:form> - <ui:include src="${richBean.pathComponent}" /> - <ui:include src="${richBean.pathStraightforward}" /> - <ui:include src="${richBean.pathProperty}" /> - </h:form> - <rich:modalPanel id="eventInfoID" autosize="true" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> - <f:facet name="header"> - <h:outputText value="Events ..." /> - </f:facet> - <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> - </f:facet> - - <ui:include src="/pages/Action/EventInfo.xhtml" /> - - </rich:modalPanel> - <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> - </div> - </div> - + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </body> </f:view> -</html> +</html> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -21,37 +21,42 @@ <link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" type="text/css" /> </head> <body> - <div id="divOpthID" align="right" style="z-index: 200"><ui:include src="/pages/RichMenu/RichMenu.xhtml" /></div> - <h:form id="formID"> - <h:panelGrid id="richGridID" columns="1"> - <h:column rendered="#{richBean.reComponent}"> - <ui:include src="${richBean.pathComponent}" /> - </h:column> - <h:column rendered="#{!richBean.reComponent}"></h:column> - - <h:column rendered="#{richBean.reStraightforward}"> - <ui:include src="${richBean.pathStraightforward}" /> - </h:column> - <h:column rendered="#{!richBean.reStraightforward}"></h:column> - - <h:column rendered="#{richBean.reProperty}"> - <ui:include src="${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;"> - <f:facet name="header"> - <h:outputText value="Events ..." /> - </f:facet> - <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');" /> - </f:facet> + <h:form id="formID"> + <div id="divOpthID" align="right" style="z-index: 200"> + <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + </div> + <h:messages showDetail="true" showSummary="true"></h:messages> + <h:panelGrid id="richGridID" columns="1" width="100%"> + <h:column rendered="#{richBean.reComponent}"> + <ui:include src="${richBean.pathComponent}"/> + </h:column> + + <h:column rendered="#{!richBean.reComponent}"></h:column> - <ui:include src="/pages/Action/EventInfo.xhtml" /> + <h:column rendered="#{richBean.reStraightforward}"> + <ui:include src="${richBean.pathStraightforward}"/> + </h:column> + <h:column rendered="#{!richBean.reStraightforward}"></h:column> - </rich:modalPanel> - <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> + <h:column rendered="#{richBean.reProperty}"> + <ui:include src="${richBean.pathProperty}"/> + </h:column> + <h:column rendered="#{!richBean.reProperty}"></h:column> + </h:panelGrid> + + <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..."/> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> + </f:facet> + + <ui:include src="/pages/Action/EventInfo.xhtml"/> + + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> + </h:form> </body> </f:view> </html> Modified: trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,26 +1,23 @@ -<h:form id="forvDivOpthID" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="richMenuSubviewID"> <h:panelGrid columns="5" border="1"> <h:panelGrid columns="1"> <h:commandButton value="submit" style="width : 85px; height : 21px;"></h:commandButton> <a4j:commandButton value="submit[a4j]" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> </h:panelGrid> - <h:column> + <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'}" /> + <h:panelGrid columns="2"> + <h:outputText value="Component" /> <h:selectBooleanCheckbox value="#{richBean.reComponent}" onchange="submit();" /> - </h:panelGroup> - <h:panelGroup> - <h:outputText value="#{richBean.reStraightforward ? 'Straightforward hide' : 'Straightforward show'}" /> + + <h:outputText value="Straightforward" /> <h:selectBooleanCheckbox value="#{richBean.reStraightforward}" onchange="submit();" /> - </h:panelGroup> - <h:panelGroup> - <h:outputText value="#{richBean.reProperty ? 'Property hide' : 'Property show'}" /> + + <h:outputText value="Property" /> <h:selectBooleanCheckbox value="#{richBean.reProperty}" onchange="submit();" /> - </h:panelGroup> + </h:panelGrid> </h:panelGrid> <h:panelGrid columns="1"> @@ -33,9 +30,9 @@ <h:panelGrid columns="1"> <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItems value="#{richBean.list}"/> + <f:selectItems value="#{richBean.list}" /> </h:selectOneMenu> </h:panelGrid> </h:panelGrid> <h:commandLink value="Back" action="main"></h:commandLink> -</h:form> +</f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -29,35 +29,29 @@ type="text/css" /> </head> <body> - <div id="divOpthID" align="right" style="z-index: 200"> - <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> - </div> - - <div id="divPageID" style="position: absolute; background-color:gray; top:60px; left: 10px; z-index: 2"> - <h:form> - <ui:include src="${richBean.pathComponent}" />\ - <ui:include src="${richBean.pathStraightforward}" /> - <ui:include src="${richBean.pathProperty}" /> - </h:form> - - <rich:modalPanel id="eventInfoID" autosize="true" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> - <f:facet name="header"> - <h:outputText value="Events ..." /> - </f:facet> - <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> - </f:facet> - - <ui:include src="/pages/Action/EventInfo.xhtml" /> - - </rich:modalPanel> - <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> - </div> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="SelectOneMenuPage.jsp" /> + </div> + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="${richBean.pathComponent}" /> + </div> + <h:form> + <jsp:include page="${richBean.pathStraightforward}" /> + <jsp:include page="${richBean.pathProperty}" /> + </h:form> + <rich:modalPanel id="eventInfoID" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> + </f:facet> - <div id="divID" style="absolute; relative; top:60px; left: 10px; z-index: 1"> - <ui:include src="/pages/Select/SelectOneMenuPage.xhtml" /> - </div> + <jsp:include page="/pages/Action/EventInfo.jsp" /> + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </body> </f:view> -</html> +</html> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml 2008-02-15 09:41:56 UTC (rev 6106) +++ trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml 2008-02-15 09:43:47 UTC (rev 6107) @@ -1,441 +1,6 @@ -<h:form id="formSOMID" xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> - - <h:panelGrid columns="12" cellpadding="0" cellspacing="0" border="0"> - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="selectOneMenuPage"> + <h:panelGrid columns="7" cellpadding="0px" cellspacing="0px"> <h:selectOneMenu value="selectItem" > <f:selectItem itemLabel="selectItem" itemValue="test" /> </h:selectOneMenu> @@ -603,269 +168,5 @@ <h:selectOneMenu value="selectItem" > <f:selectItem itemLabel="selectItem" itemValue="test" /> </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> </h:panelGrid> -</h:form> +</f:subview> \ No newline at end of file

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6106 - in trunk/sandbox: samples/inplaceSelect-sample and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-02-15 04:41:56 -0500 (Fri, 15 Feb 2008) New Revision: 6106 Modified: trunk/sandbox/samples/inplaceInput-sample/ trunk/sandbox/samples/inplaceSelect-sample/ trunk/sandbox/ui/inplaceInput/ trunk/sandbox/ui/inplaceSelect/ Log: added target folders to ignore list Property changes on: trunk/sandbox/samples/inplaceInput-sample ___________________________________________________________________ Name: svn:ignore + target Property changes on: trunk/sandbox/samples/inplaceSelect-sample ___________________________________________________________________ Name: svn:ignore + target Property changes on: trunk/sandbox/ui/inplaceInput ___________________________________________________________________ Name: svn:ignore + target Property changes on: trunk/sandbox/ui/inplaceSelect ___________________________________________________________________ Name: svn:ignore + target

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6105 - trunk/sandbox/ui/inplaceSelect.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-02-15 04:04:17 -0500 (Fri, 15 Feb 2008) New Revision: 6105 Modified: trunk/sandbox/ui/inplaceSelect/pom.xml Log: Modified: trunk/sandbox/ui/inplaceSelect/pom.xml =================================================================== --- trunk/sandbox/ui/inplaceSelect/pom.xml 2008-02-15 09:02:10 UTC (rev 6104) +++ trunk/sandbox/ui/inplaceSelect/pom.xml 2008-02-15 09:04:17 UTC (rev 6105) @@ -5,7 +5,7 @@ <version>3.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>inplaceSelect</artifactId> <name>inplaceSelect</name> <version>3.2.0-SNAPSHOT</version>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6104 - trunk/sandbox/ui/inplaceSelect.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-02-15 04:02:10 -0500 (Fri, 15 Feb 2008) New Revision: 6104 Removed: trunk/sandbox/ui/inplaceSelect/target/ Log:

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6103 - trunk/sandbox/samples/inplaceSelect-sample.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-02-15 03:54:39 -0500 (Fri, 15 Feb 2008) New Revision: 6103 Modified: trunk/sandbox/samples/inplaceSelect-sample/pom.xml Log: Modified: trunk/sandbox/samples/inplaceSelect-sample/pom.xml =================================================================== --- trunk/sandbox/samples/inplaceSelect-sample/pom.xml 2008-02-15 02:56:13 UTC (rev 6102) +++ trunk/sandbox/samples/inplaceSelect-sample/pom.xml 2008-02-15 08:54:39 UTC (rev 6103) @@ -48,34 +48,6 @@ <version>3.8.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.12</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6102 - in trunk/sandbox/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/js and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-14 21:56:13 -0500 (Thu, 14 Feb 2008) New Revision: 6102 Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: in-place controls processing added Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-15 00:59:43 UTC (rev 6101) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-15 02:56:13 UTC (rev 6102) @@ -100,7 +100,7 @@ PrintWriter writer = httpResponse.getWriter(); writer - .write("<html id=\"_richfaces_file_upload_stopped\"><body><script>alert('stopped');</script></body></html>"); + .write("<html id=\"_richfaces_file_upload_stopped\"></html>"); writer.close(); } } finally { Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-15 00:59:43 UTC (rev 6101) +++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-15 02:56:13 UTC (rev 6102) @@ -1,64 +1,30 @@ -LoadWatcher = Class.create(); -Object.extend(LoadWatcher.prototype, { - initialize: function(iframe, success, failure) { - this.iframe = iframe; - this.success = success; - this.failure = failure; - - this.loadObserver = function() { - if (!this.stopped) { - this.stop(); - this.success(); - } - }.bind(this); +FileUploadEntry = {}; +FileUploadEntry = Class.create(); - Event.observe(this.iframe, 'load', this.loadObserver); - - this.interval = setInterval(function() { - if (!this.stopped) { - var loaded = false; - var error = null; +FileUploadEntry.clearControlTemplate = + new E('a', + { + 'style':'text-decoration: none; color:black', + 'onclick': function (context) { return 'var entry = FileUploadEntry.getComponent(this); entry.uploadObject.clear(entry); return false;';}, + 'className':'upload_anc', + 'href':'#' + }, + [ + new T('Clear') + ]); - try { - if (this.iframe.contentWindow && this.iframe.contentWindow.document) { - loaded = /complete/.test(this.iframe.contentWindow.document.readyState); - } - } catch (e) { - error = e; - } - - if (error) { - this.stop(); - this.failure(error); - } else if (loaded) { - this.stop(); - this.success(); - } - } - }.bind(this), 50); - }, - - stop: function() { - this.stopped = true; - - if (this.loadObserver) { - Event.stopObserving(this.iframe, 'load', this.loadObserver); - this.loadObserver = null; - } - - if (this.interval) { - clearInterval(this.interval); - this.interval = null; - } - - this.iframe = null; - } -}); +FileUploadEntry.stopControlTemplate = + new E('a', + { + 'style':'text-decoration: none; color:black', + 'onclick': function (context) { return 'FileUploadEntry.getComponent(this).uploadObject.stop(); return false;';}, + 'className':'upload_anc', + 'href':'#' + }, + [ + new T('Stop') + ]); - -FileUploadEntry = {}; -FileUploadEntry = Class.create(); - FileUploadEntry.template = [ new E('table', @@ -74,20 +40,18 @@ [ new ET(function (context) { return Richfaces.evalMacro("fileName", context)}) ]), - new E('div',{'id':'progress'}), - new E('div',{'className':'upload_name_padding'}, - [ - new ET(function (context) { return Richfaces.evalMacro("label", context)})]) - ]), + new E('div',{'id':'progress'}), + new E('div',{'className':'upload_name_padding'}, + [ + new ET(function (context) { return Richfaces.evalMacro("label", context)}) + ]) + ]), new E('td',{'style':'vertical-align: center;', 'className':'upload_table_td'}, [ - new E('div',{'className':'upload_font upload_del'}, - [ - new E('a',{'style':'text-decoration: none; color:black', 'onclick':function (context) { return 'return $(\''+Richfaces.evalMacro("clientId", context)+'\').component.confirm(\''+Richfaces.evalMacro("clientId", context)+':cconfirm'+Richfaces.evalMacro("n", context)+'\',\''+Richfaces.evalMacro("clientId", context)+':clear'+Richfaces.evalMacro("n", context)+'\');';}, 'id':function (context) { return Richfaces.evalMacro("clientId", context)+':clear'+Richfaces.evalMacro("n", context);}, 'className':'upload_anc', 'href':'#'}, - [ - new T('Clear') - ]) - ]) + new E('div',{'className':'upload_font upload_del'}, + [ + FileUploadEntry.clearControlTemplate + ]) ]), new E('td',{'className':'upload_table_td'}, [ @@ -108,25 +72,45 @@ FileUploadEntry.UPLOAD_TRANSFER_ERROR = "transfer_error"; FileUploadEntry.UPLOAD_SERVER_ERROR = "server_error"; +FileUploadEntry.LABELS = {}; +FileUploadEntry.LABELS[FileUploadEntry.INITIALIZED] = ''; +FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_IN_PROGRESS] = 'uploading'; +FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_CANCELED] = 'canceled'; +FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SUCCESS] = 'done'; +FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_TRANSFER_ERROR] = 'transfer_error'; +FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SERVER_ERROR] = 'server_error'; +FileUploadEntry.getComponent = function(elt) { + while (elt) { + var component = elt.component; + if (component) { + return component + } else { + elt = elt.parentNode; + } + } +}; + Object.extend(FileUploadEntry.prototype, { element: null, uploadObject: null, - state: null, + state: FileUploadEntry.INITIALIZED, initialize: function(element, uploadObject) { this.element = element; this.uploadObject = uploadObject; - this.setState(FileUploadEntry.INITIALIZED); - + var content = FileUploadEntry.template.invoke('getContent', {fileName: $F(this.element)}).join(''); Element.insert(this.uploadObject.items, content); this.entryElement = this.uploadObject.items.childNodes[this.uploadObject.items.childNodes.length - 1]; + this.entryElement.component = this; + this.statusLabel = this.entryElement.rows[0].cells[0].lastChild; + this.controlArea = this.entryElement.rows[0].cells[1].firstChild; }, upload: function() { @@ -136,12 +120,9 @@ stop: function() { this.uploadObject.stopScript(this.uid); - this.setState(FileUploadEntry.UPLOAD_CANCELED); }, clear: function() { - //todo review - //this.uploadObject.remove(this); this.element.parentNode.removeChild(this.element); this.entryElement.parentNode.removeChild(this.entryElement); }, @@ -149,12 +130,93 @@ setState: function(newState) { var oldState = this.state; this.state = newState; + + Element.clearChildren(this.statusLabel); + Element.clearChildren(this.controlArea); + + Element.insert(this.statusLabel, FileUploadEntry.LABELS[newState]); + + if (newState == FileUploadEntry.UPLOAD_IN_PROGRESS) { + Element.insert(this.controlArea, FileUploadEntry.stopControlTemplate.getContent()); + } else { + Element.insert(this.controlArea, FileUploadEntry.clearControlTemplate.getContent()); + } + this.uploadObject.notifyStateChange(this, oldState); } }); +LoadWatcher = Class.create(); +Object.extend(LoadWatcher.prototype, { + initialize: function(iframe, callback) { + this.iframe = iframe; + this.callback = callback; + + this.loadObserver = function() { + if (!this.stopped) { + this.stop(); + this.onload(); + } + }.bind(this); + Event.observe(this.iframe, 'load', this.loadObserver); + + this.interval = setInterval(function() { + if (!this.stopped) { + var loaded = false; + var error = null; + + try { + if (this.iframe.contentWindow && this.iframe.contentWindow.document) { + loaded = /complete/.test(this.iframe.contentWindow.document.readyState); + } + } catch (e) { + error = e; + } + + if (error) { + this.stop(); + this.onload(); + } else if (loaded) { + this.stop(); + this.onerror(); + } + } + }.bind(this), 200); + }, + + onerror: function() { + this.callback(FileUploadEntry.UPLOAD_TRANSFER_ERROR); + }, + + onload: function() { + var iframeDocument = this.iframe.contentWindow.document; + var elt = iframeDocument.getElementById('_richfaces_file_upload_stopped'); + if (elt) { + this.callback(FileUploadEntry.UPLOAD_CANCELED); + } else { + //TODO handle server internal errors, etc. + this.callback(FileUploadEntry.UPLOAD_SUCCESS); + } + }, + + stop: function() { + this.stopped = true; + + if (this.loadObserver) { + Event.stopObserving(this.iframe, 'load', this.loadObserver); + this.loadObserver = null; + } + + if (this.interval) { + clearInterval(this.interval); + this.interval = null; + } + } +}); + + FileUpload1 = {}; FileUpload1 = Class.create(); @@ -245,16 +307,23 @@ this.activeEntry.stop(); } }, - - clear: function() { - for (var i = 0; i < this.entries.length; i++) { - var entry = this.entries[i]; - if (entry.state != FileUploadEntry.UPLOAD_IN_PROGRESS) { - this.entries.splice(i--, 1); - entry.clear(); + + clear: function(entry) { + if (entry) { + this.remove(entry); + entry.clear(); + } else { + //this.entries.length should be evaluated every time! + for (var i = 0; i < this.entries.length; i++) { + var entry = this.entries[i]; + if (entry.state != FileUploadEntry.UPLOAD_IN_PROGRESS) { + this.remove(entry); + i--; + entry.clear(); + } } } - + if (this.entries.length == 0) { this.setupAutoUpload(); } @@ -305,8 +374,6 @@ this.progressBar.setValue(0); this.progressBar.enable(); - } else if (newState == FileUploadEntry.INITIALIZED) { - // } }, @@ -347,16 +414,9 @@ if (!parentForm.onsubmit || parentForm.onsubmit()) { var iframe = this.iframe; - new LoadWatcher(iframe, - function(){ - alert('ready'); - this.setState(FileUploadEntry.UPLOAD_SUCCESS); - }.bind(entry), - - function(e) { - alert('error! ' + e.message); - } - ); + new LoadWatcher(iframe, function(newState) { + this.setState(newState); + }.bind(entry)); parentForm.submit(); }

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6101 - trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-14 19:59:43 -0500 (Thu, 14 Feb 2008) New Revision: 6101 Added: trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/SleepDemoFilter.java Log: latest changes for file upload Added: trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/SleepDemoFilter.java =================================================================== --- trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/SleepDemoFilter.java (rev 0) +++ trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/SleepDemoFilter.java 2008-02-15 00:59:43 UTC (rev 6101) @@ -0,0 +1,95 @@ +package org.richfaces; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +public class SleepDemoFilter implements Filter { + + public void destroy() { + // TODO Auto-generated method stub + + } + + public void doFilter(ServletRequest servletRequest, final ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + if (servletRequest.getContentType() != null && servletRequest.getContentType().startsWith("multipart/")) { + chain.doFilter(new HttpServletRequestWrapper((HttpServletRequest) servletRequest) { + @Override + public ServletInputStream getInputStream() throws IOException { + final ServletInputStream is = super.getInputStream(); + final int sleepTime = 10; + return new ServletInputStream() { + + @Override + public int read() throws IOException { + try { + Thread.sleep(sleepTime); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return is.read(); + } + + @Override + public int read(byte[] b) throws IOException { + try { + Thread.sleep(sleepTime); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + // TODO Auto-generated method stub + return is.read(b); + } + + @Override + public int read(byte[] b, int off, int len) + throws IOException { + try { + Thread.sleep(sleepTime); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + // TODO Auto-generated method stub + return is.read(b, off, len); + } + + @Override + public int readLine(byte[] b, int off, int len) + throws IOException { + try { + Thread.sleep(sleepTime); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + // TODO Auto-generated method stub + return is.readLine(b, off, len); + } + + }; + } + }, response); + } else { + chain.doFilter(servletRequest, response); + } + } + + public void init(FilterConfig filterConfig) throws ServletException { + // TODO Auto-generated method stub + + } + +}

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6100 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/web and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-14 19:46:21 -0500 (Thu, 14 Feb 2008) New Revision: 6100 Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx Log: latest changes for file upload Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-15 00:46:11 UTC (rev 6099) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-15 00:46:21 UTC (rev 6100) @@ -1,15 +1,11 @@ package org.richfaces.org.jboss.seam.ui.renderkit; import java.io.IOException; -import java.io.InputStream; import java.io.Writer; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Map; import javax.el.ValueExpression; @@ -17,8 +13,6 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.ajax4jsf.context.AjaxContext; @@ -26,11 +20,8 @@ import org.ajax4jsf.event.AjaxEvent; import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.ajax4jsf.renderkit.ComponentVariables; -import org.ajax4jsf.renderkit.ComponentsVariableResolver; -import org.ajax4jsf.renderkit.RendererUtils; -import org.apache.commons.digester.SetRootRule; import org.richfaces.component.UIProgressBar; import org.richfaces.org.jboss.seam.ui.component.FileItem; import org.richfaces.org.jboss.seam.ui.component.ProgressData; @@ -38,8 +29,6 @@ import org.richfaces.org.jboss.seam.web.MultipartRequest; import org.richfaces.renderkit.TemplateEncoderRendererBase; -import sun.security.action.GetLongAction; - /** * Class provides base renderer for upload file component * @author "Andrey Markavtsov" @@ -367,6 +356,22 @@ return name.replaceAll("[\\\\]{1}", "\\\\\\\\"); } + public String getStopScript(FacesContext context, UIComponent component) + throws IOException { + + JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(component, context); + Map options = AjaxRendererUtils.buildEventOptions(context, component); + ((Map) options.get("parameters")).put("action", "stop"); + ((Map) options.get("parameters")).put("uid", new JSReference("uid")); + ajaxFunction.addParameter(options); + + JSFunctionDefinition function = new JSFunctionDefinition("uid"); + function.addParameter("event"); + function.addToBody(ajaxFunction.toScript()); + + return function.toScript(); + } + public void encodeInitialScript(FacesContext context, UIComponent component) throws IOException { Writer writer = context.getResponseWriter(); @@ -411,25 +416,25 @@ public void encodeUpdateButtonScript(FacesContext context, UIComponent component) throws IOException { - UIFileUpload fileUpload = (UIFileUpload) component; - String cliendId = fileUpload.getClientId(context); - Writer writer = context.getResponseWriter(); - - StringBuffer buffer = new StringBuffer(); - buffer.append(getJSScriptStart(cliendId)); - boolean hasFileInProgress = fileUpload.hasFilesInProgress(); - buffer.append(".updateUploadButton(").append(hasFileInProgress) - .append(",") - .append(hasFileInProgress ? false : !fileUpload.isCanUploadAll()) - .append(");\n"); - - buffer.append(getJSScriptStart(cliendId)).append(".updateAddButton(") - .append(!fileUpload.isCanAdd()).append(");\n"); - - buffer.append(getJSScriptStart(cliendId)).append(".updateCleanButton(") - .append(!fileUpload.isCanCleanAll()).append(");\n"); - - writer.write(buffer.toString()); +// UIFileUpload fileUpload = (UIFileUpload) component; +// String cliendId = fileUpload.getClientId(context); +// Writer writer = context.getResponseWriter(); +// +// StringBuffer buffer = new StringBuffer(); +// buffer.append(getJSScriptStart(cliendId)); +// boolean hasFileInProgress = fileUpload.hasFilesInProgress(); +// buffer.append(".updateUploadButton(").append(hasFileInProgress) +// .append(",") +// .append(hasFileInProgress ? false : !fileUpload.isCanUploadAll()) +// .append(");\n"); +// +// buffer.append(getJSScriptStart(cliendId)).append(".updateAddButton(") +// .append(!fileUpload.isCanAdd()).append(");\n"); +// +// buffer.append(getJSScriptStart(cliendId)).append(".updateCleanButton(") +// .append(!fileUpload.isCanCleanAll()).append(");\n"); +// +// writer.write(buffer.toString()); } @@ -488,12 +493,13 @@ } } - public void renderProgress(FacesContext context, UIComponent component, - FileItem item) throws IOException { - if (item.getStatus() == FileItem.Status.IN_PROGRESS) { + public String getProgressBarId(FacesContext context, UIComponent component) throws IOException { + return getProgressBar(context, component).getClientId(context); + } + + public void renderProgress(FacesContext context, UIComponent component) throws IOException { UIComponent progressBar = getProgressBar(context, component); renderChild(context, progressBar); - } } public boolean isCanClear (FileItem item) { Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-15 00:46:11 UTC (rev 6099) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-15 00:46:21 UTC (rev 6100) @@ -1,6 +1,10 @@ package org.richfaces.org.jboss.seam.web; import java.io.IOException; +import java.io.PrintWriter; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -10,6 +14,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; /** * A filter for decoding multipart requests, for @@ -57,26 +62,73 @@ this.maxRequestSize = maxFileSize; } - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException - { - if (!(response instanceof HttpServletResponse)) - { - chain.doFilter(request, response); - return; - } + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + if (!(response instanceof HttpServletResponse)) { + chain.doFilter(request, response); + return; + } - HttpServletRequest httpRequest = (HttpServletRequest) request; - if (isMultipartRequest(httpRequest)) - { - chain.doFilter(new MultipartRequest(httpRequest, createTempFiles, - maxRequestSize), response); - } - else - { - chain.doFilter(request, response); - } - } + HttpServletRequest httpRequest = (HttpServletRequest) request; + String uid = httpRequest.getParameter("uid"); + if (isMultipartRequest(httpRequest)) { + MultipartRequest multipartRequest = new MultipartRequest( + httpRequest, createTempFiles, maxRequestSize); + + Map<String, MultipartRequest> sessionsMap = null; + try { + HttpSession session = httpRequest.getSession(); + synchronized (session) { + sessionsMap = (Map<String, MultipartRequest>) session + .getAttribute("_richfaces_upload_sessions"); + if (sessionsMap == null) { + sessionsMap = Collections.synchronizedMap(new HashMap<String, MultipartRequest>()); + session.setAttribute( + "_richfaces_upload_sessions", sessionsMap); + } + } + + sessionsMap.put(uid, multipartRequest); + + if (multipartRequest.parseRequest()) { + chain.doFilter(multipartRequest, response); + } else { + // TODO + HttpServletResponse httpResponse = (HttpServletResponse) response; + httpResponse.setStatus(HttpServletResponse.SC_OK); + httpResponse.setContentType("text/html"); + + PrintWriter writer = httpResponse.getWriter(); + writer + .write("<html id=\"_richfaces_file_upload_stopped\"><body><script>alert('stopped');</script></body></html>"); + writer.close(); + } + } finally { + if (sessionsMap != null) { + sessionsMap.remove(uid); + } + } + } else { + if ("stop".equals(httpRequest.getParameter("action"))) { + HttpSession session = httpRequest.getSession(); + Map<String, MultipartRequest> sessions = (Map<String, MultipartRequest>) session + .getAttribute("_richfaces_upload_sessions"); + + if (sessions != null) { + MultipartRequest multipartRequest = sessions.get(uid); + if (multipartRequest != null) { + multipartRequest.stop(); + } + } + + HttpServletResponse httpResponse = (HttpServletResponse) response; + httpResponse.setStatus(HttpServletResponse.SC_NO_CONTENT); + httpResponse.getOutputStream().close(); + } else { + chain.doFilter(request, response); + } + } + } private boolean isMultipartRequest(HttpServletRequest request) { Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-15 00:46:11 UTC (rev 6099) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-15 00:46:21 UTC (rev 6100) @@ -241,6 +241,7 @@ private long time; private ProgressData progressData = null; + private boolean shouldStop = false; public MultipartRequest(HttpServletRequest request, boolean createTempFiles, int maxRequestSize) { @@ -277,142 +278,152 @@ return fileName; } - private void parseRequest() { - byte[] boundaryMarker = getBoundaryMarker(request.getContentType()); - if (boundaryMarker == null) { - throw new FileUploadException("The request was rejected because " - + "no multipart boundary was found"); - } + public boolean parseRequest() { + byte[] boundaryMarker = getBoundaryMarker(request.getContentType()); + if (boundaryMarker == null) { + throw new FileUploadException("The request was rejected because " + + "no multipart boundary was found"); + } - encoding = request.getCharacterEncoding(); + encoding = request.getCharacterEncoding(); - parameters = new HashMap<String, Param>(); + parameters = new HashMap<String, Param>(); - try { - byte[] buffer = new byte[BUFFER_SIZE]; - Map<String, String> headers = new HashMap<String, String>(); + try { + byte[] buffer = new byte[BUFFER_SIZE]; + Map<String, String> headers = new HashMap<String, String>(); - ReadState readState = ReadState.BOUNDARY; + ReadState readState = ReadState.BOUNDARY; - InputStream input = request.getInputStream(); - int read = input.read(buffer); - int pos = 0; + InputStream input = request.getInputStream(); + if (!shouldStop) { - Param p = null; + int read = input.read(buffer); + int pos = 0; - while (read != -1) { - for (int i = 0; i < read; i++) { - switch (readState) { - case BOUNDARY: { - if (checkSequence(buffer, i, boundaryMarker) - && checkSequence(buffer, i + 2, CR_LF)) { - readState = ReadState.HEADERS; - i += 2; - pos = i + 1; + Param p = null; - } - break; - } - case HEADERS: { - if (checkSequence(buffer, i, CR_LF)) { - String param = (encoding == null) ? new String( - buffer, pos, i - pos - 1) : new String( - buffer, pos, i - pos - 1, encoding); - parseParams(param, "; ", headers); + while (read != -1) { + for (int i = 0; i < read; i++) { + switch (readState) { + case BOUNDARY: { + if (checkSequence(buffer, i, boundaryMarker) + && checkSequence(buffer, i + 2, CR_LF)) { + readState = ReadState.HEADERS; + i += 2; + pos = i + 1; - if (checkSequence(buffer, i + CR_LF.length, CR_LF)) { - readState = ReadState.DATA; - i += CR_LF.length; - pos = i + 1; + } + break; + } + case HEADERS: { + if (checkSequence(buffer, i, CR_LF)) { + String param = (encoding == null) ? new String( + buffer, pos, i - pos - 1) : new String( + buffer, pos, i - pos - 1, encoding); + parseParams(param, "; ", headers); - String paramName = headers.get(PARAM_NAME); - if (paramName != null) { - if (headers.containsKey(PARAM_FILENAME)) { - FileParam fp = new FileParam(paramName); - if (createTempFiles) - fp.createTempFile(); - fp.setContentType(headers - .get(PARAM_CONTENT_TYPE)); - fp.setFilename(decodeFileName(headers - .get(PARAM_FILENAME))); - p = fp; - } else { - if (parameters.containsKey(paramName)) { - p = parameters.get(paramName); - } else { - p = new ValueParam(paramName); - } - } + if (checkSequence(buffer, i + CR_LF.length, CR_LF)) { + readState = ReadState.DATA; + i += CR_LF.length; + pos = i + 1; - if (!parameters.containsKey(paramName)) { - parameters.put(paramName, p); - } - } + String paramName = headers.get(PARAM_NAME); + if (paramName != null) { + if (headers.containsKey(PARAM_FILENAME)) { + FileParam fp = new FileParam(paramName); + if (createTempFiles) + fp.createTempFile(); + fp.setContentType(headers + .get(PARAM_CONTENT_TYPE)); + fp.setFilename(decodeFileName(headers + .get(PARAM_FILENAME))); + p = fp; + } else { + if (parameters.containsKey(paramName)) { + p = parameters.get(paramName); + } else { + p = new ValueParam(paramName); + } + } - headers.clear(); - } else { - pos = i + 1; - } - } - break; - } - case DATA: { - // If we've encountered another boundary... - if (checkSequence(buffer, i - boundaryMarker.length - - CR_LF.length, CR_LF) - && checkSequence(buffer, i, boundaryMarker)) { - // Write any data before the boundary (that hasn't - // already been written) to the param - if (pos < i - boundaryMarker.length - CR_LF.length - - 1) { - p.appendData(buffer, pos, i - pos - - boundaryMarker.length - CR_LF.length - - 1); - } + if (!parameters.containsKey(paramName)) { + parameters.put(paramName, p); + } + } - if (p instanceof ValueParam) - ((ValueParam) p).complete(); + headers.clear(); + } else { + pos = i + 1; + } + } + break; + } + case DATA: { + // If we've encountered another boundary... + if (checkSequence(buffer, i - boundaryMarker.length + - CR_LF.length, CR_LF) + && checkSequence(buffer, i, boundaryMarker)) { + // Write any data before the boundary (that hasn't + // already been written) to the param + if (pos < i - boundaryMarker.length - CR_LF.length + - 1) { + p.appendData(buffer, pos, i - pos + - boundaryMarker.length - CR_LF.length + - 1); + } - if (checkSequence(buffer, i + CR_LF.length, CR_LF)) { - i += CR_LF.length; - pos = i + 1; - } else { - pos = i; - } + if (p instanceof ValueParam) + ((ValueParam) p).complete(); - readState = ReadState.HEADERS; - } - // Otherwise write whatever data we have to the param - else if (i > (pos + boundaryMarker.length + CHUNK_SIZE + CR_LF.length)) { - p.appendData(buffer, pos, CHUNK_SIZE); - pos += CHUNK_SIZE; + if (checkSequence(buffer, i + CR_LF.length, CR_LF)) { + i += CR_LF.length; + pos = i + 1; + } else { + pos = i; + } - } - break; - } - } - } + readState = ReadState.HEADERS; + } + // Otherwise write whatever data we have to the param + else if (i > (pos + boundaryMarker.length + CHUNK_SIZE + CR_LF.length)) { + p.appendData(buffer, pos, CHUNK_SIZE); + pos += CHUNK_SIZE; - if (pos < read) { - // move the bytes that weren't read to the start of the - // buffer - int bytesNotRead = read - pos; - System.arraycopy(buffer, pos, buffer, 0, bytesNotRead); - read = input.read(buffer, bytesNotRead, buffer.length - - bytesNotRead); - read += bytesNotRead; - } else { - read = input.read(buffer); - } - this.read += pos; - pos = 0; - fillProgressInfo(); + } + break; + } + } + } - } - } catch (IOException ex) { - throw new FileUploadException("IO Error parsing multipart request", - ex); - } + if (!shouldStop) { + if (pos < read) { + // move the bytes that weren't read to the start of the + // buffer + int bytesNotRead = read - pos; + System.arraycopy(buffer, pos, buffer, 0, bytesNotRead); + read = input.read(buffer, bytesNotRead, buffer.length + - bytesNotRead); + read += bytesNotRead; + } else { + read = input.read(buffer); + } + this.read += pos; + pos = 0; + fillProgressInfo(); + } else { + return false; + } + } + + return true; + } else { + return false; + } + } catch (IOException ex) { + throw new FileUploadException("IO Error parsing multipart request", + ex); + } } private ProgressData getProgressData () { @@ -626,4 +637,8 @@ return params; } + + public void stop() { + shouldStop = true; + } } Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-02-15 00:46:11 UTC (rev 6099) +++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-02-15 00:46:21 UTC (rev 6100) @@ -23,6 +23,10 @@ .upload_toolbar_decor{ background : #EAF0F8 /*additionalBackgroundColor*/;border-bottom:1px solid #c0c0c0 /*tableBorderColor*/;border-top:1px solid #FFFFFF /*tableBackgroundColor*/;border-left:1px solid #FFFFFF /*tableBackgroundColor*/;padding : 2px} +input[type="file"][class~="hidden"]::-webkit-file-upload-button { + font-size: 10em; + -webkit-appearance: button; +} .upload_button_border{ border : 1px solid #C0C0C0; /*tableBorderColor*/ Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-15 00:46:11 UTC (rev 6099) +++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-15 00:46:21 UTC (rev 6100) @@ -1,3 +1,385 @@ +LoadWatcher = Class.create(); +Object.extend(LoadWatcher.prototype, { + initialize: function(iframe, success, failure) { + this.iframe = iframe; + this.success = success; + this.failure = failure; + + this.loadObserver = function() { + if (!this.stopped) { + this.stop(); + this.success(); + } + }.bind(this); + + Event.observe(this.iframe, 'load', this.loadObserver); + + this.interval = setInterval(function() { + if (!this.stopped) { + var loaded = false; + var error = null; + + try { + if (this.iframe.contentWindow && this.iframe.contentWindow.document) { + loaded = /complete/.test(this.iframe.contentWindow.document.readyState); + } + } catch (e) { + error = e; + } + + if (error) { + this.stop(); + this.failure(error); + } else if (loaded) { + this.stop(); + this.success(); + } + } + }.bind(this), 50); + }, + + stop: function() { + this.stopped = true; + + if (this.loadObserver) { + Event.stopObserving(this.iframe, 'load', this.loadObserver); + this.loadObserver = null; + } + + if (this.interval) { + clearInterval(this.interval); + this.interval = null; + } + + this.iframe = null; + } +}); + + +FileUploadEntry = {}; +FileUploadEntry = Class.create(); + +FileUploadEntry.template = + [ + new E('table', + {'cellspacing':'0', 'cellpadding':'0', 'border':'0'}, + [ + new E('tbody',{}, + [ + new E('tr',{}, + [ + new E('td',{'className':'upload_font upload_name upload_table_td'}, + [ + new E('div',{'className':'upload_name_padding'}, + [ + new ET(function (context) { return Richfaces.evalMacro("fileName", context)}) + ]), + new E('div',{'id':'progress'}), + new E('div',{'className':'upload_name_padding'}, + [ + new ET(function (context) { return Richfaces.evalMacro("label", context)})]) + ]), + new E('td',{'style':'vertical-align: center;', 'className':'upload_table_td'}, + [ + new E('div',{'className':'upload_font upload_del'}, + [ + new E('a',{'style':'text-decoration: none; color:black', 'onclick':function (context) { return 'return $(\''+Richfaces.evalMacro("clientId", context)+'\').component.confirm(\''+Richfaces.evalMacro("clientId", context)+':cconfirm'+Richfaces.evalMacro("n", context)+'\',\''+Richfaces.evalMacro("clientId", context)+':clear'+Richfaces.evalMacro("n", context)+'\');';}, 'id':function (context) { return Richfaces.evalMacro("clientId", context)+':clear'+Richfaces.evalMacro("n", context);}, 'className':'upload_anc', 'href':'#'}, + [ + new T('Clear') + ]) + ]) + ]), + new E('td',{'className':'upload_table_td'}, + [ + new E('div',{'className':'upload_font upload_scroll'}) + ]) + ]) + ]) + ]) + ]; + + +FileUploadEntry.INITIALIZED = "initialized"; + +FileUploadEntry.UPLOAD_IN_PROGRESS = "progress"; + +FileUploadEntry.UPLOAD_CANCELED = "canceled"; +FileUploadEntry.UPLOAD_SUCCESS = "success"; +FileUploadEntry.UPLOAD_TRANSFER_ERROR = "transfer_error"; +FileUploadEntry.UPLOAD_SERVER_ERROR = "server_error"; + + +Object.extend(FileUploadEntry.prototype, { + + element: null, + + uploadObject: null, + + state: null, + + initialize: function(element, uploadObject) { + this.element = element; + this.uploadObject = uploadObject; + this.setState(FileUploadEntry.INITIALIZED); + + var content = FileUploadEntry.template.invoke('getContent', {fileName: $F(this.element)}).join(''); + + Element.insert(this.uploadObject.items, content); + + this.entryElement = this.uploadObject.items.childNodes[this.uploadObject.items.childNodes.length - 1]; + }, + + upload: function() { + this.setState(FileUploadEntry.UPLOAD_IN_PROGRESS); + this.uploadObject.submitForm(this); + }, + + stop: function() { + this.uploadObject.stopScript(this.uid); + this.setState(FileUploadEntry.UPLOAD_CANCELED); + }, + + clear: function() { + //todo review + //this.uploadObject.remove(this); + this.element.parentNode.removeChild(this.element); + this.entryElement.parentNode.removeChild(this.entryElement); + }, + + setState: function(newState) { + var oldState = this.state; + this.state = newState; + this.uploadObject.notifyStateChange(this, oldState); + } + +}); + + +FileUpload1 = {}; +FileUpload1 = Class.create(); + +Object.extend(FileUpload1.prototype, { + + idCounter: 0, + + progressBar: null, + + iframe: null, + + element: null, + + entries: new Array(), + + activeEntry: null, + + options: null, + + runUpload: false, + + initialize: function(id, stopScript, progressBarId, options) { + this.id = id; + this.element = $(this.id); + this.progressBar = $(progressBarId).component; + + this.element.component = this; + + this.stopScript = stopScript; + + this.iframe = $(this.id + "_iframe"); + this.items = $(this.id + ":fileItems"); + this.options = options || {}; + + this.setupAutoUpload(); + }, + + setupAutoUpload: function() { + this.runUpload = this.options.autoUpload; + }, + + add: function(elt) { + this.entries.push(new FileUploadEntry(elt, this)); + + var newUpload = elt.cloneNode(true); + newUpload.id = this.id + ":file" + (this.idCounter++); + $(this.id + ":add1").appendChild(newUpload); + + if (this.runUpload) { + this.upload(); + } + }, + + remove: function(entry) { + this.entries = this.entries.without(entry); + }, + + _selectEntryForUpload: function() { + var l = this.entries.length; + for (var i = 0; i < l; i++) { + var entry = this.entries[i]; + if (entry.state != FileUploadEntry.UPLOAD_SUCCESS) { + + return entry; + } + } + + return null; + }, + + upload: function() { + this.runUpload = true; + + if (!this.activeEntry) { + //no upload is being run now + + var entry = this._selectEntryForUpload(); + if (entry) { + entry.upload(); + } + } + }, + + stop: function() { + this.runUpload = false; + + if (this.activeEntry) { + this.activeEntry.stop(); + } + }, + + clear: function() { + for (var i = 0; i < this.entries.length; i++) { + var entry = this.entries[i]; + if (entry.state != FileUploadEntry.UPLOAD_IN_PROGRESS) { + this.entries.splice(i--, 1); + entry.clear(); + } + } + + if (this.entries.length == 0) { + this.setupAutoUpload(); + } + }, + + _endUpload: function() { + this.activeEntry = null; + this.progressBar.setValue(0); + this.progressBar.disable(); + }, + + notifyStateChange: function(entry, oldState) { + var newState = entry.state; + + if (newState == FileUploadEntry.UPLOAD_SUCCESS) { + //todo clear completed + + //if (this.activeEntry) { + // this.activeEntry.clear(); + //} + + this._endUpload(); + + var entry = this._selectEntryForUpload(); + if (entry) { + if (this.runUpload) { + entry.upload(); + } + } else { + //we've uploaded all files sucessfully + //but this.runUpload can be false if upload + //has been requested to stop by user + this.setupAutoUpload(); + } + + } else if (newState == FileUploadEntry.UPLOAD_CANCELED || + newState == FileUploadEntry.UPLOAD_TRANSFER_ERROR || + newState == FileUploadEntry.UPLOAD_SERVER_ERROR) { + + + this._endUpload(); + + this.runUpload = false; + + } else if (newState == FileUploadEntry.UPLOAD_IN_PROGRESS) { + + this.activeEntry = entry; + this.progressBar.setValue(0); + this.progressBar.enable(); + + } else if (newState == FileUploadEntry.INITIALIZED) { + // + } + }, + + submitForm: function(entry) { + var parentForm = this.element; + while (parentForm.tagName && parentForm.tagName.toLowerCase() != 'form') { + parentForm = parentForm.parentNode; + } + + if (!parentForm) { + throw "No parent form found!"; + } + + entry.uid = encodeURIComponent(Math.random().toString()); + + var oldTarget = parentForm.target; + var oldEnctype = parentForm.enctype; + var oldEncoding = parentForm.encoding; + var oldAction = parentForm.action; + + parentForm.encoding = "multipart/form-data"; + parentForm.enctype = "multipart/form-data"; + parentForm.target = this.id; + parentForm.action = oldAction + (/\?/.test(oldAction) ? '&uid' : '?uid') + '=' + encodeURI(entry.uid); + + try { + var inputs = parentForm.elements; + var entryInput = entry.element; + + var l = inputs.length; + for (var i = 0; i < l; i++) { + var input = inputs[i]; + if ('hidden' != input.type && input != entryInput) { + input._name = input.name; + input.name = undefined; + } + } + + if (!parentForm.onsubmit || parentForm.onsubmit()) { + var iframe = this.iframe; + new LoadWatcher(iframe, + function(){ + alert('ready'); + this.setState(FileUploadEntry.UPLOAD_SUCCESS); + }.bind(entry), + + function(e) { + alert('error! ' + e.message); + } + ); + + parentForm.submit(); + } + + for (var i = 0; i < l; i++) { + var input = inputs[i]; + if ('hidden' != input.type && input != entryInput) { + if (input._name) { + input.name = input._name; + input._name = undefined; + } + } + } + } finally { + parentForm.action = oldAction; + parentForm.target = oldTarget; + parentForm.encoding = oldEncoding; + parentForm.enctype = oldEnctype; + } + } + +}); + FileUpload = {}; FileUpload = Class.create(); FileUpload.Uploaders = {}; @@ -47,13 +429,19 @@ var d = $(this.id + ":upload1"); var l = $(this.id + ":upload2"); if (d && l) { - var label = (isCancel) ? "<b>Cancel</b>" : "<b>Upload</b>"; - if (isCancel) { - l.innerHTML = label; + var cancelButton = Element.firstDescendant(l); + var uploadButton = cancelButton.next(); + + if (isCancel) { + cancelButton.show(); + uploadButton.hide(); + this.updateButton(d,l,this.cancelStyle,this.cancelStyleDisabled,"start",disabled); d.onclick = function () { this.stopAll(); }.bind(this); }else { - l.innerHTML = label; + uploadButton.show(); + cancelButton.hide(); + this.updateButton(d,l,this.uploadStyle,this.uploadStyleDisabled,"start",disabled); d.onclick = function () { this.uploadAll(); }.bind(this); } @@ -205,7 +593,7 @@ }.bind(this); - document.body.appendChild(fr); + document.body.insertBefore(fr, null); var f = document.createElement("form"); f.enctype = "multipart/form-data"; @@ -214,8 +602,6 @@ f.id = this.id + ":f"; f.target = this.id + ":fr"; - document.body.appendChild(f); - var d = document.createElement("div"); d.id = this.id + ":files"; f.appendChild(d); @@ -226,6 +612,7 @@ d.value = d.name; f.appendChild(d); + document.body.insertBefore(f, null); //-- }, getFilesCount: function () { Modified: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-15 00:46:11 UTC (rev 6099) +++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-15 00:46:21 UTC (rev 6100) @@ -17,52 +17,79 @@ /org/richfaces/renderkit/html/scripts/utils.js, /org/richfaces/renderkit/html/scripts/json/json-dom.js, /org/richfaces/renderkit/html/js/FileUpload.js, - /org/richfaces/renderkit/html/js/progressBar.js, + /org/richfaces/renderkit/html/js/progressBar.js </h:scripts> <f:clientId var="clientId" /> <div class="upload_list_width upload_list_decor" id="#{clientId}"> + <iframe name="#{clientId}" id="#{clientId}_iframe" /> <span style="display: none"> <script type="text/javascript"> - <f:call name="encodeInitialScript" /> + /**/ </script> </span> + <jsp:scriptlet> + <![CDATA[ + renderProgress(context, component); + ]]> + </jsp:scriptlet> + <table class="upload_toolbar_decor"> <tr> <td> <div class="upload_button_border" style=" float:left;"> <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'" onmouseout="this.className='upload_button upload_font'" - style="position: relative; overflow: hidden; direction: rtl; width:70px" + style="position: relative; overflow: hidden; width:70px" id="#{clientId}:add1"> <div class="upload_button_content upload_font upload_ico upload_ico_add" - id="#{clientId}:add2">Add...</div> - <input type="file" style="cursor: pointer; z-index: 3; width: 0px; height: 22px; left: 0px; top: 0px; position: absolute" + id="#{clientId}:add2" style="direction: rtl;">Add...</div> + <input type="file" style="cursor: pointer; z-index: 3; right: -10px; top: -10px; font-size: 10em; position: absolute" class="hidden" id="#{clientId}:file" name="fileName" - onchange="return $('#{clientId}').component.add();"/> + onchange="return $('#{clientId}').component.add(this);"/> </div> </div> <div class="upload_button_border" style=" float:left;"> <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'" onmouseout="this.className='upload_button upload_font'" id="#{clientId}:upload1" - onclick="return $('#{clientId}').component.uploadAll();"> + onclick="return $('#{clientId}').component.upload();"> <a href="#" class="upload_button_selection"> <div class="upload_button_content upload_font upload_ico upload_ico_start" id="#{clientId}:upload2"> + <b style="display: none;">Cancel</b> <b>Upload</b> </div> </a> </div> </div> + +  + + <div class="upload_button_border" style=" float:left;"> + <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'" + onmouseout="this.className='upload_button upload_font'" + id="#{clientId}:upload3" + onclick="return $('#{clientId}').component.stop();"> + <a href="#" class="upload_button_selection"> + <div class="upload_button_content upload_font upload_ico upload_ico_start" + id="#{clientId}:upload4"> + <b>Stop</b> + </div> + </a> + </div> + </div> + +  + <div class="upload_button_border" style=" float:right"> <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'" onmouseout="this.className='upload_button upload_font'" - onclick="return $('#{clientId}').component.cleanAll();" + onclick="return $('#{clientId}').component.clear();" id="#{clientId}:clean1"> <a href="#" class="upload_button_selection"> <div class="upload_button_content upload_font upload_ico upload_ico_clear" @@ -76,7 +103,7 @@ <div class="upload_list_width upload_list_overflow" id="#{clientId}:fileItems"> - <jsp:scriptlet> +  </div> <span> <script type="text/javascript"> - <f:call name="encodeUpdateButtonScript" /> + new FileUpload1('#{clientId}', #{this:getStopScript(context, component)}, '#{this:getProgressBarId(context, component)}'); + /**/ </script> </span> </div> -</f:root> \ No newline at end of file +</f:root> + \ No newline at end of file

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6099 - in trunk/sandbox/samples/fileUploadDemo/src/main: webapp/WEB-INF and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-14 19:46:11 -0500 (Thu, 14 Feb 2008) New Revision: 6099 Modified: trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java trunk/sandbox/samples/fileUploadDemo/src/main/webapp/WEB-INF/web.xml trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp Log: latest changes for file upload Modified: trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java =================================================================== --- trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java 2008-02-14 18:35:32 UTC (rev 6098) +++ trunk/sandbox/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java 2008-02-15 00:46:11 UTC (rev 6099) @@ -36,6 +36,17 @@ private Map<String,InputStream> data = new HashMap<String, InputStream>(); + private boolean flag; + + public boolean isFlag() { + return flag; + } + + public void setFlag(boolean flag) { + System.out.println(flag); + this.flag = flag; + } + public void action(ActionEvent event) { try { if (data != null) { Modified: trunk/sandbox/samples/fileUploadDemo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox/samples/fileUploadDemo/src/main/webapp/WEB-INF/web.xml 2008-02-14 18:35:32 UTC (rev 6098) +++ trunk/sandbox/samples/fileUploadDemo/src/main/webapp/WEB-INF/web.xml 2008-02-15 00:46:11 UTC (rev 6099) @@ -8,7 +8,7 @@ </context-param> <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> + <param-value>client</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> @@ -37,7 +37,22 @@ </init-param> </filter> + <filter> + <display-name>Sleep Filter</display-name> + <filter-name>sleepFilter</filter-name> + <filter-class>org.richfaces.SleepDemoFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>sleepFilter</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + + <filter-mapping> <filter-name>fileUpload</filter-name> <servlet-name>Faces Servlet</servlet-name> <dispatcher>REQUEST</dispatcher> Modified: trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-02-14 18:35:32 UTC (rev 6098) +++ trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-02-15 00:46:11 UTC (rev 6099) @@ -11,9 +11,18 @@ <body> <f:view> <h:form> + <h:selectOneRadio> + <f:selectItem itemLabel="1" itemValue="1"/> + <f:selectItem itemLabel="2" itemValue="2"/> + </h:selectOneRadio> + + <h:selectBooleanCheckbox value="#{bean.flag}" id="boolean" /> + + <h:messages /> + <fu:fileUpload data="#{bean.data}" progressInfo="info"> <f:facet name="progress"> - <progressBar:progressBar style="height: 10px; width: 300px;" maxValue="101" minValue="-1"> + <progressBar:progressBar style="height: 10px; width: 300px;" enabled="false"> </progressBar:progressBar> </f:facet> <f:facet name="progressLabel">

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6098 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: vsukhov Date: 2008-02-14 13:35:32 -0500 (Thu, 14 Feb 2008) New Revision: 6098 Added: trunk/docs/userguide/en/src/main/resources/images/comboBox1.png trunk/docs/userguide/en/src/main/resources/images/comboBox2.png trunk/docs/userguide/en/src/main/resources/images/comboBox3.png trunk/docs/userguide/en/src/main/resources/images/comboBox4.png Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml trunk/docs/userguide/en/src/main/docbook/included/effect.xml trunk/docs/userguide/en/src/main/docbook/included/panel.xml Log: RF-1216 Done screenshots describing directInputSuggestions,selectFirstOnUpdate attributes and Style classes. Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml 2008-02-14 17:56:46 UTC (rev 6097) +++ trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml 2008-02-14 18:35:32 UTC (rev 6098) @@ -24,11 +24,10 @@ <title>Key Features</title> <itemizedlist> <listitem>Highly customizable look and feel</listitem> - <listitem>Plain skin support</listitem> <listitem>Browser like selection</listitem> <listitem>Smart user-defined positioning</listitem> <listitem>Multicolumn suggestion popup list</listitem> -  <listitem>Seam entity converter support</listitem> Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-02-14 17:56:46 UTC (rev 6097) +++ trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-02-14 18:35:32 UTC (rev 6098) @@ -43,7 +43,7 @@ </table> <section> <title>Creating the Component with a Page Tag</title> - <para>To create the simplest variant on a page use the following syntax:</para> + <para>Here is a simple example as it could be used on a page: </para> <para> <emphasis role="bold">Example:</emphasis> </para> @@ -68,7 +68,7 @@ <para>The <emphasis role="bold"> <property><rich:comboBox></property> </emphasis> component consists of an <property>input field</property>, the <property>button</property> and the <property>popup list</property> of suggestions - attached to input. + attached to input. If you want to see the popup list you can press the <property>button</property> or type the first letter of suggested word in the <property>input field</property>. The component could be in two states:  @@ -117,19 +117,38 @@ <para> The <emphasis><property> "directInputSuggestions"</property></emphasis> attribute defines, how the first value from the suggested appears in input field. If it's "true" the first value appears with untyped part highlighted. + </para> + + <figure> + <title><emphasis role="bold"> + <property><rich:comboBox></property> + </emphasis> with <emphasis><property> "directInputSuggestions"</property></emphasis> attribute.</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/comboBox3.png"/> + </imageobject> + </mediaobject> + </figure> -  - + <para> + </para> - <para> The <emphasis><property> "selectFirstOnUpdate"</property></emphasis> attribute defines if the first value from suggested is selected in popup list. If it's "false" nothing is selected in the list before user hovered some item via mouse. Also nothing could be selected after mouse out the list. - -  + </para> + <figure> + <title><emphasis role="bold"> + <property><rich:comboBox></property> + </emphasis> with <emphasis><property> "selectFirstOnUpdate"</property></emphasis> attribute.</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/comboBox4.png"/> + </imageobject> + </mediaobject> + </figure> + - </para> - <para> The <emphasis><property> "filterNewValues"</property></emphasis> attribute defines the appearance of values in the list. If it's "true" only the part of list, which satisfies the prefix entered, could appears in popup list. @@ -158,10 +177,7 @@ <listitem> <emphasis><property> "onlistcall"</property></emphasis> is fired before the list opening </listitem> - <listitem> - <emphasis><property> "onselected"</property></emphasis> is fired after some value from popup list was chosen - </listitem> - <listitem> + <listitem> <emphasis><property> "onchange"</property></emphasis> is fired both with onselected and after the input value changed </listitem> </itemizedlist> @@ -354,14 +370,14 @@ <para>On the screenshot there are classes names that define styles for component elements.</para> -  + </figure> <table id="comboBoxC"> <title>Classes names that define shadow representation</title> Modified: trunk/docs/userguide/en/src/main/docbook/included/effect.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2008-02-14 17:56:46 UTC (rev 6097) +++ trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2008-02-14 18:35:32 UTC (rev 6098) @@ -76,7 +76,7 @@ Wiring effect with JSF components might occur on the server or client. Wiring with html tag is possible only on the client side </listitem> <listitem>invoking from the JavaScript code by an effect name. During the rendering, - <emphasis role="bold"><property><rich:effect></property><emphasis> generates the JavaScript function with defined name. + <emphasis role="bold"><property><rich:effect></property></emphasis> generates the JavaScript function with defined name. When the function is called, the effect is applied </listitem> </itemizedlist> </para> Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2008-02-14 17:56:46 UTC (rev 6097) +++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2008-02-14 18:35:32 UTC (rev 6098) @@ -44,7 +44,7 @@ <section> <title>Creating the Component with a Page Tag</title> - <para>To create the simplest variant on a page use the following syntax:</para> + <para>Here is a simple example as it could be used on a page: </para> <para> <emphasis role="bold">Example:</emphasis> @@ -132,7 +132,7 @@ <para>It's displayed on a page in the following way:</para> <figure> <title><emphasis role="bold"> - <property><rich:panel></property> with header</title> + <property><rich:panel></property> with header</emphasis></title> <mediaobject> <imageobject> Added: trunk/docs/userguide/en/src/main/resources/images/comboBox1.png =================================================================== (Binary files differ) Property changes on: trunk/docs/userguide/en/src/main/resources/images/comboBox1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/docs/userguide/en/src/main/resources/images/comboBox2.png =================================================================== (Binary files differ) Property changes on: trunk/docs/userguide/en/src/main/resources/images/comboBox2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/docs/userguide/en/src/main/resources/images/comboBox3.png =================================================================== (Binary files differ) Property changes on: trunk/docs/userguide/en/src/main/resources/images/comboBox3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/docs/userguide/en/src/main/resources/images/comboBox4.png =================================================================== (Binary files differ) Property changes on: trunk/docs/userguide/en/src/main/resources/images/comboBox4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

18 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2008