Author: andrei_exadel
Date: 2008-06-17 05:03:01 -0400 (Tue, 17 Jun 2008)
New Revision: 9067
Modified:
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
RF-3610
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-06-17 08:33:51 UTC
(rev 9066)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-06-17 09:03:01 UTC
(rev 9067)
@@ -115,12 +115,12 @@
<description>CSS style for upload button disabled</description>
</property>
<property>
- <name>cancelButtonClass</name>
+ <name>stopButtonClass</name>
<classname>java.lang.String</classname>
<description>CSS style for cancel button</description>
</property>
<property>
- <name>cancelButtonClassDisabled</name>
+ <name>stopButtonClassDisabled</name>
<classname>java.lang.String</classname>
<description>CSS style for cancel button disabled</description>
</property>
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-17
08:33:51 UTC (rev 9066)
+++
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-17
09:03:01 UTC (rev 9067)
@@ -816,7 +816,7 @@
}else {
d1.onclick = function() { return this.upload();}.bind(this);
}
- this._updateClassNames(d1, d2, (this.runUpload) ? this.classes.CANCEL :
this.classes.UPDATE, (this.runUpload) ? this.classes.CANCEL_CONTENT :
this.classes.UPDATE_CONTENT);
+ this._updateClassNames(d1, d2, (this.runUpload) ? this.classes.STOP :
this.classes.UPDATE, (this.runUpload) ? this.classes.STOP_CONTENT :
this.classes.UPDATE_CONTENT);
},
_updateClassNames: function (d1,d2,buttonClass,buttonContentClass) {
Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-06-17
08:33:51 UTC (rev 9066)
+++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-06-17
09:03:01 UTC (rev 9067)
@@ -137,13 +137,13 @@
ENABLED : 'rich-fileupload-button-content rich-fileupload-font
rich-fileupload-ico rich-fileupload-ico-start
#{component.attributes["uploadButtonClass"]}',
DISABLED : 'rich-fileupload-button-content rich-fileupload-font
rich-fileupload-ico rich-fileupload-ico-start-dis
#{component.attributes["uploadButtonClassDisabled"]}'
},
- CANCEL : {
- ENABLED : 'rich-fileupload-button rich-fileupload-font
#{component.attributes["cancelButtonClass"]}',
- DISABLED : 'rich-fileupload-button-dis rich-fileupload-font
#{component.attributes["cancelButtonClassDisabled"]}'
+ STOP : {
+ ENABLED : 'rich-fileupload-button rich-fileupload-font
#{component.attributes["stopButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font
#{component.attributes["stopButtonClassDisabled"]}'
},
- CANCEL_CONTENT : {
- ENABLED : 'rich-fileupload-button-content rich-file-upload-font
rich-fileupload-ico rich-fileupload-ico-stop
#{component.attributes["cancelButtonClass"]}',
- DISABLED : 'rich-fileupload-button-content rich-file-upload-font
rich-fileupload-ico rich-fileupload-ico-stop-dis
#{component.attributes["cancelButtonClassDisabled"]}'
+ STOP_CONTENT : {
+ ENABLED : 'rich-fileupload-button-content rich-file-upload-font
rich-fileupload-ico rich-fileupload-ico-stop
#{component.attributes["stopButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-content rich-file-upload-font
rich-fileupload-ico rich-fileupload-ico-stop-dis
#{component.attributes["stopButtonClassDisabled"]}'
},
CLEAN : {
ENABLED : 'rich-fileupload-button rich-fileupload-font
#{component.attributes["cleanButtonClass"]}',
Show replies by date