Author: andrei_exadel Date: 2008-04-04 08:27:00 -0400 (Fri, 04 Apr 2008) New Revision: 7604 Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: RF-2958 Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-04-04 12:26:51 UTC (rev 7603) +++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-04-04 12:27:00 UTC (rev 7604) @@ -98,22 +98,16 @@ @Override @SuppressWarnings("unchecked") protected void doDecode(FacesContext context, UIComponent component) { - UIFileUpload fileUpload = (UIFileUpload) component; ServletRequest request = (ServletRequest) context.getExternalContext() .getRequest(); - - String clientId = component.getClientId(context); - + new AjaxEvent(component).queue(); + + String fileUploadIndicator = request.getParameter(Filter.FILE_UPLOAD_INDICATOR); - Class requestClazz = request.getClass(); - - if (_MULTIPART_REQUEST_CLASS_NAME.equals(requestClazz.getName()) - || "org.jboss.seam.web.MultipartRequest".equals(requestClazz - .getName()) - ||"org.apache.myfaces.webapp.filter.MultipartRequestWrapper".equals(requestClazz - .getName())) { - + if (fileUploadIndicator != null && Boolean.TRUE.toString().equals(fileUploadIndicator)) { + String clientId = component.getClientId(context); + UIFileUpload fileUpload = (UIFileUpload) component; HttpSession session = (HttpSession) context.getExternalContext() .getSession(false); String uid = request.getParameter(Filter.UPLOAD_FILES_ID); 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-04-04 12:26:51 UTC (rev 7603) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-04-04 12:27:00 UTC (rev 7604) @@ -924,7 +924,7 @@ parentForm.encoding = "multipart/form-data"; parentForm.enctype = "multipart/form-data"; parentForm.target = this.id + "_iframe";//this.id; - parentForm.action = oldAction + (/\?/.test(oldAction) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid) + "&id=" + this.id;// + "&ajaxSingle=" + this.id; + parentForm.action = oldAction + (/\?/.test(oldAction) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid) + "&id=" + this.id + "&_richfaces_upload_file_indicator=true"; try { var inputs = parentForm.elements;