Author: andrei_exadel Date: 2008-02-28 09:07:57 -0500 (Thu, 28 Feb 2008) New Revision: 6410 Modified: trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: delete accept attr; fix; Modified: trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-28 13:58:38 UTC (rev 6409) +++ trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-28 14:07:57 UTC (rev 6410) @@ -66,11 +66,6 @@ &html_input_attributes; &html_events; &html_input_events; - <property transient="true"> - <name>accept</name> - <classname>java.lang.String</classname> - <description>a comma-separated list of content types to accept, may not be supported by the browser. E.g. "images/png,images/jpg", "images/*".</description> - </property> <property elonly="true"> <name>data</name> <classname>java.lang.Object</classname> Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-28 13:58:38 UTC (rev 6409) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-28 14:07:57 UTC (rev 6410) @@ -177,7 +177,7 @@ String acceptedTypes = (String)component.getAttributes().get("acceptedTypes"); if (acceptedTypes != null) { Map<String, Boolean> accepted = new HashMap<String, Boolean>(); - String [] types = acceptedTypes.split("[,;]"); + String [] types = acceptedTypes.split("[,;|]"); if (types != null) { for (String type : types) { accepted.put(type.toLowerCase(), true); Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 13:58:38 UTC (rev 6409) +++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 14:07:57 UTC (rev 6410) @@ -400,6 +400,7 @@ this.options = options || {}; this.initEvents(); this.setupAutoUpload(); + this.checkFrame(); }, createFrame: function () { @@ -414,6 +415,12 @@ return iframe; }, + checkFrame: function () { + this.iframe = $(this.id + "_iframe"); + if (this.iframe) { + this.deleteFrame(); + } + }, deleteFrame: function() { if (this.iframe) {