JBoss Rich Faces SVN: r10579 - trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-09-26 11:02:22 -0400 (Fri, 26 Sep 2008)
New Revision: 10579
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
Log:
add mergeStyles function https://jira.jboss.org/jira/browse/RF-4280
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2008-09-26 14:33:23 UTC (rev 10578)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2008-09-26 15:02:22 UTC (rev 10579)
@@ -2,6 +2,18 @@
window.Richfaces = {};
}
+Richfaces.mergeStyles = function(userStyles,commonStyles) {
+ var i;
+ for(i in userStyles) {
+ if (typeof userStyles[i] == "object") {
+ this.mergeStyles(userStyles[i],commonStyles[i]);
+ } else {
+ commonStyles[i] += " " + userStyles[i];
+ }
+ }
+ return commonStyles;
+};
+
Richfaces.getComputedStyle = function(eltId, propertyName) {
var elt = $(eltId);
16 years, 3 months
JBoss Rich Faces SVN: r10578 - trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-26 10:33:23 -0400 (Fri, 26 Sep 2008)
New Revision: 10578
Modified:
trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp
trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-09-26 14:33:10 UTC (rev 10577)
+++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-09-26 14:33:23 UTC (rev 10578)
@@ -63,7 +63,12 @@
border="#{extendedDataTableControlBean.border}"
cellpadding="#{extendedDataTableControlBean.cellpadding}"
cellspacing="#{extendedDataTableControlBean.cellspacing}"
- dir="#{extendedDataTableControlBean.dir}">
+ dir="#{extendedDataTableControlBean.dir}"
+ first="#{extendedDataTableControlBean.first}"
+ frame="#{extendedDataTableControlBean.frame}"
+ groupingColumn="#{extendedDataTableControlBean.groupingColumn}"
+ rendered="#{extendedDataTableControlBean.rendered}"
+ sortPriority="#{extendedDataTableControlBean.sortPriority}">
<rich:column id="firstName" headerClass="dataTableHeader" width="25%"
label="#{msg['patient.firstName']}" sortable="true"
sortBy="#{patient.firstName}" filterBy="#{patient.firstName}"
Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-09-26 14:33:10 UTC (rev 10577)
+++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-09-26 14:33:23 UTC (rev 10578)
@@ -81,6 +81,35 @@
<a4j:support event="onchange" reRender="demoTable"></a4j:support>
</h:selectOneRadio>
+ <h:outputText value="first" />
+ <h:inputText value="#{extendedDataTableControlBean.first}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="frame" />
+ <h:panelGroup>
+ <h:inputText value="#{extendedDataTableControlBean.frame}"
+ id="inputFrame">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+ <h:outputLabel value="\"
+ void\", \"above\", \"below\", \"hsides\", \"lhs\", \"rhs\", \"vsides\", \"box\" and \"border\"" for="inputFrame" />
+ </h:panelGroup>
+
+ <h:outputText value="groupingColumn" />
+ <h:inputText value="#{extendedDataTableControlBean.groupingColumn}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="rendered" />
+ <h:selectBooleanCheckbox
+ value="#{extendedDataTableControlBean.rendered}" onclick="submit()" />
+
+ <h:outputText value="sortPriority" />
+ <h:inputText value="#{extendedDataTableControlBean.sortPriority}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
</h:panelGrid>
<br />
<h:commandButton value="add test"
16 years, 3 months
JBoss Rich Faces SVN: r10577 - trunk/test-applications/jsp/src/main/java/extendedDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-26 10:33:10 -0400 (Fri, 26 Sep 2008)
New Revision: 10577
Modified:
trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java 2008-09-26 14:05:00 UTC (rev 10576)
+++ trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java 2008-09-26 14:33:10 UTC (rev 10577)
@@ -26,8 +26,53 @@
private String cellpadding;
private String cellspacing;
private String dir;
+ private int first;
+ private String frame;
+ private String groupingColumn;
+ private boolean rendered;
+ private String sortPriority;
- public String getDir() {
+ public String getSortPriority() {
+ return sortPriority;
+ }
+
+ public void setSortPriority(String sortPriority) {
+ this.sortPriority = sortPriority;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public String getGroupingColumn() {
+ return groupingColumn;
+ }
+
+ public void setGroupingColumn(String groupingColumn) {
+ this.groupingColumn = groupingColumn;
+ }
+
+ public String getFrame() {
+ return frame;
+ }
+
+ public void setFrame(String frame) {
+ this.frame = frame;
+ }
+
+ public int getFirst() {
+ return first;
+ }
+
+ public void setFirst(int first) {
+ this.first = first;
+ }
+
+ public String getDir() {
return dir;
}
@@ -87,6 +132,9 @@
cellpadding = "1px";
cellspacing = "1px";
dir = "LTR";
+ first = 0;
+ frame = "void";
+ rendered = true;
}
public boolean isPaginated() {
16 years, 3 months
JBoss Rich Faces SVN: r10576 - in trunk/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/swf and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-09-26 10:05:00 -0400 (Fri, 26 Sep 2008)
New Revision: 10576
Modified:
trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
Log:
https://jira.jboss.org/jira/browse/RF-4533
Modified: trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as
===================================================================
--- trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as 2008-09-26 14:04:47 UTC (rev 10575)
+++ trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as 2008-09-26 14:05:00 UTC (rev 10576)
@@ -21,6 +21,7 @@
private var noDuplicate: Boolean;
private var maxFiles: Number;
private var fileTypes: Array;
+ private var uploadIndex: Number;
public function FileUploadComponent() {
this.fileDataList = new Array();
@@ -29,6 +30,7 @@
this.noDuplicate = true;
this.maxFiles = 5;
this.fileTypes = null;
+ this.uploadIndex = -1;
ExternalInterface.addCallback("browse", this, browse);
ExternalInterface.addCallback("setProperties", this, setProperties);
@@ -55,12 +57,15 @@
public function removeFile(index:Number)
{
+ if (index<this.uploadIndex) this.uploadIndex--;
this.fileRefList.splice(index, 1);
this.fileDataList.splice(index, 1);
+ return this.uploadIndex;
}
public function uploadFile(index, actionURL, postData)
{
+ this.uploadIndex = index;
var item: FileReference = fileRefList[index];
if (item)
{
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Rich Faces SVN: r10575 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-26 10:04:47 -0400 (Fri, 26 Sep 2008)
New Revision: 10575
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-4463
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-09-26 13:27:16 UTC (rev 10574)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-09-26 14:04:47 UTC (rev 10575)
@@ -1195,7 +1195,8 @@
_flashRemoveFile: function(index)
{
- this.flashComponent.removeFile(index);
+ //this.flashComponent.removeFile(index);
+ this.uploadIndex = this.flashComponent.removeFile(index);
},
_flashFireEvent: function(eventName, object)
16 years, 3 months
JBoss Rich Faces SVN: r10574 - trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-26 09:27:16 -0400 (Fri, 26 Sep 2008)
New Revision: 10574
Modified:
trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp
trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-09-26 13:27:01 UTC (rev 10573)
+++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-09-26 13:27:16 UTC (rev 10574)
@@ -34,8 +34,7 @@
width: 100%;
height: 100%;
}
-</style>
-
+</style>
<rich:extendedDataTable id="demoTable"
value="#{extendedDataTableBean.dataModel}" var="patient"
style="margin: 0 auto;"
@@ -48,16 +47,11 @@
selection="#{extendedDataTableBean.selection}" rowKeyVar="rkvar"
tableState="#{extendedDataTableBean.tableState}"
binding="#{extendedDataTableControlBean.extDTable}"
- onclick="#{event.onclick}"
- ondblclick="#{event.ondblclick}"
- onkeydown="#{event.onkeydown}"
- onkeypress="#{event.onkeypress}"
- onkeyup="#{event.onkeyup}"
- onmousedown="#{event.onmousedown}"
- onmousemove="#{event.onmousemove}"
- onmouseout="#{event.onmouseout}"
- onmouseover="#{event.onmouseover}"
- onmouseup="#{event.onmouseup}"
+ onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+ onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
onRowClick="#{event.onRowClick}"
onRowDblClick="#{event.onRowDblClick}"
onRowMouseDown="#{event.onRowMouseDown}"
@@ -65,7 +59,11 @@
onRowMouseOut="#{event.onRowMouseOut}"
onRowMouseOver="#{event.onRowMouseOver}"
onRowMouseUp="#{event.onRowMouseUp}"
- onselectionchange="alert('onselectionchange works!')">
+ onselectionchange="#{event.onselectionchange}"
+ border="#{extendedDataTableControlBean.border}"
+ cellpadding="#{extendedDataTableControlBean.cellpadding}"
+ cellspacing="#{extendedDataTableControlBean.cellspacing}"
+ dir="#{extendedDataTableControlBean.dir}">
<rich:column id="firstName" headerClass="dataTableHeader" width="25%"
label="#{msg['patient.firstName']}" sortable="true"
sortBy="#{patient.firstName}" filterBy="#{patient.firstName}"
@@ -74,7 +72,7 @@
<h:outputText value="#{msg['patient.firstName']}" />
</f:facet>
<h:outputText id="text" value="#{patient.firstName}">
- <rich:toolTip value="sasasasasasa"/>
+ <rich:toolTip value="sasasasasasa" />
</h:outputText>
</rich:column>
<rich:column id="lastName" headerClass="dataTableHeader" width="25%"
Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-09-26 13:27:01 UTC (rev 10573)
+++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-09-26 13:27:16 UTC (rev 10574)
@@ -4,79 +4,113 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="extendedDataTablePropertySubviewID">
-
- <h:panelGrid columns="2">
- <h:outputLabel value="#{msg['table.width']}" for="tableWidthInput" />
- <h:inputText
- id="tableWidthInput"
- value="#{extendedDataTableControlBean.width}" />
- <h:outputLabel value="#{msg['table.height']}" for="tableHeightInput" />
- <h:inputText
- id="tableHeightInput"
- value="#{extendedDataTableControlBean.height}" />
- <h:outputLabel value="#{msg['table.patientsNumber']}" for="tablePatientsNumberInput" />
- <h:inputText
- id="tablePatientsNumberInput"
- value="#{extendedDataTableBean.patientsNumber}" />
- <h:outputLabel value="#{msg['table.sortMode']}" for="tableSortModeSelect" />
- <h:selectOneMenu
- id="tableSortModeSelect"
- value="#{extendedDataTableControlBean.sortMode}"
- >
- <f:selectItems value="#{extendedDataTableControlBean.sortModeSelectItems}"/>
- </h:selectOneMenu>
- <h:outputLabel value="#{msg['table.selectionMode']}" for="tableSelectionModeSelect" />
- <h:selectOneMenu
- id="tableSelectionModeSelect"
- value="#{extendedDataTableControlBean.selectionMode}"
- >
- <f:selectItems value="#{extendedDataTableControlBean.selectionModeSelectItems}"/>
- </h:selectOneMenu>
- <h:outputText value="#{msg['table.paginated']}"/>
- <h:selectBooleanCheckbox
- id="paginatedCheckbox"
- value="#{extendedDataTableControlBean.paginated}" />
- <h:outputLabel value="#{msg['table.rowsNumber']}" for="tableRowsNumberInput" />
- <h:inputText
- id="tableRowsNumberInput"
- value="#{extendedDataTableControlBean.rowsNumber}" />
-
- <h:commandButton value="binding" actionListener="#{extendedDataTableControlBean.checkBinding}"/>
- <h:outputText value="#{extendedDataTableControlBean.bindLabel}" id="bindLabel"/>
- </h:panelGrid>
- <br/>
- <h:commandButton value="add test" action="#{extendedDataTableControlBean.addExtDTable}"></h:commandButton>
- <a4j:commandButton value="#{msg['table.update']}" reRender="mainPanel">
- </a4j:commandButton>
- <a4j:commandButton value="#{msg['table.testComponentState']}"
- action="stateTest"
- >
- </a4j:commandButton>
- <br/>
-
- <rich:spacer height="5px" width="100%">
- </rich:spacer>
- <rich:dataTable id="selectedPatients" value="#{extendedDataTableBean.selectedItems}" var="selectedPatient">
- <f:facet name="header">
- <h:outputText value="#{msg['table.selectedPatients']}" />
- </f:facet>
- <rich:column id="selectedFirstName"
- headerClass="dataTableHeader"
- label="#{msg['patient.firstName']}">
- <f:facet name="header">
- <h:outputText value="#{msg['patient.firstName']}" />
- </f:facet>
- <h:outputText value="#{selectedPatient.firstName}" />
- </rich:column>
- <rich:column id="selectedLastName"
- headerClass="dataTableHeader"
- label="#{msg['patient.lastName']}">
- <f:facet name="header">
- <h:outputText value="#{msg['patient.lastName']}" />
- </f:facet>
- <h:outputText value="#{selectedPatient.lastName}" />
- </rich:column>
- </rich:dataTable>
- <rich:messages>
- </rich:messages>
+
+ <h:panelGrid columns="2">
+ <h:outputLabel value="#{msg['table.width']}" for="tableWidthInput" />
+ <h:inputText id="tableWidthInput"
+ value="#{extendedDataTableControlBean.width}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputLabel value="#{msg['table.height']}" for="tableHeightInput" />
+ <h:inputText id="tableHeightInput"
+ value="#{extendedDataTableControlBean.height}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputLabel value="#{msg['table.patientsNumber']}"
+ for="tablePatientsNumberInput" />
+ <h:inputText id="tablePatientsNumberInput"
+ value="#{extendedDataTableBean.patientsNumber}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputLabel value="#{msg['table.sortMode']}"
+ for="tableSortModeSelect" />
+ <h:selectOneMenu id="tableSortModeSelect"
+ value="#{extendedDataTableControlBean.sortMode}">
+ <f:selectItems
+ value="#{extendedDataTableControlBean.sortModeSelectItems}" />
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:selectOneMenu>
+
+ <h:outputLabel value="#{msg['table.selectionMode']}"
+ for="tableSelectionModeSelect" />
+ <h:selectOneMenu id="tableSelectionModeSelect"
+ value="#{extendedDataTableControlBean.selectionMode}">
+ <f:selectItems
+ value="#{extendedDataTableControlBean.selectionModeSelectItems}" />
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:selectOneMenu>
+
+ <h:outputText value="#{msg['table.paginated']}" />
+ <h:selectBooleanCheckbox id="paginatedCheckbox"
+ value="#{extendedDataTableControlBean.paginated}" onclick="submit()" />
+
+ <h:outputLabel value="#{msg['table.rowsNumber']}"
+ for="tableRowsNumberInput" />
+ <h:inputText id="tableRowsNumberInput"
+ value="#{extendedDataTableControlBean.rowsNumber}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:commandButton value="binding"
+ actionListener="#{extendedDataTableControlBean.checkBinding}" />
+ <h:outputText value="#{extendedDataTableControlBean.bindLabel}"
+ id="bindLabel" />
+
+ <h:outputText value="border" />
+ <h:inputText value="#{extendedDataTableControlBean.border}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="cellpadding" />
+ <h:inputText value="#{extendedDataTableControlBean.cellpadding}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="cellspacing" />
+ <h:inputText value="#{extendedDataTableControlBean.cellspacing}">
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="dir" />
+ <h:selectOneRadio value="#{extendedDataTableControlBean.dir}">
+ <f:selectItem itemLabel="RTL" itemValue="RTL" />
+ <f:selectItem itemLabel="LTR" itemValue="LTR" />
+ <a4j:support event="onchange" reRender="demoTable"></a4j:support>
+ </h:selectOneRadio>
+
+ </h:panelGrid>
+ <br />
+ <h:commandButton value="add test"
+ action="#{extendedDataTableControlBean.addExtDTable}"></h:commandButton>
+ <a4j:commandButton value="#{msg['table.update']}" reRender="mainPanel">
+ </a4j:commandButton>
+ <br />
+
+ <rich:spacer height="5px" width="100%">
+ </rich:spacer>
+ <rich:dataTable id="selectedPatients"
+ value="#{extendedDataTableBean.selectedItems}" var="selectedPatient">
+ <f:facet name="header">
+ <h:outputText value="#{msg['table.selectedPatients']}" />
+ </f:facet>
+ <rich:column id="selectedFirstName" headerClass="dataTableHeader"
+ label="#{msg['patient.firstName']}">
+ <f:facet name="header">
+ <h:outputText value="#{msg['patient.firstName']}" />
+ </f:facet>
+ <h:outputText value="#{selectedPatient.firstName}" />
+ </rich:column>
+ <rich:column id="selectedLastName" headerClass="dataTableHeader"
+ label="#{msg['patient.lastName']}">
+ <f:facet name="header">
+ <h:outputText value="#{msg['patient.lastName']}" />
+ </f:facet>
+ <h:outputText value="#{selectedPatient.lastName}" />
+ </rich:column>
+ </rich:dataTable>
+ <rich:messages>
+ </rich:messages>
</f:subview>
\ No newline at end of file
16 years, 3 months
JBoss Rich Faces SVN: r10573 - trunk/test-applications/jsp/src/main/java/extendedDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-26 09:27:01 -0400 (Fri, 26 Sep 2008)
New Revision: 10573
Modified:
trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java 2008-09-26 13:18:57 UTC (rev 10572)
+++ trunk/test-applications/jsp/src/main/java/extendedDataTable/ExtendedDataTableControlBean.java 2008-09-26 13:27:01 UTC (rev 10573)
@@ -21,9 +21,45 @@
private Integer rowsNumber;
private boolean paginated = false;
private HtmlExtendedDataTable extDTable = null;
- private String bindLabel;
+ private String bindLabel;
+ private String border;
+ private String cellpadding;
+ private String cellspacing;
+ private String dir;
- public HtmlExtendedDataTable getExtDTable() {
+ public String getDir() {
+ return dir;
+ }
+
+ public void setDir(String dir) {
+ this.dir = dir;
+ }
+
+ public String getCellpadding() {
+ return cellpadding;
+ }
+
+ public void setCellpadding(String cellpadding) {
+ this.cellpadding = cellpadding;
+ }
+
+ public String getCellspacing() {
+ return cellspacing;
+ }
+
+ public void setCellspacing(String cellspacing) {
+ this.cellspacing = cellspacing;
+ }
+
+ public String getBorder() {
+ return border;
+ }
+
+ public void setBorder(String border) {
+ this.border = border;
+ }
+
+ public HtmlExtendedDataTable getExtDTable() {
return extDTable;
}
@@ -47,6 +83,10 @@
selectionModeSelectItems.add(new SelectItem("multi", "multi"));
selectionModeSelectItems.add(new SelectItem("none", "none"));
bindLabel = "click binding";
+ border = "1px";
+ cellpadding = "1px";
+ cellspacing = "1px";
+ dir = "LTR";
}
public boolean isPaginated() {
16 years, 3 months
JBoss Rich Faces SVN: r10572 - in trunk/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/swf and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-09-26 09:18:57 -0400 (Fri, 26 Sep 2008)
New Revision: 10572
Modified:
trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
Log:
https://jira.jboss.org/jira/browse/RF-4533
Modified: trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as
===================================================================
--- trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as 2008-09-26 12:08:32 UTC (rev 10571)
+++ trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as 2008-09-26 13:18:57 UTC (rev 10572)
@@ -87,10 +87,10 @@
for (var i:Number = 0; i < list.length; i++) {
if (this.fileRefList.length==this.maxFiles) break;
item = list[i];
- /*if (!this.checkFileType(item.type) || !this.checkDuplicated(item.name)) {
+ if (!this.checkFileType(item.name) || !this.checkDuplicated(item.name)) {
ExternalInterface.call(this.getComponentString()+"._flashFireEvent('ontyperejected', {})");
continue;
- }*/
+ }
item.addListener(this);
this.fileRefList.push(item);
this.fileDataList.push("{creationDate: "+this.getJSDateString(item.creationDate)+", creator: '"+item.creator+"', modificationDate: "+this.getJSDateString(item.modificationDate)+", name: '"+item.name+"', size: "+item.size+", type: '"+item.type+"'}");
@@ -132,10 +132,10 @@
}
private function checkFileType (fileType) {
- if (fileType.charAt(0)=='.') fileType = fileType.substr(1);
if (!this.acceptedTypes || this.acceptedTypes['*']) { return true; }
- var type = fileType.toLowerCase();
- if (this.acceptedTypes[type]) {
+ var p:Number = fileType.lastIndexOf('.');
+ if (p!=-1) fileType = fileType.substr(p+1); else fileType="";
+ if (this.acceptedTypes[fileType.toLowerCase()]) {
return true;
}
return false;
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Rich Faces SVN: r10571 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-26 08:08:32 -0400 (Fri, 26 Sep 2008)
New Revision: 10571
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
Log:
Revert last commit
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Rich Faces SVN: r10570 - in trunk/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/swf and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-09-26 07:47:16 -0400 (Fri, 26 Sep 2008)
New Revision: 10570
Modified:
trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
Log:
https://jira.jboss.org/jira/browse/RF-4533
Modified: trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as
===================================================================
--- trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as 2008-09-26 11:47:04 UTC (rev 10569)
+++ trunk/ui/fileUpload/src/main/flash/FileUploadComponent.as 2008-09-26 11:47:16 UTC (rev 10570)
@@ -87,10 +87,10 @@
for (var i:Number = 0; i < list.length; i++) {
if (this.fileRefList.length==this.maxFiles) break;
item = list[i];
- if (!this.checkFileType(item.type) || !this.checkDuplicated(item.name)) {
+ /*if (!this.checkFileType(item.type) || !this.checkDuplicated(item.name)) {
ExternalInterface.call(this.getComponentString()+"._flashFireEvent('ontyperejected', {})");
continue;
- }
+ }*/
item.addListener(this);
this.fileRefList.push(item);
this.fileDataList.push("{creationDate: "+this.getJSDateString(item.creationDate)+", creator: '"+item.creator+"', modificationDate: "+this.getJSDateString(item.modificationDate)+", name: '"+item.name+"', size: "+item.size+", type: '"+item.type+"'}");
@@ -109,13 +109,13 @@
ExternalInterface.call(this.getComponentString()+"._flashOnComplete()");
}
- public function onHTTPError (fileRef:FileReference, httpError:Number) {
+ public function onHTTPError (file:FileReference, httpError:Number): Void {
ExternalInterface.call(this.getComponentString()+"._flashHTTPError("+httpError+")");
}
public function onIOError (file:FileReference) {
ExternalInterface.call(this.getComponentString()+"._flashIOError()");
}
- public function onSecurityError (fileRef:FileReference, errorString:String) {
+ public function onSecurityError (file:FileReference, errorString:String) {
ExternalInterface.call(this.getComponentString()+"._flashOnSecurityError('"+errorString+"')");
}
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/swf/fileUploadComponent.swf
===================================================================
(Binary files differ)
16 years, 3 months