Author: andrei_exadel Date: 2008-07-21 04:13:24 -0400 (Mon, 21 Jul 2008) New Revision: 9695 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-3951 Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-07-18 17:37:17 UTC (rev 9694) +++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-07-21 08:13:24 UTC (rev 9695) @@ -391,8 +391,7 @@ UIFileUpload fileUpload) { storeData(context, fileUpload, file); try { - AjaxContext ajaxContext = AjaxContextImpl - .getCurrentInstance(context); + AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); if ((Boolean)fileUpload.getAttributes().get(AjaxRendererUtils.AJAX_SINGLE_ATTR)) { ajaxContext.setAjaxSingleClientId(fileUpload.getClientId(context)); } 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-07-18 17:37:17 UTC (rev 9694) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-07-21 08:13:24 UTC (rev 9695) @@ -1102,7 +1102,7 @@ _flashSetComponent: function() { var flashId = this.id+":flashContainer"; - this.flashComponent = (document[flashId]) ? document[flashId] : window[flashId]; + this.flashComponent = (document[flashId]) ? document[flashId] : (window[flashId] ? window[flashId] : $(flashId)); this.flashComponent.setProperties({ acceptedTypes: this.acceptedTypes, noDuplicate: this.options.noDuplicate,