JBoss Rich Faces SVN: r6528 - in trunk/test-applications/jsp/src/main: java/dataOrderedList and 21 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-04 09:03:17 -0500 (Tue, 04 Mar 2008)
New Revision: 6528
Added:
trunk/test-applications/jsp/src/main/java/fileUpload/
trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java
trunk/test-applications/jsp/src/main/java/inplaceInput/
trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java
trunk/test-applications/jsp/src/main/java/inplaceSelect/
trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java
trunk/test-applications/jsp/src/main/webapp/FileUpload/
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
trunk/test-applications/jsp/src/main/webapp/InplaceInput/
trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp
trunk/test-applications/jsp/src/main/webapp/InplaceSelect/
trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-FileUpload.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml
Modified:
trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java
trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java
trunk/test-applications/jsp/src/main/java/pickList/PickList.java
trunk/test-applications/jsp/src/main/java/rich/Options.java
trunk/test-applications/jsp/src/main/java/rich/RichBean.java
trunk/test-applications/jsp/src/main/java/util/style/Style.java
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp
trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp
trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp
trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp
trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp
Log:
+add fileUpload
+add inplaceInput
+add inplaceSelect
Modified: trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -14,6 +14,7 @@
private String type;
private String dir;
private int mSize;
+ private ArrayList defaultArr;
public String getDir() {
return dir;
@@ -37,6 +38,7 @@
public DataOrderedList(){
arr = new ArrayList<Data>();
+ defaultArr = new ArrayList<String>();
dir ="LTR";
rows = 20;
rows = 0;
@@ -46,6 +48,8 @@
type = "1";
for(int i = 1; i < Data.cityAfrica.length; i++)
arr.add(new Data(Data.cityAfrica[i]));
+ for(int i = 0; i < 5; i++)
+ defaultArr.add("text_" + i);
}
public int getFirst() {
@@ -91,5 +95,13 @@
public ArrayList<Data> getArr() {
return arr;
}
+
+ public ArrayList getDefaultArr() {
+ return defaultArr;
+ }
+
+ public void setDefaultArr(ArrayList defaultArr) {
+ this.defaultArr = defaultArr;
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -19,6 +19,7 @@
private String iconFolder = null;
private String selectMenu;
private String mode;
+ private String action;
private String actionListener;
private boolean rendered;
private boolean disabled;
@@ -43,8 +44,13 @@
disabled = false;
disabledDDM = false;
check = false;
+ action = "---";
actionListener = "---";
}
+
+ public void act() {
+ action = "action work!";
+ }
public void actListener(ActionEvent e) {
actionListener = "actionListener work!";
@@ -270,4 +276,8 @@
public void setDisabledDDM(boolean disabledDDM) {
this.disabledDDM = disabledDDM;
}
+
+ public String getAction() {
+ return action;
+ }
}
Added: trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -0,0 +1,112 @@
+package fileUpload;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.richfaces.event.UploadEvent;
+
+public class FileUpload {
+ private boolean disabled;
+ private boolean autoclear;
+ private boolean rendered;
+ private boolean required;
+ private String requiredMessage;
+ private String listHeight;
+ private String listWidth;
+ private Map<String, InputStream> data = new HashMap<String, InputStream>();
+ private Integer maxFilesQuantity;
+
+ public FileUpload() {
+ disabled = false;
+ autoclear = false;
+ rendered = true;
+ required = false;
+ requiredMessage = "requiredMessage";
+ listHeight = "200px";
+ listWidth = "150px";
+ maxFilesQuantity = 3;
+ }
+
+ public void fileUploadListener(UploadEvent event) throws IOException{
+ if (event.isFile()) {
+ File file = event.getFile();
+ } else {
+ ByteArrayOutputStream b = new ByteArrayOutputStream();
+ b.write(event.getData());
+ }
+
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public boolean isAutoclear() {
+ return autoclear;
+ }
+
+ public void setAutoclear(boolean autoclear) {
+ this.autoclear = autoclear;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public boolean isRequired() {
+ return required;
+ }
+
+ public void setRequired(boolean required) {
+ this.required = required;
+ }
+
+ public String getRequiredMessage() {
+ return requiredMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
+ public Integer getMaxFilesQuantity() {
+ return maxFilesQuantity;
+ }
+
+ public void setMaxFilesQuantity(Integer maxFilesQuantity) {
+ this.maxFilesQuantity = maxFilesQuantity;
+ }
+
+ public String getListHeight() {
+ return listHeight;
+ }
+
+ public void setListHeight(String listHeight) {
+ this.listHeight = listHeight;
+ }
+
+ public String getListWidth() {
+ return listWidth;
+ }
+
+ public void setListWidth(String listWidth) {
+ this.listWidth = listWidth;
+ }
+
+ public void setData(Map<String, InputStream> data) {
+ this.data = data;
+ }
+
+}
Added: trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -0,0 +1,151 @@
+package inplaceInput;
+
+import javax.faces.event.ValueChangeEvent;
+
+public class InplaceInput {
+ private String inputMaxLength;
+ private String inputWidth;
+ private String maxInputWidth;
+ private String minInputWidth;
+ private boolean required;
+ private String requiredMessage;
+ private int tabindex;
+ private String editEvent;
+ private String defaultLabel;
+ private String controlsVerticalPosition;
+ private String controlsHorizontalPosition;
+ private String value;
+ private boolean selectOnEdit;
+ private boolean showControls;
+ private boolean rendered;
+ private boolean immediate;
+ private String valueCL;
+
+ public InplaceInput() {
+ inputMaxLength = "200";
+ inputWidth = "150";
+ maxInputWidth = "250";
+ minInputWidth = "100";
+ required = false;
+ requiredMessage = "requiredMessage";
+ tabindex = 1;
+ editEvent = "click";
+ defaultLabel = "defaultLabel";
+ controlsVerticalPosition = "top";
+ controlsHorizontalPosition = "left";
+ value = "errors";
+ selectOnEdit = false;
+ showControls = false;
+ rendered = true;
+ immediate = false;
+ valueCL = "---";
+ }
+
+ public void valueChangeListener(ValueChangeEvent event){
+ valueCL = "valueChangeListener work!";
+ }
+
+ public String getInputMaxLength() {
+ return inputMaxLength;
+ }
+ public void setInputMaxLength(String inputMaxLength) {
+ this.inputMaxLength = inputMaxLength;
+ }
+ public String getInputWidth() {
+ return inputWidth;
+ }
+ public void setInputWidth(String inputWidth) {
+ this.inputWidth = inputWidth;
+ }
+ public String getMaxInputWidth() {
+ return maxInputWidth;
+ }
+ public void setMaxInputWidth(String maxInputWidth) {
+ this.maxInputWidth = maxInputWidth;
+ }
+ public String getMinInputWidth() {
+ return minInputWidth;
+ }
+ public void setMinInputWidth(String minInputWidth) {
+ this.minInputWidth = minInputWidth;
+ }
+ public boolean isRequired() {
+ return required;
+ }
+ public void setRequired(boolean required) {
+ this.required = required;
+ }
+ public String getRequiredMessage() {
+ return requiredMessage;
+ }
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+ public int getTabindex() {
+ return tabindex;
+ }
+ public void setTabindex(int tabindex) {
+ this.tabindex = tabindex;
+ }
+ public String getEditEvent() {
+ return editEvent;
+ }
+ public void setEditEvent(String editEvent) {
+ this.editEvent = editEvent;
+ }
+ public String getDefaultLabel() {
+ return defaultLabel;
+ }
+ public void setDefaultLabel(String defaultLabel) {
+ this.defaultLabel = defaultLabel;
+ }
+ public String getControlsVerticalPosition() {
+ return controlsVerticalPosition;
+ }
+ public void setControlsVerticalPosition(String controlsVerticalPosition) {
+ this.controlsVerticalPosition = controlsVerticalPosition;
+ }
+ public String getControlsHorizontalPosition() {
+ return controlsHorizontalPosition;
+ }
+ public void setControlsHorizontalPosition(String controlsHorizontalPosition) {
+ this.controlsHorizontalPosition = controlsHorizontalPosition;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+ public boolean isSelectOnEdit() {
+ return selectOnEdit;
+ }
+ public void setSelectOnEdit(boolean selectOnEdit) {
+ this.selectOnEdit = selectOnEdit;
+ }
+ public boolean isShowControls() {
+ return showControls;
+ }
+ public void setShowControls(boolean showControls) {
+ this.showControls = showControls;
+ }
+ public boolean isRendered() {
+ return rendered;
+ }
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+ public boolean isImmediate() {
+ return immediate;
+ }
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
+ public String getValueCL() {
+ return valueCL;
+ }
+ public void setValueCL(String valueCL) {
+ this.valueCL = valueCL;
+ }
+
+}
Added: trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -0,0 +1,204 @@
+package inplaceSelect;
+
+import javax.faces.event.ValueChangeEvent;
+
+public class InplaceSelect {
+ private boolean applyFromControlsOnly;
+ private String controlsHorizontalPosition;
+ private String controlsVerticalPosition;
+ private String defaultLabel;
+ private String editEvent;
+ private boolean editOnTab;
+ private boolean immediate;
+ private String listHeight;
+ private String listWidth;
+ private String maxSelectWidth;
+ private String minSelectWidth;
+ private boolean openOnEdit;
+ private boolean rendered;
+ private boolean selectOnEdit;
+ private String selectWidth;
+ private boolean showControls;
+ private int tabindex;
+ private Object value;
+ private String valueCL;
+
+ public InplaceSelect() {
+ valueCL = "---";
+ editEvent = "click";
+ maxSelectWidth = "150";
+ minSelectWidth = "85";
+ selectWidth = "170";
+ defaultLabel = "defaultLabel";
+ controlsVerticalPosition = "center";
+ controlsHorizontalPosition = "left";
+ value = "errors";
+ listWidth = "200";
+ listHeight = "150";
+ selectOnEdit = false;
+ showControls = false;
+ applyFromControlsOnly = false;
+ editOnTab = false;
+ openOnEdit = false;
+ rendered = true;
+ immediate = false;
+ }
+
+ public void valueChangeListener(ValueChangeEvent event){
+ valueCL = "valueChangeListener work!";
+ }
+
+ public String getControlsHorizontalPosition() {
+ return controlsHorizontalPosition;
+ }
+
+ public String getControlsVerticalPosition() {
+ return controlsVerticalPosition;
+ }
+
+ public int getTabindex() {
+ return tabindex;
+ }
+
+ public void setTabindex(int tabindex) {
+ this.tabindex = tabindex;
+ }
+
+ public String getValueCL() {
+ return valueCL;
+ }
+
+ public void setValueCL(String valueCL) {
+ this.valueCL = valueCL;
+ }
+
+ public String getDefaultLabel() {
+ return defaultLabel;
+ }
+
+ public String getEditEvent() {
+ return editEvent;
+ }
+
+ public String getListHeight() {
+ return listHeight;
+ }
+
+ public String getListWidth() {
+ return listWidth;
+ }
+
+ public String getMaxSelectWidth() {
+ return maxSelectWidth;
+ }
+
+ public String getMinSelectWidth() {
+ return minSelectWidth;
+ }
+
+ public String getSelectWidth() {
+ return selectWidth;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public boolean isApplyFromControlsOnly() {
+ return applyFromControlsOnly;
+ }
+
+ public boolean isEditOnTab() {
+ return editOnTab;
+ }
+
+ public boolean isImmediate() {
+ return immediate;
+ }
+
+ public boolean isOpenOnEdit() {
+ return openOnEdit;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public boolean isSelectOnEdit() {
+ return selectOnEdit;
+ }
+
+ public boolean isShowControls() {
+ return showControls;
+ }
+
+ public void setApplyFromControlsOnly(boolean applyFromControlsOnly) {
+ this.applyFromControlsOnly = applyFromControlsOnly;
+ }
+
+ public void setControlsHorizontalPosition(String controlsHorizontalPosition) {
+ this.controlsHorizontalPosition = controlsHorizontalPosition;
+ }
+
+ public void setControlsVerticalPosition(String controlsVerticalPosition) {
+ this.controlsVerticalPosition = controlsVerticalPosition;
+ }
+
+ public void setDefaultLabel(String defaultLabel) {
+ this.defaultLabel = defaultLabel;
+ }
+
+ public void setEditEvent(String editEvent) {
+ this.editEvent = editEvent;
+ }
+
+ public void setEditOnTab(boolean editOnTab) {
+ this.editOnTab = editOnTab;
+ }
+
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
+
+ public void setListHeight(String listHeight) {
+ this.listHeight = listHeight;
+ }
+
+ public void setListWidth(String listWidth) {
+ this.listWidth = listWidth;
+ }
+
+ public void setMaxSelectWidth(String maxSelectWidth) {
+ this.maxSelectWidth = maxSelectWidth;
+ }
+
+ public void setMinSelectWidth(String minSelectWidth) {
+ this.minSelectWidth = minSelectWidth;
+ }
+
+ public void setOpenOnEdit(boolean openOnEdit) {
+ this.openOnEdit = openOnEdit;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public void setSelectOnEdit(boolean selectOnEdit) {
+ this.selectOnEdit = selectOnEdit;
+ }
+
+ public void setSelectWidth(String selectWidth) {
+ this.selectWidth = selectWidth;
+ }
+
+ public void setShowControls(boolean showControls) {
+ this.showControls = showControls;
+ }
+
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+
+}
Modified: trunk/test-applications/jsp/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -12,7 +12,6 @@
public String copyControlLabel;
public String dir;
public boolean disabled;
- public boolean displayValueOnly;
public boolean fastOrderControlsVisible;
public boolean immediate;
public String listsHeight;
@@ -31,7 +30,16 @@
private boolean required;
private String requiredMessage;
private Object[] value;
+ private String valueCL;
+ public String getValueCL() {
+ return valueCL;
+ }
+
+ public void setValueCL(String valueCL) {
+ this.valueCL = valueCL;
+ }
+
public boolean isRequired() {
return required;
}
@@ -53,10 +61,10 @@
this.copyControlLabel = "copyControlLabel";
this.dir = "alert('work')";
this.disabled = false;
- this.displayValueOnly = false;
this.fastOrderControlsVisible = true;
this.immediate = false;
this.listsHeight = "400";
+ this.valueCL = "---";
// this.localValueSet = ;
this.moveControlsVerticalAlign = "30";
this.removeAllControlLabel = "removeAllControlLabel";
@@ -77,7 +85,7 @@
}
public void valueChangeListener(ValueChangeEvent event) {
- // event.getNewValue();
+ valueCL = "valueChangeListener work!";
}
public String getCopyAllControlLabel() {
@@ -112,14 +120,6 @@
this.disabled = disabled;
}
- public boolean isDisplayValueOnly() {
- return displayValueOnly;
- }
-
- public void setDisplayValueOnly(boolean displayValueOnly) {
- this.displayValueOnly = displayValueOnly;
- }
-
public boolean isFastOrderControlsVisible() {
return fastOrderControlsVisible;
}
Modified: trunk/test-applications/jsp/src/main/java/rich/Options.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -1,12 +1,38 @@
package rich;
public class Options {
+ private static String [] CALENDAR_EVENT = {"onbeforedomupdate", "onchanged", "oncollapse", "oncomplete", "oncurrentdateselect", "ondatemouseout", "ondatemouseover", "ondateselect", "ondateselected", "onexpand", "oninputblur", "oninputchange", "oninputclick", "oninputfocus", "oninputkeydown", "oninputkeypress", "oninputkeyup", "oninputselect", "ontimeselect", "ontimeselected"};
+ private static String [] CALENDAR_STYLE = {"style", "styleClass", "inputStyle"};
+ private static String [] COLUMNS_STYLE = {"footerClass", "headerClass", "styleClass", "style"};
+ private static String [] COMBOBOX_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onfocus", "onitemselected", "onkeydown", "onkeypress", "onkeyup", "onlistcall", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect"};
+ private static String [] COMBOBOX_STYLE = {"buttonClass", "buttonDisabledClass", "buttonDisabledStyle", "buttonInactiveClass", "buttonInactiveStyle", "buttonStyle", "inputClass", "inputDisabledClass", "inputDisabledStyle", "inputInactiveClass", "inputInactiveStyle", "itemClass", "inputStyle", "listClass", "listStyle"};
+ private static String [] CONTEXTMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover"};
+ private static String [] CONTEXTMENU_STYLE = {"disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "style", "styleClass"};
+ private static String [] DATADEFINITIONLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass"};
+ private static String [] DATAORDEREDLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass", "footerClass", "headerClass"};
+ private static String [] DATAFILTERSLIDER_EVENT = {"onbeforedomupdate", "onchange", "onclick", "oncomplete", "ondblclick", "onerror", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onslide", "onSlideSubmit"};
+ private static String [] DATAFILTERSLIDER_STYLE = {"styleClass", "rangeStyleClass", "trailerStyleClass", "style", "fieldStyleClass", "trackStyleClass", "handleStyleClass"};
+ private static String [] DATASCROLLER_EVENT = {"onbeforedomupdate", "onclick", "oncomplete", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"};
+ private static String [] DATASCROLLER_STYLE = {"inactiveStyle", "inactiveStyleClass", "selectedStyle", "selectedStyleClass", "style", "styleClass", "tableStyle", "tableStyleClass"};
+ private static String [] DATATABLE_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onRowClick", "onRowDblClick", "onRowMouseDown", "onRowMouseMove", "onRowMouseOut", "onRowMouseOver", "onRowMouseUp"};
+ private static String [] DATATABLE_STYLE = {"captionClass", "rowClasses", "headerClass", "footerClass", "styleClass", "captionStyle", "columnClasses"};
+ private static String [] DRAGANDDROP_EVENT = {"ondragenter", "ondragexit", "ondrop", "ondropend", "oncomplete", "onsubmit", "onbeforedomupdate", "oncomplete", "ondragend", "ondragstart", "onsubmit", "ondropout", "ondropover"};
+ private static String [] DRAGANDDROP_STYLE = {"acceptClass", "rejectClass", "style", "styleClass"};
+ private static String [] DROPDOWNMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover", "onbeforedomupdate", "onclick", "oncomplete", "onmousedown", "onmouseup", "onselect"};
+ private static String [] DROPDOWNMENU_STYLE = {"iconClass", "iconStyle", "selectClass", "selectStyle", "style", "disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "styleClass"};
+ private static String [] GMAP_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"};
+ private static String [] GMAP_STYLE = {"style=", "styleClass"};
+ private static String [] INPUTNUMBERSLIDER_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onerror", "onfocus", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect", "onslide"};
+ private static String [] INPUTNUMBERSLIDER_STYLE = {"barClass", "barStyle", "handleClass", "inputClass", "handleSelectedClass", "inputSize", "styleClass", "inputStyle", "tipStyle", "style", "tipClass"};
+
+
private boolean reDefault;
private boolean reComponent;
private boolean reProperty;
private boolean reStraightforward;
public Options() {
+
reDefault = true;
reComponent = true;
reProperty = true;
Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -66,6 +66,9 @@
map.add("Combobox", add("/Combobox/Combobox", new boolean [] {false, true, false}));
map.add("ProgressBar", add("/ProgressBar/ProgressBar", new boolean [] {false, false, false}));
map.add("SortingAndFiltering", add("/SortingAndFiltering/SortingAndFiltering", new boolean [] {false, false, false}));
+ map.add("FileUpload", add("/FileUpload/FileUpload", new boolean [] {false, false, false}));
+ map.add("InplaceSelect", add("/InplaceSelect/InplaceSelect", new boolean [] {false, false, false}));
+ map.add("InplaceInput", add("/InplaceInput/InplaceInput", new boolean [] {false, false, false}));
Iterator<String> iterator = map.getSet().iterator();
while(iterator.hasNext()){
list.add(new SelectItem(iterator.next()));
Modified: trunk/test-applications/jsp/src/main/java/util/style/Style.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-03-04 14:03:17 UTC (rev 6528)
@@ -24,6 +24,7 @@
private String inputStyle;
private String barStyle;
private String handleSelectedClass;
+ private String handleStyleClass;
private String tipStyle;
private String buttonClass;
private String buttonDisabledClass;
@@ -119,6 +120,7 @@
selectClass = "selectClass";
selectStyle = "selectStyle";
highlightedClass = "highlightedClass";
+ handleStyleClass = "handleStyleClass";
tabClass = "tabClass";
entryClass = "entryClass";
popupClass = "popupClass";
@@ -687,4 +689,12 @@
public void setCurentComponent(RichBean curentComponent) {
this.curentComponent = curentComponent;
}
+
+ public String getHandleStyleClass() {
+ return handleStyleClass;
+ }
+
+ public void setHandleStyleClass(String handleStyleClass) {
+ this.handleStyleClass = handleStyleClass;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -15,7 +15,7 @@
rendered="#{calendarBean.renderedAjax}" />
<rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}"
- style="#{style.style}" styleClass="#{style.styleClass}" dayStyleClass="#{style.dayStyleClass}" inputStyle="#{style.inputStyle}"
+ style="#{style.style}" styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}"
locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}"
preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}"
Modified: trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -17,7 +17,7 @@
<f:attribute name="var" value="body" />
<h:form id="test">
-
+ <rich:inputNumberSlider ></rich:inputNumberSlider>
</h:form>
</h:panelGroup>
Modified: trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionDefault.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -2,7 +2,6 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-
<rich:dataDefinitionList value="#{dataDefinitionList.arrDefault}" var="def">
<h:outputText value="#{def}" />
</rich:dataDefinitionList>
Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -9,9 +9,9 @@
rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}"
for="carList" forValRef="inventoryList.carInventory"
filterBy="getMileage" manualInput="true" storeResults="true" width="400px"
- styleClass="#{style.styleClass}" rangeStyleClass="#{style.rangeStyleClass}" trailerStyleClass="#{style.trailerStyleClass}" style="#{style.style}" fieldStyleClass="#{style.fieldStyleClass}" trackStyleClass="#{style.trackStyleClass}"
+ styleClass="#{style.styleClass}" rangeStyleClass="#{style.rangeStyleClass}" trailerStyleClass="#{style.trailerStyleClass}" style="#{style.style}" fieldStyleClass="#{style.fieldStyleClass}" trackStyleClass="#{style.trackStyleClass}" handleStyleClass="#{style.handleStyleClass}"
startRange="10000" endRange="60000" increment="10000"
- trailer="true" handleStyleClass="handle" handleValue="10000" id="dfsID"
+ trailer="true" handleValue="10000" id="dfsID"
onbeforedomupdate="#{event.onbeforedomupdate}"
onchange="#{event.onchange}" onclick="#{event.onclick}"
oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}"
Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -30,7 +30,7 @@
<h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
</rich:menuItem>
<rich:menuSeparator/>
- <rich:menuItem icon="/pics/info.gif" value="action" action="alert('action work')" reRender="cmInfoID">
+ <rich:menuItem icon="/pics/info.gif" value="action" action="#{dDMenu.act}" reRender="cmInfoID">
</rich:menuItem>
<rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{dDMenu.actListener}" reRender="cmInfoID">
</rich:menuItem>
@@ -66,7 +66,7 @@
</h:panelGrid>
<h:panelGrid id="dndActionID" columns="1">
<a4j:commandButton value="Show action" reRender="dndActionID" style=" width : 95px;"></a4j:commandButton>
- <h:outputText value="#{dDMenu.actionDrag}" />
- <h:outputText value="#{dDMenu.actionListener}" />
+ <h:outputText value="#{dDMenu.action}" />
+ <h:outputText value="#{dDMenu.actionListener}" />
</h:panelGrid>
</f:subview>
Added: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -0,0 +1,19 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="FileUploadSubviewID">
+<rich:fileUpload id="fileUploadID" disabled="#{fileUpload.disabled}" autoclear="#{fileUpload.autoclear}"
+required="#{fileUpload.required}" requiredMessage="#{fileUpload.requiredMessage}" rendered="#{fileUpload.rendered}"
+listHeight="#{fileUpload.listHeight}" listWidth="#{fileUpload.listHeight}" data="#{fileUpload.data}"
+maxFilesQuantity="#{fileUpload.maxFilesQuantity}" fileUploadListener="#{fileUpload.fileUploadListener}">
+ <f:facet name="progress">
+ <progressBar:progressBar style="height: 5px; width: 250px;">
+ </progressBar:progressBar>
+ </f:facet>
+ <f:facet name="label">
+ <h:outputText value="{_KB}KB from {KB}KB uploaded :[ {mm}:{ss} ]"></h:outputText>
+ </f:facet>
+</rich:fileUpload>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -0,0 +1,106 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="inplaceInputSubviewID">
+This is because such an error can easily be made at programming level, <br />
+and while invisible for the user who does not understand or cannot <br />
+acquire the source code, many of those
+<rich:inplaceInput inputMaxLength="#{inplaceInput.inputMaxLength}"
+ inputWidth="#{inplaceInput.inputWidth}"
+ maxInputWidth="#{inplaceInput.maxInputWidth}"
+ minInputWidth="#{inplaceInput.minInputWidth}"
+ required="#{inplaceInput.required}"
+ requiredMessage="#{inplaceInput.requiredMessage}"
+ tabindex="#{inplaceInput.tabindex}"
+ editEvent="#{inplaceInput.editEvent}"
+ defaultLabel="#{inplaceInput.defaultLabel}"
+ controlsVerticalPosition="#{inplaceInput.controlsVerticalPosition}"
+ controlsHorizontalPosition="#{inplaceInput.controlsHorizontalPosition}"
+ value="#{inplaceInput.value}"
+ selectOnEdit="#{inplaceInput.selectOnEdit}"
+ showControls="#{inplaceInput.showControls}"
+ rendered="#{inplaceInput.rendered}"
+ immediate="#{inplaceInput.immediate}">
+ </rich:inplaceInput>
+ are easy to exploit. <h:commandButton value="ok"></h:commandButton>
+ <h:panelGrid columns="2">
+ <a4j:commandButton value="refresh" reRender="inplaceInputValueCLID"></a4j:commandButton>
+ <h:outputText id="inplaceInputValueCLID"
+ value="#{inplaceInput.valueCL}"></h:outputText>
+ </h:panelGrid>
+ <h:panelGrid columns="2">
+ <h:outputText value="value"></h:outputText>
+ <h:inputText id="inplaceInputValueID" value="#{inplaceInput.value}" onchange="submit();">
+ </h:inputText>
+
+
+ <h:outputText value="defaultLabel"></h:outputText>
+ <h:inputText value="#{inplaceInput.defaultLabel}" onchange="submit();">
+ </h:inputText>
+
+ <h:outputText value="inputMaxLength"></h:outputText>
+ <h:inputText value="#{inplaceInput.inputMaxLength}" onchange="submit();">
+ </h:inputText>
+
+ <h:outputText value="inputWidth"></h:outputText>
+ <h:inputText value="#{inplaceInput.inputWidth}" onchange="submit();">
+ </h:inputText>
+
+ <h:outputText value="maxInputWidth"></h:outputText>
+ <h:inputText value="#{inplaceInput.maxInputWidth}" onchange="submit();">
+ </h:inputText>
+
+ <h:outputText value="minInputWidth"></h:outputText>
+ <h:inputText value="#{inplaceInput.minInputWidth}" onchange="submit();">
+ </h:inputText>
+
+ <h:outputText value="tabindex"></h:outputText>
+ <h:inputText value="#{inplaceInput.tabindex}" onchange="submit();">
+ </h:inputText>
+
+ <h:outputText value="editEvent"></h:outputText>
+ <h:inputText value="#{inplaceInput.editEvent}" onchange="submit();">
+ </h:inputText>
+
+ <h:outputText value="controlsVerticalPosition"></h:outputText>
+ <h:selectOneRadio value="#{inplaceInput.controlsVerticalPosition}" onchange="submit();">
+ <f:selectItem itemLabel="top" itemValue="top"/>
+ <f:selectItem itemLabel="bottom" itemValue="bottom"/>
+ <f:selectItem itemLabel="center" itemValue="center"/>
+ </h:selectOneRadio>
+
+ <h:outputText value="controlsHorizontalPosition"></h:outputText>
+ <h:selectOneRadio value="#{inplaceInput.controlsHorizontalPosition}" onchange="submit();">
+ <f:selectItem itemLabel="right" itemValue="right"/>
+ <f:selectItem itemLabel="center" itemValue="center"/>
+ <f:selectItem itemLabel="left" itemValue="left"/>
+ </h:selectOneRadio>
+
+ <h:outputText value="selectOnEdit"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceInput.selectOnEdit}" onchange="submit();">
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="showControls"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceInput.showControls}" onchange="submit();">
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="rendered"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceInput.rendered}" onchange="submit();">
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="immediate"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceInput.immediate}" onchange="submit();">
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="required"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceInput.required}" onchange="submit();">
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="requiredMessage"></h:outputText>
+ <h:inputText value="#{inplaceInput.requiredMessage}" onchange="submit();">
+ </h:inputText>
+
+ </h:panelGrid>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -0,0 +1,107 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="inplaceSelectSubviewID">
+This is because such an error can easily be made at programming level, <br />
+and while invisible for the user who does not understand or cannot <br />
+acquire the source code, many of those
+<rich:inplaceSelect
+
+ tabindex="#{inplaceSelect.tabindex}"
+ editEvent="#{inplaceSelect.editEvent}"
+ maxSelectWidth="#{inplaceSelect.maxSelectWidth}"
+ minSelectWidth="#{inplaceSelect.minSelectWidth}"
+ selectWidth="#{inplaceSelect.selectWidth}"
+ defaultLabel="#{inplaceSelect.defaultLabel}"
+ controlsVerticalPosition="#{inplaceSelect.controlsVerticalPosition}"
+ controlsHorizontalPosition="#{inplaceSelect.controlsHorizontalPosition}"
+ value="#{inplaceSelect.value}" listWidth="#{inplaceSelect.listWidth}"
+ listHeight="#{inplaceSelect.listHeight}"
+ selectOnEdit="#{inplaceSelect.selectOnEdit}"
+ showControls="#{inplaceSelect.showControls}"
+ editOnTab="#{inplaceSelect.editOnTab}"
+ openOnEdit="#{inplaceSelect.openOnEdit}"
+ rendered="#{inplaceSelect.rendered}"
+ immediate="#{inplaceSelect.immediate}">
+ <f:selectItem itemLabel="errors" itemValue="errors" />
+ <f:selectItem itemLabel="fatals" itemValue="fatals" />
+ <f:selectItem itemLabel="infos" itemValue="infos" />
+ <f:selectItem itemLabel="passeds" itemValue="passeds" />
+ <f:selectItem itemLabel="warns" itemValue="warns" />
+ </rich:inplaceSelect>
+ are easy to exploit.
+ <h:panelGrid columns="2">
+ <a4j:commandButton value="refresh" reRender="inplaceSelectValueCLID"></a4j:commandButton>
+ <h:outputText id="inplaceSelectValueCLID"
+ value="#{inplaceSelect.valueCL}"></h:outputText>
+ </h:panelGrid>
+
+ <h:panelGrid columns="2">
+ <h:outputText value="value"></h:outputText>
+
+
+ <h:outputText value="defaultLabel"></h:outputText>
+ <h:inputText value="#{inplaceSelect.defaultLabel}"
+ onchange="submit();"></h:inputText>
+
+ <h:outputText value="editEvent"></h:outputText>
+ <h:inputText value="#{inplaceSelect.editEvent}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="selectWidth"></h:outputText>
+ <h:inputText value="#{inplaceSelect.selectWidth}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="maxSelectWidth"></h:outputText>
+ <h:inputText value="#{inplaceSelect.maxSelectWidth}"
+ onchange="submit();"></h:inputText>
+
+ <h:outputText value="minSelectWidth"></h:outputText>
+ <h:inputText value="#{inplaceSelect.minSelectWidth}"
+ onchange="submit();"></h:inputText>
+
+ <h:outputText value="listWidth"></h:outputText>
+ <h:inputText value="#{inplaceSelect.listWidth}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="listHeight"></h:outputText>
+ <h:inputText value="#{inplaceSelect.listHeight}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="controlsVerticalPosition"></h:outputText>
+ <h:selectOneRadio value="#{inplaceSelect.controlsVerticalPosition}"
+ onchange="submit();">
+ <f:selectItem itemLabel="top" itemValue="top" />
+ <f:selectItem itemLabel="bottom" itemValue="bottom" />
+ <f:selectItem itemLabel="center" itemValue="center" />
+ </h:selectOneRadio>
+
+ <h:outputText value="controlsHorizontalPosition"></h:outputText>
+ <h:selectOneRadio value="#{inplaceSelect.controlsHorizontalPosition}"
+ onchange="submit();">
+ <f:selectItem itemLabel="right" itemValue="right" />
+ <f:selectItem itemLabel="center" itemValue="center" />
+ <f:selectItem itemLabel="left" itemValue="left" />
+ </h:selectOneRadio>
+ <h:outputText value="tabindex"></h:outputText>
+ <h:inputText value="#{inplaceSelect.tabindex}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="selectOnEdit"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceSelect.selectOnEdit}"
+ onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="showControls"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceSelect.showControls}"
+ onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="applyFromControlsOnly"></h:outputText>
+ <h:selectBooleanCheckbox
+ value="#{inplaceSelect.applyFromControlsOnly}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="editOnTab"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceSelect.editOnTab}"
+ onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="openOnEdit"></h:outputText>
+ <h:selectBooleanCheckbox value="#{inplaceSelect.openOnEdit}"
+ onchange="submit();"></h:selectBooleanCheckbox>
+ </h:panelGrid><h:commandButton value="ok"></h:commandButton>
+</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -20,7 +20,7 @@
<h:panelGroup>
<h:form>
- <rich:panel
+ <rich:panel z
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">
Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -21,7 +21,7 @@
<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}"
+ onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onmouseup="#{event.onmouseup}"></rich:panelMenuItem>
<rich:panelMenuItem>
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -22,6 +22,9 @@
<f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" />
<f:selectItems value="#{pickList.data}" />
</rich:pickList>
-
+ <h:panelGrid columns="2">
+ <a4j:commandButton value="refresh" reRender="pickListvalueCLID"></a4j:commandButton>
+ <h:outputText id="pickListvalueCLID" value="#{pickList.valueCL}"></h:outputText>
+ </h:panelGrid>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -58,9 +58,6 @@
<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>
@@ -71,9 +68,9 @@
<h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox>
<h:outputText value="required:"></h:outputText>
- <h:selectBooleanCheckbox value="#{pickList.required}"></h:selectBooleanCheckbox>
+ <h:selectBooleanCheckbox value="#{pickList.required}" onchange="submit();"></h:selectBooleanCheckbox>
<h:outputText value="requiredMessage:"></h:outputText>
- <h:inputText value="#{pickList.requiredMessage}"></h:inputText>
+ <h:inputText value="#{pickList.requiredMessage}" onchange="submit();"></h:inputText>
</h:panelGrid>
</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-FileUpload.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-FileUpload.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-FileUpload.xml 2008-03-04 14:03:17 UTC (rev 6528)
@@ -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>fileUpload</managed-bean-name>
+ <managed-bean-class>fileUpload.FileUpload</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml 2008-03-04 14:03:17 UTC (rev 6528)
@@ -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>inplaceInput</managed-bean-name>
+ <managed-bean-class>inplaceInput.InplaceInput</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml 2008-03-04 14:03:17 UTC (rev 6528)
@@ -0,0 +1,10 @@
+<?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>inplaceSelect</managed-bean-name>
+ <managed-bean-class>inplaceSelect.InplaceSelect</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ </faces-config>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-04 14:03:17 UTC (rev 6528)
@@ -12,7 +12,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,!
/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml</param-value>
+ <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,!
/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml</param-value>
</context-param>
<context-param>
<param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-03-04 13:37:20 UTC (rev 6527)
+++ trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-03-04 14:03:17 UTC (rev 6528)
@@ -29,8 +29,9 @@
<div id="divOpthID" align="right" style="z-index: 200">
<jsp:include page="/pages/RichMenu/RichMenu.jsp"/>
</div>
- <h:messages showDetail="true" showSummary="true"></h:messages>
- <h:panelGrid id="richGridID" columns="1" width="100%">
+ <h:messages showDetail="true" showSummary="true"></h:messages>
+
+ <h:panelGrid id="richGridID" columns="1" width="100%" rendered="true">
<h:column rendered="#{option.reComponent}">
<jsp:include page="${richBean.pathComponent}"/>
</h:column>
17 years, 9 months
JBoss Rich Faces SVN: r6527 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-04 08:37:20 -0500 (Tue, 04 Mar 2008)
New Revision: 6527
Modified:
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
Log:
fix IE bug if items.length == 0
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-04 13:21:47 UTC (rev 6526)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-04 13:37:20 UTC (rev 6527)
@@ -92,13 +92,13 @@
}
}
}
- if (this.iframe) {
- this.iframe.show();
- }
-
+
var items = this.getItems();
if (items.length != 0) {
this.listParent.show();
+ if (this.iframe) {
+ this.iframe.show();
+ }
}
this.listParent.fire("rich:onlistcall", {});
@@ -153,28 +153,28 @@
rowsAmount = this.getItems().length;
currentItemsHeight = itemHeight * rowsAmount;
- }
- if (this.height && (parseInt(this.height) < currentItemsHeight)) {
- if (this.height < currentItemsHeight) {
- height = currentItemsHeight;
- }
- } else {
- if (rowsAmount < this.defaultRowsAmount) {
- height = currentItemsHeight;
+
+ if (this.height && (parseInt(this.height) < currentItemsHeight)) {
+ if (this.height < currentItemsHeight) {
+ height = currentItemsHeight;
+ }
} else {
- height = itemHeight * this.defaultRowsAmount;
+ if (rowsAmount < this.defaultRowsAmount) {
+ height = currentItemsHeight;
+ } else {
+ height = itemHeight * this.defaultRowsAmount;
+ }
}
+ if (Prototype.Browser.IE) {
+ height = parseInt(height) + this.LAYOUT_BORDER_V + this.LAYOUT_PADDING_V;
+ }
+ height = parseInt(height) + "px";
+ this.list.style.height = height;
+ if (this.iframe) {
+ this.iframe.style.height = height;
+ }
+ this.setWidth(this.width);
}
- if (Prototype.Browser.IE) {
- height = parseInt(height) + this.LAYOUT_BORDER_V + this.LAYOUT_PADDING_V;
- }
- height = parseInt(height) + "px";
- this.list.style.height = height;
- if (this.iframe) {
- this.iframe.style.height = height;
- }
-
- this.setWidth(this.width);
},
/*setWidth : function(width) {
17 years, 9 months
JBoss Rich Faces SVN: r6526 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-04 08:21:47 -0500 (Tue, 04 Mar 2008)
New Revision: 6526
Modified:
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
Log:
RF-2377
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-04 11:32:29 UTC (rev 6525)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-04 13:21:47 UTC (rev 6526)
@@ -2,7 +2,7 @@
Richfaces.ComboBoxList = Class.create();
Richfaces.ComboBoxList.prototype = {
- initialize: function(listId, parentListId, selectFirstOnUpdate, classes, width, height, itemsText, onlistcall, fieldId, shadowId,
+ initialize: function(listId, parentListId, selectFirstOnUpdate, classes, width, height, itemsText, onlistcall, fieldId, shadowId,decorationId,
showDelay, hideDelay) {
this.list = $(listId);
@@ -95,7 +95,11 @@
if (this.iframe) {
this.iframe.show();
}
- this.listParent.show();
+
+ var items = this.getItems();
+ if (items.length != 0) {
+ this.listParent.show();
+ }
this.listParent.fire("rich:onlistcall", {});
},
@@ -129,8 +133,19 @@
if (item) {
//FIXME
this.listParent.style.visibility = "hidden";
+ //this.shadowElem.style.visibility = "hidden";
this.listParent.show();
+ if (this.shadowElem) {
+ if (!Richfaces.browser.isIE6) {
+ // shadow offset
+ this.shadowElem.style.width = (parseInt(this.width) + 7) + "px";
+ this.shadowElem.style.height = (parseInt(height) + 9)+ "px";
+ } else {
+ this.shadowElem.style.visibility = "hidden";
+ }
+ }
+
var itemHeight = item.offsetHeight;
this.listParent.hide();
@@ -159,16 +174,6 @@
this.iframe.style.height = height;
}
- if (this.shadowElem) {
- if (!Richfaces.browser.isIE6) {
- // shadow offset
- this.shadowElem.style.width = (parseInt(this.width) + 7) + "px";
- this.shadowElem.style.height = (parseInt(height) + 9)+ "px";
- } else {
- this.shadowElem.style.visibility = "hidden";
- }
- }
-
this.setWidth(this.width);
},
17 years, 9 months
JBoss Rich Faces SVN: r6525 - trunk/ui/inplaceInput/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-04 06:32:29 -0500 (Tue, 04 Mar 2008)
New Revision: 6525
Modified:
trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
Log:
fix id generation in the *.tld file
Modified: trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-03-04 11:26:51 UTC (rev 6524)
+++ trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-03-04 11:32:29 UTC (rev 6525)
@@ -249,6 +249,7 @@
<description>HTML: script expression; a pointer button is released</description>
</property>
&html_events;
+ &ui_input_attributes;
</properties>
17 years, 9 months
JBoss Rich Faces SVN: r6524 - trunk/samples/suggestionbox-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2008-03-04 06:26:51 -0500 (Tue, 04 Mar 2008)
New Revision: 6524
Modified:
trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp
Log:
http://jira.jboss.com/jira/browse/RF-1774
Modified: trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp 2008-03-04 11:25:54 UTC (rev 6523)
+++ trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp 2008-03-04 11:26:51 UTC (rev 6524)
@@ -38,7 +38,8 @@
<h:inputText value="#{suggestionBox.property}" id="text"/>
<rich:suggestionbox id="suggestionBoxId" for="text" tokens=",["
rules="#{suggestionBox.rules}"
- suggestionAction="#{suggestionBox.autocomplete}" var="result"
+ suggestionAction="#{suggestionBox.autocomplete}"
+ var="result"
fetchValue="#{result.text}"
first="#{suggestionBox.intFirst}"
minChars="#{suggestionBox.minchars}"
@@ -47,8 +48,8 @@
width="#{suggestionBox.width}"
height="#{suggestionBox.height}"
shadowDepth="#{suggestionBox.shadowDepth}"
- cellpadding="#{suggestionBox.cellpadding}">
-
+ cellpadding="#{suggestionBox.cellpadding}"
+ hiddenFetchValue="#{result.label}">
<a4j:ajaxListener type="org.richfaces.AjaxListener"/>
<h:column>
<h:outputText value="#{result.text}"/>
17 years, 9 months
JBoss Rich Faces SVN: r6523 - in trunk/ui/suggestionbox/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2008-03-04 06:25:54 -0500 (Tue, 04 Mar 2008)
New Revision: 6523
Modified:
trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml
trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java
trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-1774
Modified: trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml
===================================================================
--- trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2008-03-04 11:24:23 UTC (rev 6522)
+++ trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2008-03-04 11:25:54 UTC (rev 6523)
@@ -265,6 +265,10 @@
is set as a value
</description>
</property>
+ <property>
+ <name>hiddenFetchValue</name>
+ <classname>java.lang.Object</classname>
+ </property>
<property hidden="true">
<name>value</name>
<classname>java.lang.Object</classname>
Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java
===================================================================
--- trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2008-03-04 11:24:23 UTC (rev 6522)
+++ trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2008-03-04 11:25:54 UTC (rev 6523)
@@ -21,9 +21,11 @@
package org.richfaces.component;
+import java.util.Collection;
import java.util.Map;
import javax.el.MethodExpression;
+import javax.el.ValueExpression;
import javax.faces.component.UIData;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
@@ -91,7 +93,20 @@
* @param f identifier
*/
public abstract void setFor(String f);
+
+ public abstract Object getHiddenFetchValue();
+ public abstract void setHiddenFetchValue(Object hfv);
+
+ public abstract Object getFetchValue();
+
+ public abstract void setFetchValue(Object fv);
+
+ public abstract void setData(Object data);
+
+ public abstract Object getData();
+
+
/**
* Getter for suggestionAction.
*
@@ -341,6 +356,7 @@
if (null != suggestingAction) {
setValue(suggestingAction.invoke(
context.getELContext(), new Object[]{value}));
+
}
}
Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
--- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-03-04 11:24:23 UTC (rev 6522)
+++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-03-04 11:25:54 UTC (rev 6523)
@@ -37,6 +37,7 @@
import javax.faces.component.UIData;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.servlet.http.HttpServlet;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.javascript.JSFunction;
@@ -264,7 +265,23 @@
if (suggestionBox.isSubmitted()) {
suggestionBox.setupValue(context);
body.encode(getTemplateContext(context, suggestionBox));
-
+
+ Object[] values = ((Collection)suggestionBox.getValue()).toArray();
+ //Object hiddenFetchValue = suggestionBox.getHiddenFetchValue();
+ Collection data = new ArrayList();
+ for(int i=0;i<values.length;i++){
+
+ String var = (String)suggestionBox.getAttributes().get("var");
+ context.getExternalContext().getRequestMap().put(var, values[i]);
+ if(suggestionBox.getHiddenFetchValue()!=null){
+ data.add(suggestionBox.getHiddenFetchValue());
+ }else{
+ data.add(suggestionBox.getFetchValue());
+ }
+
+
+ }
+ suggestionBox.setData(data);
// Replace rendered area ID from component to suggestion table
suggestionBox.setRowIndex(-1);
AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
17 years, 9 months
JBoss Rich Faces SVN: r6522 - trunk/ui/inplaceSelect/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-04 06:24:23 -0500 (Tue, 04 Mar 2008)
New Revision: 6522
Modified:
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
Log:
RF-2376
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-03-04 11:01:13 UTC (rev 6521)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-03-04 11:24:23 UTC (rev 6522)
@@ -182,6 +182,8 @@
<description></description>
</property>
&html_events;
+ &ui_component_attributes;
+
</properties>
</component>
</components>
17 years, 9 months
JBoss Rich Faces SVN: r6521 - Plan/3.2.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-03-04 06:01:13 -0500 (Tue, 04 Mar 2008)
New Revision: 6521
Modified:
trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
Log:
Modified: trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
===================================================================
(Binary files differ)
17 years, 9 months
JBoss Rich Faces SVN: r6520 - in trunk/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/js and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-04 05:10:15 -0500 (Tue, 04 Mar 2008)
New Revision: 6520
Modified:
trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-2367
Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-03-04 09:50:32 UTC (rev 6519)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-03-04 10:10:15 UTC (rev 6520)
@@ -268,7 +268,7 @@
} catch (Exception e) {
e.getMessage();
}
- return (result != null) ? new JSLiteral(result.toString()) : null;
+ return (result != null) ? new JSLiteral(result.toString()) : JSReference.NULL;
}
/**
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-04 09:50:32 UTC (rev 6519)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-04 10:10:15 UTC (rev 6520)
@@ -447,6 +447,7 @@
},
getFileSize: function (data) {
+ if (!this.labelMarkup) return;
if (data) {
var progressData = new ProgressData(data);
this.progressData = progressData;
@@ -894,8 +895,7 @@
parentForm.target = oldTarget;
parentForm.encoding = oldEncoding;
parentForm.enctype = oldEnctype;
- if (this.labelMarkup)
- this.getFileSizeScript(entry.uid);
+ this.getFileSizeScript(entry.uid);
}
}
17 years, 9 months
JBoss Rich Faces SVN: r6519 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-04 04:50:32 -0500 (Tue, 04 Mar 2008)
New Revision: 6519
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-2369
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-04 00:32:28 UTC (rev 6518)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-04 09:50:32 UTC (rev 6519)
@@ -652,9 +652,7 @@
} else {
d1.onclick = function() {return this.clear();}.bind(this);
}
-
- d1.className = (this.disabled ? this.classes.CLEAN.DISABLED : this.classes.CLEAN.ENABLED);
- d2.className = (this.disabled ? this.classes.CLEAN_CONTENT.DISABLED : this.classes.CLEAN_CONTENT.ENABLED);
+ this._updateClassNames(d1, d2, this.classes.CLEAN, this.classes.CLEAN_CONTENT);
},
@@ -669,8 +667,7 @@
} else {
Element.show(d1.parentNode);
}
- d1.className = (this.disabled ? this.classes.ADD.DISABLED : this.classes.ADD.ENABLED);
- d2.className = (this.disabled ? this.classes.ADD_CONTENT.DISABLED : this.classes.ADD_CONTENT.ENABLED);
+ this._updateClassNames(d1, d2, this.classes.ADD, this.classes.ADD_CONTENT);
},
disableUploadButton: function () {
@@ -687,11 +684,14 @@
}else {
d1.onclick = function() {return this.upload();}.bind(this);
}
-
- d1.className = (this.disabled ? this.classes.UPDATE.DISABLED : this.classes.UPDATE.ENABLED);
- d2.className = (this.disabled ? this.classes.UPDATE_CONTENT.DISABLED : this.classes.UPDATE_CONTENT.ENABLED);
+ this._updateClassNames(d1, d2, (this.runUpload) ? this.classes.CANCEL : this.classes.UPDATE, (this.runUpload) ? this.classes.CANCEL_CONTENT : this.classes.UPDATE_CONTENT);
},
+ _updateClassNames: function (d1,d2,buttonClass,buttonContentClass) {
+ d1.className = (this.disabled ? buttonClass.DISABLED : buttonClass.ENABLED);
+ d2.className = (this.disabled ? buttonContentClass.DISABLED : buttonContentClass.ENABLED);
+ },
+
disable: function () {
this.disabled = true;
this.items.className = "upload_list_overflow " + this.classes.UPLOAD_LIST.DISABLED;
17 years, 9 months