Index: branches/RC/core/admin_templates/js/uploader/upload_manager.js =================================================================== diff -u -r10621 -r10623 --- branches/RC/core/admin_templates/js/uploader/upload_manager.js (.../upload_manager.js) (revision 10621) +++ branches/RC/core/admin_templates/js/uploader/upload_manager.js (.../upload_manager.js) (revision 10623) @@ -1,6 +1,10 @@ -function UploadsManager() { +function UploadsManager($use_toolbar) { // hooking to standard toolbar select button to peform auto-upload when Save is clicked - if (isset(a_toolbar)) { + if (!isset($use_toolbar)) { + $use_toolbar = true; + } + + if ($use_toolbar && isset(a_toolbar)) { if (a_toolbar.ButtonExists('select')) { var old_onclick = a_toolbar.Buttons['select'].onClick; a_toolbar.Buttons['select'].onClick = function() { @@ -16,13 +20,17 @@ ); } -UploadsManager = new UploadsManager(); +UploadsManager = new UploadsManager(true); // set false to disable toolbar integration +/* ==== Private Attributes ==== */ UploadsManager._nextId = 0; UploadsManager._debugMode = false; -UploadsManager.formContainerId = ''; UploadsManager._Uploaders = new Object(); +/* ==== Public Attributes ==== */ +UploadsManager.formContainerId = ''; +UploadsManager.useTransparency = true; + /* ==== Private methods ==== */ UploadsManager._nextFlashId = function() { this._nextId++; @@ -127,7 +135,10 @@ } UploadsManager.UploadQueueComplete = function() { - Request.setOpacity(100, UploadsManager._getFromContainer()); + if (UploadsManager.useTransparency) { + 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/js/uploader/uploader.js =================================================================== diff -u -r10621 -r10623 --- branches/RC/core/admin_templates/js/uploader/uploader.js (.../uploader.js) (revision 10621) +++ branches/RC/core/admin_templates/js/uploader/uploader.js (.../uploader.js) (revision 10623) @@ -94,7 +94,9 @@ var holder = document.createElement('DIV'); document.body.appendChild(holder); - document.getElementById($form_name).style.display = 'block'; + if (UploadsManager.useTransparency) { + 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'); @@ -179,7 +181,8 @@ var o = ''; for (var f in this.files) { this.files[f].name.match(/\.([^.]*)$/); - var ext = RegExp.$1; + var ext = RegExp.$1.toLowerCase(); + var icon = ext.match(/^(ai|avi|bmp|cs|dll|doc|dot|exe|fla|gif|htm|html|jpg|js|mdb|mp3|pdf|ppt|rdp|swf|swt|txt|vsd|xls|xml|zip)$/) ? ext : 'default.icon'; o += ' '; if (isset(this.files[f].uploaded)) { @@ -230,7 +233,9 @@ return; } - Request.setOpacity(30, UploadsManager._getFromContainer()); + if (UploadsManager.useTransparency) { + Request.setOpacity(30, UploadsManager._getFromContainer()); + } if (!document.all) { var $winW = window.innerWidth; @@ -247,8 +252,11 @@ this.div.style.top = top; this.div.style.left = left; this.div.style.display = 'block'; - Request.setOpacity(100, this.div); + if (UploadsManager.useTransparency) { + Request.setOpacity(100, this.div); + } + this.StartTime = this._getMicroTime(); this.ProgressPercent = 0; // progress percent this.ProgressTime = new Array();