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); } }