Author: andrei_exadel Date: 2008-04-01 08:18:51 -0400 (Tue, 01 Apr 2008) New Revision: 7527 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: make single ajax requests from fileupload and progressBar 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-01 12:18:29 UTC (rev 7526) +++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-04-01 12:18:51 UTC (rev 7527) @@ -376,6 +376,7 @@ try { AjaxContext ajaxContext = AjaxContextImpl .getCurrentInstance(context); + ajaxContext.setAjaxSingleClientId(fileUpload.getClientId(context)); ajaxContext.setAjaxRequest(true); } catch (Exception e) { e.getMessage(); @@ -422,6 +423,7 @@ parameters.put("action", action); parameters.put(Filter.UPLOAD_FILES_ID, new JSReference("uid")); parameters.put(clientId, clientId); + parameters.put(AjaxRendererUtils.AJAX_SINGLE_ATTR, clientId); if (oncomplete != null) { options.put("onbeforedomupdate", oncomplete); } 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-01 12:18:29 UTC (rev 7526) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-04-01 12:18:51 UTC (rev 7527) @@ -923,7 +923,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; + parentForm.action = oldAction + (/\?/.test(oldAction) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid) + "&id=" + this.id;// + "&ajaxSingle=" + this.id; try { var inputs = parentForm.elements; @@ -936,18 +936,10 @@ for (var i = 0; i < l; i++) { var input = inputs[i]; if (input != entryInput) { - if ('hidden' != input.type) { - - //FIXME: simulate ajax single request after it will be possible - //input._name = input.name; - //input.name = undefined; - - //TODO for test if ('file' == input.type) { input._disabled = input.disabled; input.disabled = true; } - } } } @@ -965,15 +957,10 @@ for (var i = 0; i < l; i++) { var input = inputs[i]; - if ('hidden' != input.type) { - //input.name = input._name; - //input._name = undefined; - if ('file' == input.type) { input.disabled = input._disabled; input._disabled = undefined; } - } } } finally { parentForm.action = oldAction;