[richfaces-svn-commits] JBoss Rich Faces SVN: r6446 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/renderkit and 2 other directories.

Author: andrei_exadel Date: 2008-02-29 07:44:05 -0500 (Fri, 29 Feb 2008) New Revision: 6446 Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 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/web/MultipartFilter.java trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: refactoring; fix some bugs Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-29 12:44:05 UTC (rev 6446) @@ -202,7 +202,9 @@ FacesContext facesContext = FacesContext.getCurrentInstance(); ExternalContext externalContext = facesContext.getExternalContext(); HttpServletRequest request = (HttpServletRequest) externalContext.getRequest(); - if ("progress".equals(request.getParameter("action"))) { + if ("progress".equals(request.getParameter("action")) + && request.getParameterMap().containsKey( + this.getClientId(facesContext))) { AjaxContext ajaxContext = AjaxContextImpl.getCurrentInstance(facesContext); String uid = request.getParameter("uid"); 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-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-29 12:44:05 UTC (rev 6446) @@ -150,10 +150,12 @@ String action, Object oncomplete) throws IOException { JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction( component, context); + String clientId = component.getClientId(context); Map options = AjaxRendererUtils.buildEventOptions(context, component); Map parameters = (Map) options.get("parameters"); parameters.put("action", action); parameters.put("uid", new JSReference("uid")); + parameters.put(clientId, clientId); if (oncomplete != null) { options.put("onbeforedomupdate", oncomplete); } Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-29 12:44:05 UTC (rev 6446) @@ -130,12 +130,11 @@ MultipartRequest multipartRequest = sessions.get(uid); if (multipartRequest != null) { multipartRequest.stop(); + HttpServletResponse httpResponse = (HttpServletResponse) response; + httpResponse.setStatus(HttpServletResponse.SC_NO_CONTENT); + httpResponse.getOutputStream().close(); } } - - HttpServletResponse httpResponse = (HttpServletResponse) response; - httpResponse.setStatus(HttpServletResponse.SC_NO_CONTENT); - httpResponse.getOutputStream().close(); } else { chain.doFilter(request, response); } 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-29 11:58:05 UTC (rev 6445) +++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-29 12:44:05 UTC (rev 6446) @@ -845,6 +845,7 @@ var entryInput = entry.fileInput; entryInput.name = this.id + ":file"; + entryInput.disabled = false; var l = inputs.length; for (var i = 0; i < l; i++) {