JBoss Rich Faces SVN: r9198 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-06-24 10:51:05 -0400 (Tue, 24 Jun 2008)
New Revision: 9198
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-3788
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-06-24 14:47:51 UTC (rev 9197)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-24 14:51:05 UTC (rev 9198)
@@ -614,7 +614,7 @@
if (this.disabled) return;
if (!this.checkFileType(elt.value) || !this.checkDuplicated(elt)) {
if(this.events.ontyperejected) {
- this.element.fire("rich:ontyperejected", {});
+ this.element.fire("rich:ontyperejected", { fileName : elt.value });
}
return;
}
@@ -705,7 +705,7 @@
this.remove(entry);
if (entry.state == FileUploadEntry.UPLOAD_SUCCESS) {
if(this.events.onclear) {
- this.element.fire("rich:onclear", {});
+ this.element.fire("rich:onclear", {entry : entry});
}
}
} else {
@@ -907,7 +907,7 @@
if (newState == FileUploadEntry.UPLOAD_SIZE_ERROR) {
if(this.events.onsizerejected) {
- this.element.fire("rich:onsizerejected", {});
+ this.element.fire("rich:onsizerejected", { entry : entry});
}
}
@@ -947,11 +947,11 @@
if(newState == FileUploadEntry.UPLOAD_CANCELED) {
if(this.events.onuploadcanceled) {
- this.element.fire("rich:onuploadcanceled", {});
+ this.element.fire("rich:onuploadcanceled", {entry : entry});
}
} else {
if(this.events.onerror) {
- this.element.fire("rich:onerror", {});
+ this.element.fire("rich:onerror", {entry : entry});
}
}
15 years, 10 months
JBoss Rich Faces SVN: r9197 - trunk/test-applications/jsp/src/main/java/dataScroller.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-06-24 10:47:51 -0400 (Tue, 24 Jun 2008)
New Revision: 9197
Modified:
trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
Log:
currentSortOrder="ASCENDING"
Modified: trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:47:17 UTC (rev 9196)
+++ trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:47:51 UTC (rev 9197)
@@ -124,6 +124,7 @@
sortMode = "single";
sortOrder = Ordering.ASCENDING;
selfSorted = true;
+ currentSortOrder = "ASCENDING";
dataTable = new ArrayList();
15 years, 10 months
JBoss Rich Faces SVN: r9196 - trunk/test-applications/facelets/src/main/java/dataScroller.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-06-24 10:47:17 -0400 (Tue, 24 Jun 2008)
New Revision: 9196
Modified:
trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java
Log:
currentSortOrder="ASCENDING"
Modified: trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:36:35 UTC (rev 9195)
+++ trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:47:17 UTC (rev 9196)
@@ -123,7 +123,8 @@
filterValue = "";
selfSorted = true;
sortOrder = Ordering.ASCENDING;
- sortMode = "single";
+ sortMode = "single";
+ currentSortOrder = "ASCENDING";
dataTable = new ArrayList();
for(int i=0;i<1000;i++)
15 years, 10 months
JBoss Rich Faces SVN: r9195 - trunk/test-applications/jsp/src/main/webapp/DataScroller.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-06-24 10:36:35 -0400 (Tue, 24 Jun 2008)
New Revision: 9195
Modified:
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
Log:
currentSortOrder
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-06-24 14:34:38 UTC (rev 9194)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-06-24 14:36:35 UTC (rev 9195)
@@ -79,7 +79,7 @@
</h:selectOneRadio>
<h:outputText value="sortOrder"></h:outputText>
- <h:selectOneRadio value="#{dataScroller.sortOrder}">
+ <h:selectOneRadio value="#{dataScroller.currentSortOrder}">
<f:selectItem itemLabel="ASCENDING" itemValue="ASCENDING"/>
<f:selectItem itemLabel="DESCENDING" itemValue="DESCENDING"/>
<f:selectItem itemLabel="UNSORTED" itemValue="UNSORTED"/>
15 years, 10 months
JBoss Rich Faces SVN: r9194 - in trunk/test-applications/facelets/src/main: webapp/DataScroller and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-06-24 10:34:38 -0400 (Tue, 24 Jun 2008)
New Revision: 9194
Modified:
trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java
trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml
trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml
Log:
dataScroller with dataTable supported sorting & filtering features
Modified: trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:24:45 UTC (rev 9193)
+++ trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:34:38 UTC (rev 9194)
@@ -5,6 +5,7 @@
import javax.faces.event.ActionEvent;
import org.richfaces.event.DataScrollerEvent;
+import org.richfaces.model.Ordering;
public class DataScroller {
@@ -19,8 +20,56 @@
public int maxPages;
private String action;
private String actionListener;
+ private String sortMode;
+ private boolean selfSorted;
+ private Ordering sortOrder;
+ private String filterValue;
+ private String currentSortOrder;
- public String act() {
+ public String getSortMode() {
+ return sortMode;
+ }
+
+ public void setSortMode(String sortMode) {
+ this.sortMode = sortMode;
+ }
+
+ public boolean isSelfSorted() {
+ return selfSorted;
+ }
+
+ public void setSelfSorted(boolean selfSorted) {
+ this.selfSorted = selfSorted;
+ }
+
+ public Ordering getSortOrder() {
+ return sortOrder;
+ }
+
+ public void setSortOrder(Ordering sortOrder) {
+ this.sortOrder = sortOrder;
+ }
+
+ public String getFilterValue() {
+ return filterValue;
+ }
+
+ public void setFilterValue(String filterValue) {
+ this.filterValue = filterValue;
+ }
+
+ public String getCurrentSortOrder() {
+ return currentSortOrder;
+ }
+
+ public void setCurrentSortOrder(String currentSortOrder) {
+ if("DESCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.DESCENDING;
+ else if("UNSORTED".equals(currentSortOrder)) this.sortOrder = Ordering.UNSORTED;
+ else if("ASCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.ASCENDING;
+ this.currentSortOrder = currentSortOrder;
+ }
+
+ public String act() {
action = "action work!";
return null;
}
@@ -71,8 +120,10 @@
align = "left";
maxPages = 20;
limitToList = false;
-
-
+ filterValue = "";
+ selfSorted = true;
+ sortOrder = Ordering.ASCENDING;
+ sortMode = "single";
dataTable = new ArrayList();
for(int i=0;i<1000;i++)
Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-06-24 14:24:45 UTC (rev 9193)
+++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-06-24 14:34:38 UTC (rev 9194)
@@ -1,9 +1,11 @@
<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" 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">
- <rich:dataTable id="dataTableId" value="#{dataScroller.dataTable}"
+ <rich:dataTable id="dataTableId" value="#{dataScroller.dataTable}" sortMode="#{dataScroller.sortMode}"
var="dT" cellpadding="5px" rows="5" border="1">
<f:facet name="header">
- <rich:datascroller inactiveStyle="#{style.inactiveStyle}" inactiveStyleClass="#{style.inactiveStyleClass}" selectedStyle="#{style.selectedStyle}" selectedStyleClass="#{style.selectedStyleClass}" style="#{style.style}" styleClass="#{style.styleClass}" tableStyle="#{style.tableStyle}" tableStyleClass="#{style.tableStyleClass}"
+ <rich:datascroller inactiveStyle="#{style.inactiveStyle}" inactiveStyleClass="#{style.inactiveStyleClass}"
+ selectedStyle="#{style.selectedStyle}" selectedStyleClass="#{style.selectedStyleClass}" style="#{style.style}"
+ styleClass="#{style.styleClass}" tableStyle="#{style.tableStyle}" tableStyleClass="#{style.tableStyleClass}"
fastControls="#{dataScroller.fastControls}" action="#{dataScroller.act}" actionListener="#{dataScroller.actListener}"
align="#{dataScroller.align}" rendered="#{dataScroller.render}"
limitToList="#{dataScroller.limitToList}"
@@ -15,14 +17,17 @@
onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
onmousedown="#{event.onmousedown}"
onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
- onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"/>
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
+ </rich:datascroller>
</f:facet>
- <h:column>
+ <rich:column sortBy="#{dT.data0}" filterBy="#{dT.data0}" filterEvent="onchange"
+ selfSorted="#{dataScroller.selfSorted}" sortOrder="#{dataScroller.sortOrder}" filterValue="#{dataScroller.filterValue}">
<h:outputText value="#{dT.data0}" />
- </h:column>
- <h:column>
- <h:outputText value="#{dT.data1} " /> <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
- </h:column>
+ </rich:column>
+ <rich:column sortBy="#{dT.data1}" filterBy="#{dT.data1}" filterEvent="onchange"
+ sortOrder="#{dataScroller.sortOrder}">
+ <h:outputText value="#{dT.data1} " />
+ </rich:column>
</rich:dataTable>
<h:panelGrid id="dataScrollerActionID" columns="1">
<a4j:commandButton value="Show action" reRender="dataScrollerActionID" style=" width : 95px;"></a4j:commandButton>
Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-06-24 14:24:45 UTC (rev 9193)
+++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-06-24 14:34:38 UTC (rev 9194)
@@ -38,5 +38,25 @@
<f:selectItem itemLabel="center" itemValue="center" />
<a4j:support event="onclick" reRender="dataTableId"></a4j:support>
</h:selectOneRadio>
+
+ <h:outputText value="sortMode"></h:outputText>
+ <h:selectOneRadio value="#{dataScroller.sortMode}">
+ <f:selectItem itemLabel="single" itemValue="single"/>
+ <f:selectItem itemLabel="multi" itemValue="multi"/>
+ <a4j:support event="onchange" reRender="dataTableId,dsID"></a4j:support>
+ </h:selectOneRadio>
+
+ <h:outputText value="sortOrder"></h:outputText>
+ <h:selectOneRadio value="#{dataScroller.currentSortOrder}">
+ <f:selectItem itemLabel="ASCENDING" itemValue="ASCENDING"/>
+ <f:selectItem itemLabel="DESCENDING" itemValue="DESCENDING"/>
+ <f:selectItem itemLabel="UNSORTED" itemValue="UNSORTED"/>
+ <a4j:support event="onchange" reRender="dataTableId,dsID"></a4j:support>
+ </h:selectOneRadio>
+
+ <h:outputText value="selfSorted(1st)"></h:outputText>
+ <h:selectBooleanCheckbox value="#{dataScroller.selfSorted}">
+ <a4j:support event="onchange" reRender="dataTableId,dsID"></a4j:support>
+ </h:selectBooleanCheckbox>
</h:panelGrid>
</f:subview>
\ No newline at end of file
15 years, 10 months
JBoss Rich Faces SVN: r9193 - in trunk/test-applications/jsp/src/main: webapp/DataScroller and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-06-24 10:24:45 -0400 (Tue, 24 Jun 2008)
New Revision: 9193
Modified:
trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
Log:
dataScroller sorting & filtering features
Modified: trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:20:15 UTC (rev 9192)
+++ trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-06-24 14:24:45 UTC (rev 9193)
@@ -6,7 +6,10 @@
import org.richfaces.component.html.HtmlDatascroller;
import org.richfaces.event.DataScrollerEvent;
+import org.richfaces.model.Ordering;
+import util.data.Data;
+
public class DataScroller {
private ArrayList dataTable;
@@ -27,8 +30,45 @@
private String page = "10";
private Object value = null;
private String stepControls = "auto";
+ private String sortMode;
+ private boolean selfSorted;
+ private Ordering sortOrder;
+ private String filterValue;
+ private String currentSortOrder;
- public String act() {
+ public String getSortMode() {
+ return sortMode;
+ }
+
+ public void setSortMode(String sortMode) {
+ this.sortMode = sortMode;
+ }
+
+ public boolean isSelfSorted() {
+ return selfSorted;
+ }
+
+ public void setSelfSorted(boolean selfSorted) {
+ this.selfSorted = selfSorted;
+ }
+
+ public String getFilterValue() {
+ return filterValue;
+ }
+
+ public void setFilterValue(String filterValue) {
+ this.filterValue = filterValue;
+ }
+
+ public Ordering getSortOrder() {
+ return sortOrder;
+ }
+
+ public String getCurrentSortOrder() {
+ return currentSortOrder;
+ }
+
+ public String act() {
action = "action work!";
return null;
}
@@ -80,6 +120,10 @@
maxPages = 20;
limitToList = false;
+ filterValue = "";
+ sortMode = "single";
+ sortOrder = Ordering.ASCENDING;
+ selfSorted = true;
dataTable = new ArrayList();
@@ -90,6 +134,13 @@
}
+ public void setCurrentSortOrder(String currentSortOrder) {
+ if("DESCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.DESCENDING;
+ else if("UNSORTED".equals(currentSortOrder)) this.sortOrder = Ordering.UNSORTED;
+ else if("ASCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.ASCENDING;
+ this.currentSortOrder = currentSortOrder;
+ }
+
public void CutArray(){
int k = dataTable.size()-1;
for(int i = k ;i > (k+1)/2; i--)
@@ -298,4 +349,8 @@
public void setStepControls(String stepControls) {
this.stepControls = stepControls;
}
+
+ public void setSortOrder(Ordering sortOrder) {
+ this.sortOrder = sortOrder;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-06-24 14:20:15 UTC (rev 9192)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-06-24 14:24:45 UTC (rev 9193)
@@ -6,7 +6,7 @@
<f:subview id="DataScrollerSubviewID">
<rich:dataTable id="dataTableId" value="#{dataScroller.dataTable}"
- var="dT" cellpadding="5px" rows="5" border="1">
+ var="dT" cellpadding="5px" rows="5" border="1" reRender="dsID" sortMode="#{dataScroller.sortMode}">
<f:facet name="header">
<rich:datascroller ajaxSingle="#{dataScroller.ajaxSingle}"
boundaryControls="#{dataScroller.boundaryControls}"
@@ -26,20 +26,20 @@
onmousedown="#{event.onmousedown}"
onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
- <f:facet name="pages">
- <h:outputText value="#{index} / #{pages}" />
- </f:facet>
+
</rich:datascroller>
</f:facet>
<f:facet name="footer">
</f:facet>
- <h:column>
- <h:outputText value="#{dT.data0}" />
- </h:column>
- <h:column>
- <h:outputText value="#{dT.data1} " /> <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
- </h:column>
+ <rich:column sortBy="#{dT.str0}" filterBy="#{dT.str0}" filterEvent="onchange"
+ selfSorted="#{dataScroller.selfSorted}" sortOrder="#{dataScroller.sortOrder}" filterValue="#{dataScroller.filterValue}">
+ <h:outputText value="#{dT.str0}" />
+ </rich:column>
+ <rich:column sortBy="#{dT.int0}" filterBy="#{dT.int0}" filterEvent="onchange"
+ sortOrder="#{dataScroller.sortOrder}">
+ <h:outputText value="#{dT.int0} " />
+ </rich:column>
</rich:dataTable>
<h:panelGrid id="dataScrollerActionID" columns="1">
<a4j:commandButton value="Show action" reRender="dataScrollerActionID" style=" width : 95px;"></a4j:commandButton>
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-06-24 14:20:15 UTC (rev 9192)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-06-24 14:24:45 UTC (rev 9193)
@@ -62,13 +62,33 @@
<h:outputText value="value"></h:outputText>
<h:outputText value="#{dataScroller.value}"></h:outputText>
-
+
<h:outputText value="stepControls"></h:outputText>
<h:selectOneRadio value="#{dataScroller.stepControls}">
<f:selectItem itemLabel="auto" itemValue="auto" />
<f:selectItem itemLabel="show" itemValue="show" />
<f:selectItem itemLabel="hide" itemValue="hide" />
- <a4j:support event="onclick" reRender="dataTableId"></a4j:support>
+ <a4j:support event="onclick" reRender="dataTableId,dsID"></a4j:support>
</h:selectOneRadio>
+
+ <h:outputText value="sortMode"></h:outputText>
+ <h:selectOneRadio value="#{dataScroller.sortMode}">
+ <f:selectItem itemLabel="single" itemValue="single"/>
+ <f:selectItem itemLabel="multi" itemValue="multi"/>
+ <a4j:support event="onchange" reRender="dataTableId,dsID"></a4j:support>
+ </h:selectOneRadio>
+
+ <h:outputText value="sortOrder"></h:outputText>
+ <h:selectOneRadio value="#{dataScroller.sortOrder}">
+ <f:selectItem itemLabel="ASCENDING" itemValue="ASCENDING"/>
+ <f:selectItem itemLabel="DESCENDING" itemValue="DESCENDING"/>
+ <f:selectItem itemLabel="UNSORTED" itemValue="UNSORTED"/>
+ <a4j:support event="onchange" reRender="dataTableId,dsID"></a4j:support>
+ </h:selectOneRadio>
+
+ <h:outputText value="selfSorted(1st)"></h:outputText>
+ <h:selectBooleanCheckbox value="#{dataScroller.selfSorted}">
+ <a4j:support event="onchange" reRender="dataTableId,dsID"></a4j:support>
+ </h:selectBooleanCheckbox>
</h:panelGrid>
</f:subview>
\ No newline at end of file
15 years, 10 months
JBoss Rich Faces SVN: r9192 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-06-24 10:20:15 -0400 (Tue, 24 Jun 2008)
New Revision: 9192
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
refactoring
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-06-24 14:12:53 UTC (rev 9191)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-24 14:20:15 UTC (rev 9192)
@@ -622,10 +622,6 @@
var newEntry = new FileUploadEntry(elt, this);
this.entries.push(newEntry);
- if (this.events.onadd) {
- this.element.fire("rich:onadd", { entry : newEntry });
- }
-
if (this.runUpload) {
newEntry.setState(FileUploadEntry.READY);
} else {
@@ -639,6 +635,12 @@
newUpload.value = '';
this.currentInput = newUpload;
elt.parentNode.appendChild(newUpload);
+
+ if (this.events.onadd) {
+ var filesArray = [];
+ filesArray.push(newEntry);
+ this.element.fire("rich:onadd", { files : filesArray });
+ }
if (this.runUpload) {
this.upload();
@@ -1089,16 +1091,15 @@
_flashAdd: function(files) {
if (this.disabled) return;
+ var filesArray = [];
for (var i=this.entries.length; i<files.length;i++)
{
this.currentInput.value = files[i].name;
this.createFrame();
var newEntry = new FileUploadEntry(this.currentInput, this);
this.entries.push(newEntry);
+ filesArray.push(newEntry);
- if (this.events.onadd) {
- this.element.fire("rich:onadd", { entry : newEntry });
- }
if (this.runUpload) {
newEntry.setState(FileUploadEntry.READY);
@@ -1115,10 +1116,14 @@
this.currentInput.parentNode.appendChild(newUpload);
this.currentInput = newUpload;
}
+
+ if (this.events.onadd) {
+ this.element.fire("rich:onadd", { files : filesArray });
+ }
- /*if (this.runUpload) {
+ if (this.runUpload) {
this.upload();
- }*/
+ }
},
_flashRemoveFile: function(index)
15 years, 10 months
JBoss Rich Faces SVN: r9191 - trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-06-24 10:12:53 -0400 (Tue, 24 Jun 2008)
New Revision: 9191
Modified:
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java
Log:
Changes reverted
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java 2008-06-24 14:12:46 UTC (rev 9190)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java 2008-06-24 14:12:53 UTC (rev 9191)
@@ -5,6 +5,6 @@
public class ListShuttleIconCopyAllDisabled extends ListShuttleIconCopyAll {
protected Object getDataToStore(FacesContext context, Object data) {
return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR,
- DISABLED_BORDER_COLOR, data);
+ DISABLED_BORDER_COLOR);
}
}
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java 2008-06-24 14:12:46 UTC (rev 9190)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java 2008-06-24 14:12:53 UTC (rev 9191)
@@ -5,6 +5,6 @@
public class ListShuttleIconCopyDisabled extends ListShuttleIconCopy {
protected Object getDataToStore(FacesContext context, Object data) {
return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR,
- DISABLED_BORDER_COLOR, data);
+ DISABLED_BORDER_COLOR);
}
}
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java 2008-06-24 14:12:46 UTC (rev 9190)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java 2008-06-24 14:12:53 UTC (rev 9191)
@@ -5,6 +5,6 @@
public class ListShuttleIconRemoveAllDisabled extends ListShuttleIconRemoveAll {
protected Object getDataToStore(FacesContext context, Object data) {
return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR,
- DISABLED_BORDER_COLOR, data);
+ DISABLED_BORDER_COLOR);
}
}
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java 2008-06-24 14:12:46 UTC (rev 9190)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java 2008-06-24 14:12:53 UTC (rev 9191)
@@ -5,6 +5,6 @@
public class ListShuttleIconRemoveDisabled extends ListShuttleIconRemove {
protected Object getDataToStore(FacesContext context, Object data) {
return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR,
- DISABLED_BORDER_COLOR, data);
+ DISABLED_BORDER_COLOR);
}
}
15 years, 10 months