Index: branches/RC/core/admin_templates/js/uploader.js =================================================================== diff -u -N -r9334 -r9337 --- branches/RC/core/admin_templates/js/uploader.js (.../uploader.js) (revision 9334) +++ branches/RC/core/admin_templates/js/uploader.js (.../uploader.js) (revision 9337) @@ -15,9 +15,9 @@ { var holder = document.createElement('DIV'); document.body.appendChild(holder); - + document.getElementById($form_name).style.display = 'block'; - + // moving out progress div to overcome loosing of flash object after setting opacity this.div = document.getElementById(this.id+'_progress'); var clone = this.div.cloneNode(true); @@ -155,12 +155,11 @@ return false; } - Uploader.prototype.StartUpload = function() { if (!this.HasQueue()) return; - Request.setOpacity(30, Form.Div); + Request.setOpacity(30, UploadsManager.getFromContainer()); if (!document.all) { var $winW = window.innerWidth; @@ -277,8 +276,8 @@ UploadsManager = new UploadsManager(); UploadsManager.Uploaders = new Object(); UploadsManager.nextId = 0; +UploadsManager.formContainerId = ''; - UploadsManager.NextFlashId = function() { this.nextId++; @@ -290,6 +289,15 @@ this.Uploaders[id] = new Uploader(id, params); } +UploadsManager.getFromContainer = function() +{ + if (UploadsManager.formContainerId) { + return document.getElementById(UploadsManager.formContainerId); + } + + return Form.Div; +} + UploadsManager.InitAll = function() { for (var i in this.Uploaders) { @@ -425,7 +433,7 @@ UploadsManager.UploadQueueComplete = function(file) { - Request.setOpacity(100, Form.Div); + Request.setOpacity(100, UploadsManager.getFromContainer()); var all_done = true; for (var i in this.Uploaders) { this.Uploaders[i].div.style.display='none'; Index: branches/RC/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r9334 -r9337 --- branches/RC/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 9334) +++ branches/RC/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 9337) @@ -269,6 +269,7 @@ IconPath: '../../admin/editor/cmseditor/editor/images' } ) + UploadsManager.formContainerId = 'scroll_container';