Author: konstantin.mishin Date: 2010-12-01 11:17:30 -0500 (Wed, 01 Dec 2010) New Revision: 20256 Modified: sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml Log: RF-9496 Modified: sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2010-12-01 16:16:19 UTC (rev 20255) +++ sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2010-12-01 16:17:30 UTC (rev 20256) @@ -44,7 +44,7 @@ overflow-y: auto; } -.rf-fu-frm { +.rf-fu-cntr-hdn { display: none; } Modified: sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js 2010-12-01 16:16:19 UTC (rev 20255) +++ sandbox/trunk/ui/fileupload/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js 2010-12-01 16:17:30 UTC (rev 20256) @@ -62,9 +62,10 @@ this.inputContainer = this.addButton.find(".rf-fu-inp-cntr:first"); this.input = this.inputContainer.children("input"); this.list = header.next(); - this.progressBarElement = this.list.next(); + this.hiddenContainer = this.list.next(); + this.iframe = this.hiddenContainer.children("iframe:first"); + this.progressBarElement = this.iframe.next(); this.progressBar = richfaces.$(this.progressBarElement); - this.iframe = this.progressBarElement.next(); this.cleanInput = this.input.clone(); this.addProxy = jQuery.proxy(this.__addItem, this); this.input.change(this.addProxy); @@ -232,15 +233,18 @@ this.fileUpload.__submit(); var params = {}; params[UID] = this.uid; - this.fileUpload.progressBar.setValue(0); - this.state.html(this.fileUpload.progressBarElement.detach()); - this.fileUpload.progressBar.enable(params); + if (this.fileUpload.progressBar) { + this.fileUpload.progressBar.setValue(0); + this.state.html(this.fileUpload.progressBarElement.detach()); + this.fileUpload.progressBar.enable(params); + } }, finishUploading: function() { - this.fileUpload.progressBar.disable(); - this.fileUpload.progressBar.setValue(101); - this.fileUpload.element.append(this.fileUpload.progressBarElement.detach()); + if (this.fileUpload.progressBar) { + this.fileUpload.progressBar.disable(); + this.fileUpload.hiddenContainer.append(this.fileUpload.progressBarElement.detach()); + } this.input.remove(); this.state.html("Done"); this.link.html("Clear"); Modified: sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-12-01 16:16:19 UTC (rev 20255) +++ sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-12-01 16:17:30 UTC (rev 20256) @@ -69,11 +69,13 @@ </div> <div class="rf-fu-lst"/> <c:if test="#{enabled}"> - <cdk:object name="progressBar" value="#{component.facets['progress']}"/> - <c:if test="#{progressBar.isRendered()}"> - <cdk:call expression="progressBar.encodeAll(facesContext)" /> - </c:if> - <iframe name="#{clientId}" class="rf-fu-frm"/> + <div class="rf-fu-cntr-hdn"> + <iframe name="#{clientId}"/> + <cdk:object name="progressBar" value="#{component.facets['progress']}"/> + <c:if test="#{progressBar.isRendered()}"> + <cdk:call expression="progressBar.encodeAll(facesContext)" /> + </c:if> + </div> <cdk:scriptObject name="options"> <cdk:scriptOption attributes="acceptedTypes noDuplicate onfilesubmit onuploadcomplete"/> </cdk:scriptObject>