Changeset 1319

Timestamp:

06/16/12 09:54:21 (1 year ago)

Author:

gogo

Message:

Update to latest of
https://github.com/sleemanj/mootools-filemanager

Location:

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager

Files:

• Assets/Connector/FileManager.php (modified) (7 diffs)
• Assets/Connector/Image.class.php (modified) (1 diff)
• Assets/Css/FileManager.css (modified) (2 diffs)
• Assets/Images/Icons/Large/directory.png (modified) (previous)
• Assets/Images/Icons/Large/directory_up.png (modified) (previous)
• Assets/js/milkbox/css/milkbox.css (modified) (1 diff)
• Assets/js/milkbox/milkbox.js (modified) (43 diffs)
• Language/Language.no.js (added)
• Language/Language.pt.js (modified) (1 diff)
• Language/language.zh.js (added)
• Source/FileManager.js (modified) (49 diffs)
• Source/Gallery.js (modified) (15 diffs)
• Source/Uploader/Fx.ProgressBar.js (modified) (2 diffs)
• Source/Uploader/Swiff.Uploader.js (modified) (9 diffs)

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/Connector/FileManager.php

@@ -58 +58 @@
  *     Note that currently support for copying subdirectories is missing.
  *     The parameter $action = 'move'.
+ *     UploadIsComplete_cb (function/reference, default is *null*) Upload complete callback which can be used to post process a newly upload file.
+ *     The parameter $action = 'upload'.
+ *     DownloadIsComplete_cb (function/reference, default is *null*) Download complete callback which can be used to post process after a file has been downloaded file.
+ *     The parameter $action = 'download'.
+ *     DestroyIsComplete_cb (function/reference, default is *null*) Destroy complete callback which can be used to cleanup after a newly deleted/destroyed file.
+ *     The parameter $action = 'destroy'.
  *
  * Obsoleted options:
@@ -525 +531 @@
 
 
-require(strtr(dirname(__FILE__), '\\', '/') . '/Tooling.php');
-require(strtr(dirname(__FILE__), '\\', '/') . '/Image.class.php');
+require_once(strtr(dirname(__FILE__), '\\', '/') . '/Tooling.php');
+require_once(strtr(dirname(__FILE__), '\\', '/') . '/Image.class.php');
 
 
@@ -1031 +1037 @@
                         'DestroyIsAuthorized_cb' => null,
                         'MoveIsAuthorized_cb' => null,
+                        
+                        'UploadIsComplete_cb' => null,
+                        'DownloadIsComplete_cb' => null,
+                        'DestroyIsComplete_cb' => null,
+                        
                         'showHiddenFoldersAndFiles' => false,      // Hide dot dirs/files ?
-                        'useGetID3IfAvailable' => true
+                        'useGetID3IfAvailable' => true,
+                        'enableXSendFile' => false
                 ), (is_array($options) ? $options : array()));
 
@@ -1825 +1837 @@
                                         'content' => 'destroyed'
                                 ));
+                        
+                        if (!empty($this->options['DestroyIsComplete_cb']) && function_exists($this->options['DestroyIsComplete_cb']))
+                                $this->options['DestroyIsComplete_cb']($this, 'destroy', $fileinfo);    
+                        
                         return;
                 }
@@ -2130 +2146 @@
                                 $fsize = filesize($file);
                                 $fi = pathinfo($legal_url);
+                                
+                                // Based on the gist here: https://gist.github.com/854168
+                                // Reference: http://codeutopia.net/blog/2009/03/06/sending-files-better-apache-mod_xsendfile-and-php/
+                                // We should:
+                                // 1. try to use Apache mod_xsendfile
+                                // 2. Try to chunk the file into pieces
+                                // 3. If the file is sufficiently small, send it directly
 
                                 $hdrs = array();
@@ -2144 +2167 @@
                                         break;
                                 }
+                                
                                 $hdrs[] = 'Content-Disposition: attachment; filename="' . $fi['basename'] . '"'; // use 'attachment' to force a download
-                                $hdrs[] = 'Content-length: ' . $fsize;
-                                $hdrs[] = 'Expires: 0';
-                                $hdrs[] = 'Cache-Control: must-revalidate, post-check=0, pre-check=0';
-                                $hdrs[] = '!Cache-Control: private'; // flag as FORCED APPEND; use this to open files directly
+                                
+                                // Content length isn't requied for mod_xsendfile (Apache handles this for us)
+                                $modx = $this->options['enableXSendFile'] && function_exists('apache_get_modules') && in_array('mod_xsendfile', apache_get_modules());
+                                if ($modx)
+                                {
+                                        $hdrs[] = 'X-Sendfile: '.$file;
+                                }
+                                else
+                                {
+                                        $hdrs[] = 'Content-length: ' . $fsize;
+                                        $hdrs[] = 'Expires: 0';
+                                        $hdrs[] = 'Cache-Control: must-revalidate, post-check=0, pre-check=0';
+                                        $hdrs[] = '!Cache-Control: private'; // flag as FORCED APPEND; use this to open files directly
+                                }
 
                                 $this->sendHttpHeaders($hdrs);
-
-                                fpassthru($fd);
+                                
+                                if (!$modx)
+                                {
+                                        $chunksize = 4*1024; // 4KB blocks
+                                        if ($fsize > $chunksize)
+                                        {
+                                                // Turn off compression which prevents files from being re-assembled properly (especially zip files)
+                                                function_exists('apache_setenv') && @apache_setenv('no-gzip', 1);
+                                                @ini_set('zlib.output_compression', 0);
+                                                
+                                                // Turn off any additional buffering by the server
+                                                @ini_set('implicit_flush', 1);
+                                                
+                                                // Disable any timeouts
+                                                @set_time_limit(0);
+                                                while (!feof($fd))
+                                                {
+                                                        echo @fread($fd, $chunksize);
+                                                        ob_flush();
+                                                        flush();
+                                                }
+                                        }
+                                        else
+                                        {
+                                                fpassthru($fd);
+                                        }
+                                }
+
                                 fclose($fd);
+                                
+                                if (!empty($this->options['DownloadIsComplete_cb']) && function_exists($this->options['DownloadIsComplete_cb']))
+                                  $this->options['DownloadIsComplete_cb']($this, 'download', $fileinfo);
+        
                                 return;
                         }
                         
                         $emsg = 'read_error';
+
+                        
                 }
                 catch(FileManagerException $e)
@@ -2433 +2499 @@
                                         'name' => basename($file)
                                 ));
+                        
+                        if (!empty($this->options['UploadIsComplete_cb']) && function_exists($this->options['UploadIsComplete_cb']))
+                                $this->options['UploadIsComplete_cb']($this, 'upload', $fileinfo);
+                        
                         return;
                 }

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/Connector/Image.class.php

@@ -20 +20 @@
 
 
-define('IMAGE_PROCESSING_MEMORY_MAX_USAGE', 64); // memory_limit setting, in Megabytes; increase when Image class reports too often the images don't fit in memory.
+define('IMAGE_PROCESSING_MEMORY_MAX_USAGE', 160); // memory_limit setting, in Megabytes; increase when Image class reports too often the images don't fit in memory.
 
 class Image {

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/Css/FileManager.css

@@ -940 +940 @@
 
 div.filemanager-wrapper div.img {
+        position: relative;
         width: 260px;
         height: 260px;
@@ -1007 +1008 @@
         border-top: 1px solid #bebebe;
 }
+div.filemanager-filelist ul {
+        background: none;
+        padding: 0;
+        margin: 0;
+        width: auto;
+        height: auto;
+        border: none;
+}
+div.filemanager-filelist li {
+        display: inline-block;
+}
+
 div.filemanager-filelist .fi, div.gallery-image {
         position: relative;

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/js/milkbox/css/milkbox.css

@@ -3 +3 @@
 #mbox-overlay{
         background-color: #000; /* set the Milkbox overlay color // opacity: see the js options */
-        z-index:9999;
+        z-index:50000;
         cursor: pointer;
 }

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/js/milkbox/milkbox.js

@@ -1 +1 @@
 /*
-        Milkbox v3.0 - required: mootools.js v1.3 core + more (see the relative js file for details about used modules)
-
-        by Luca Reghellin (http://www.reghellin.com) Dicember 2010, MIT-style license.
+        Milkbox v3.0.3 - required: mootools.js v1.3 core + more (see the relative js file for details about used modules)
+
+        by Luca Reghellin (http://www.reghellin.com) September 2011, MIT-style license.
         Inspiration Lokesh Dhakar (http://www.lokeshdhakar.com/projects/lightbox2/)
-        AND OF COURSE, SPECIAL THANKS TO THE MOOTOOLS DEVELOPERS AND DEVELOPERS HELPING ALL AROUND THE WORLD
+        AND OF COURSE, SPECIAL THANKS TO THE MOOTOOLS DEVELOPERS AND THE OTHER DEVELOPERS HELPING ALL AROUND THE WORLD
 */
 
@@ -25 +25 @@
                 fileboxBorderColor:'#000000',
                 fileboxPadding:'0px',
-                resizeDuration:0.5,
+                resizeDuration:.5,
                 resizeTransition:'sine:in:out',/*function (ex. Transitions.Sine.easeIn) or string (ex. 'bounce:out')*/
                 autoPlay:false,
@@ -32 +32 @@
                 autoSize:true,
                 autoSizeMaxHeight:0,//only if autoSize==true
-                autoSizeMaxWidth:0,//only if autoSize==true
-                autoSizeMinHeight:0,//only if autoSize==true
-                autoSizeMinWidth:0,//only if autoSize==true
                 centered:false,
                 imageOfText:'of',
@@ -43 +40 @@
 
         initialize: function(options){
-                if (milkbox_singleton) {
-                        return milkbox_singleton;
-                }
+                if (milkbox_singleton) return milkbox_singleton;
                 milkbox_singleton = this;
 
                 this.setOptions(options);
-                this.autoPlayBkup = {
-                        autoPlayDelay: this.options.autoPlayDelay,
-                        autoPlay: this.options.autoPlay
-                };
+                this.autoPlayBkup = { autoPlayDelay:this.options.autoPlayDelay, autoPlay:this.options.autoPlay };
                 this.fullOptionsBkup = {};
                 this.galleries = [];
                 this.formElements = [];
-                this.activated = false;
+                this.activated;
                 this.busy = false;
                 this.paused = false;
                 this.closed = true;
-                this.intId = null;
-                this.loadCheckerId = null;
+                this.intId;
+                this.loadCheckerId;
                 this.externalGalleries = [];
                 this.singlePageLinkId = 0;
-
-                this.currentIndex = 0;
-                this.currentGallery = null;
-                this.fileReady = false;
+                
+                this.currentIndex;
+                this.currentGallery;
+                this.fileReady;
                 this.loadedImages = [];
-                this.currentFile = null;
-
-                this.display = null;
-
+                this.currentFile;
+                this.options_bkup;
+                
+                this.display;
+                
                 this.getPageGalleries();
-                if(this.galleries.length !== 0){
-                        this.prepare(true);
-                }
-        },
-
+                if(this.galleries.length != 0){ this.prepare(true); }
+        },
+        
         prepare:function(checkForm){
-                if(checkForm){
-                        this.checkFormElements();
-                }
+                if(checkForm){ this.checkFormElements(); }
                 this.prepareHTML();
                 this.prepareEventListeners();
                 this.activated = true;
         },
-
+        
         //utility
         open:function(gallery,index){
                 var i;
-
-                if(!this.activated){
-                        this.prepare(true);
-                }
-
-                var g = (instanceOf(gallery,MilkboxGallery) ? gallery : this.getGallery(gallery));
-                if(!g) {
-                        return false;
-                }
-
-                // [i_a] when 'index' is not an number, it may be a element reference or string: resolve such indexes too
+                
+                if(!this.activated){ this.prepare(true); }
+                                
+                var g = (instanceOf(gallery,MilkboxGallery)) ? gallery : this.getGallery(gallery);
+                if(!g) return false;
+                
+                // [i_a] when 'index' is not an number, it may be a element reference or string: resolve such indexes too
                 if (typeOf(index) !== 'number') {
                         i = g.get_index_of(index);
-                        if (i !== -1) {
-                                index = i;
-                        }
-                        // on failure, try to parse index as an integer value. (e.g. when index is a string representing a index number)
-                }
+                        if(i !== -1){ index = i; }
+                }
+
                 i = parseInt(index, 10);
-                if (isNaN(i)) {
-                        i = 0;
-                }
+                if(isNaN(i)){ i = 0; }
 
                 this.closed = false;
-                var item = g.get_item(i);   // [i_a] index is undefined
-                if(!item) {
-                        return false;
-                }
-
+                var item = g.get_item(i);
+                if(!item) return false;
+                
                 this.currentGallery = g;
-                this.currentIndex = i;      // [i_a]
-
+                this.currentIndex = i;
+                                
                 this.hideFormElements();
-
+                
                 this.display.set_mode(this.currentGallery.type);
                 this.display.appear();
-
-
-                if(this.options.autoPlay || g.options.autoplay){
-                        this.startAutoPlay(true);
-                }
+                
+                
+                if(this.options.autoPlay || g.options.autoplay){ this.startAutoPlay(true); }
 
                 this.loadFile(item,this.getPreloads());
                 return true;
         },
-
-
+        
+        
         //utility
         close:function(hideDisplay){
-                if(hideDisplay){
-                        this.display.disappear();
-                }
+                if(hideDisplay){ this.display.disappear(); }
                 this.showFormElements();
                 this.pauseAutoPlay();
                 this.stopLoadingCheck();
                 this.currentGallery = null;
-                this.currentIndex = 0;
+                this.currentIndex = null;
                 this.currentFile = null;
                 this.busy = false;
@@ -153 +128 @@
                 this.fileReady = false;
                 this.closed = true;
-                this.fireEvent('close');
+        
+                this.fireEvent('closed');
         },
 
         startAutoPlay:function(opening){
-                var d = (this.currentGallery.options.autoplay_delay || this.options.autoPlayDelay);
-                if(d < this.options.resizeDuration*2) {
-                        d = this.options.resizeDuration*2;
-                }
-
-                var f;   // [i_a] split decl and assignment in two statements as jsLint said: Problem at line 148 character 42: 'f' has not been fully defined yet.
-                f = function(){
+                var d = this.currentGallery.options.autoplay_delay || this.options.autoPlayDelay;
+                if(d < this.options.resizeDuration*2){ d = this.options.resizeDuration*2 };
+
+                var f = function(){
                         this.removeEvent('fileReady',f);
                         this.intId = this.navAux.periodical(d*1000,this,[null,'next']);
-                };
+                }
 
                 if(opening){
@@ -176 +149 @@
                 this.paused = false;
         },
-
+        
         pauseAutoPlay:function(){
-                if(this.intId){
-                        clearInterval(this.intId);
-                        this.intId = null;
-                }
-
+                if(this.intId){ 
+                        clearInterval(this.intId); 
+                        this.intId = null; 
+                }
+                
                 this.paused = true;
         },
-
+        
         //utility
         //list:Array of objects or an object > [ { gallery:'gall1', autoplay:true, delay:6 } ]
-        //to permanently define autoplay options for any gallery
+        //to permanently define autoplay options for any gallery 
         setAutoPlay:function(list){
-                var l = (typeOf(list) !== 'array' ? [list] : list);
+                var l = (typeOf(list) == 'object') ? [list] : list;
                 l.each(function(item){
                         var g = this.getGallery(item.gallery);
-                        if(!g){
-                                return;
-                        }
-                        var a = (item.autoplay == true ? item.autoplay : false);
-                        var d = ((item.delay && a) ? item.delay : this.options.autoPlayDelay);
-                        g.setOptions({
-                                autoplay:a,
-                                autoplay_delay:d
-                        }).refresh();
+                        if(!g){ return; }
+                        var a = (item.autoplay == true) ? item.autoplay : false;
+                        var d = (item.delay && a) ? item.delay : this.options.autoPlayDelay;
+                        g.setOptions({ autoplay:a, autoplay_delay:d }).refresh();
                 },this);
         },
 
 
-        //utility
+        //utility       
         //{href:'file1.jpg',size:'width:900,height:100', title:'text'}
         //show a file on the fly without gallery functionalities
-        openWithFile:function(file){
-                var g = new MilkboxGallery([file]);
-                // [i_a] make sure this gallery is only created when there's actually something to show (supported formats and all that)
-                if (g.items && g.items.length > 0) {
-                        this.open(g,0);
-                }
-        },
-
+        openWithFile:function(file, options){
+                if(!this.activated){ this.prepare(); }
+        
+                if(options){
+                        this.refreshDisplay(options,true);//set custom options
+                }
+                
+                var g = new MilkboxGallery([file],{ remove_title:this.options.removeTitle });
+                this.open(g,0);
+        },
+        
         getPreloads:function(){
                 var items = this.currentGallery.items;
                 var index = this.currentIndex;
-                if(items.length === 1) {
-                        return null;
-                }
-
-                var next = (index != items.length-1 ? items[index+1] : items[0]);
-                var prev = (index != 0 ? items[index-1] : items[items.length-1]);
-                var preloads = (prev == next ? [prev] : [prev,next]); //if gallery.length == 2, then prev == next
-                return preloads;
-        },
-
+                if(items.length == 1) return null;
+                
+                var next = (index != items.length-1) ? items[index+1] : items[0];
+                var prev = (index != 0) ? items[index-1] : items[items.length-1];
+                var preloads = (prev == next) ? [prev] : [prev,next]; //if gallery.length == 2, then prev == next
+                return preloads;                                        
+        },
+        
         //LOADING
         loadFile:function(fileObj,preloads){
@@ -236 +205 @@
                 this.display.clear_content();
                 this.display.hide_bottom();
-
+                
                 if(this.checkFileType(fileObj,'swf')){
                         this.loadSwf(fileObj);
@@ -244 +213 @@
                         this.loadImage(fileObj);
                 }
-
-                if(!this.checkFileType(fileObj,'swf')) {
-                        this.startLoadingCheck();
-                }
-                if(preloads){
-                        this.preloadFiles(preloads);
-                }
-        },
-
+                
+                if(!this.checkFileType(fileObj,'swf')) this.startLoadingCheck();
+                if(preloads){ this.preloadFiles(preloads); }
+        },
+        
         //to prevent the loader to show if the file is cached
         startLoadingCheck:function(){
                 var t = 0;
-                if (!this.loadCheckerId)
-                {
-                        this.loadCheckerId = (function(){
-                                t+=1;
-                                if(t > 5){
-                                        if (this.loadCheckerId)
-                                        {
-                                                // only show the loader when the timer has not been cleared yet!
-                                                this.display.show_loader();
-                                        }
-                                        this.stopLoadingCheck();
+                if (!this.loadCheckerId) {
+                  this.loadCheckerId = (function(){
+                         t+=1;
+                         if(t > 5){
+                                if (this.loadCheckerId) {
+                                  // only show the loader when the timer has not been cleared yet!
+                                  this.display.show_loader();
                                 }
-                        }).periodical(100,this);
-                }
+                                this.stopLoadingCheck();
+                         }
+                  }).periodical(100,this);
+                }//end if
         },
 
         stopLoadingCheck:function(){
                 clearInterval(this.loadCheckerId);
-                this.loadCheckerId = null;
-        },
-
+        },
+        
         preloadFiles:function(preloads){
                 preloads.each(function(fileObj,index){
-                        if(!this.checkFileType(fileObj,"swf") && !this.checkFileType(fileObj,"html")){
-                                this.preloadImage(fileObj.href);
+                        if(!this.checkFileType(fileObj,"swf") && !this.checkFileType(fileObj,"html")){ 
+                                this.preloadImage(fileObj.href); 
                         }
                 },this);
         },
-
+        
         preloadImage:function(file){
                 if(!this.loadedImages.contains(file)){
-                        var imageAsset = new Asset.image(file, {
+                        var imageAsset = new Asset.image(file, { 
                                 onLoad:function(){
                                         this.loadedImages.push(file);
@@ -297 +259 @@
         loadImage:function(fileObj){
                 var file = fileObj.href;
-                var imageAsset = new Asset.image(file, {
+                var imageAsset = new Asset.image(file, { 
                         onLoad:function(img){
-                                if(!this.loadedImages.contains(file)){
-                                        //see next/prev events
-                                        this.loadedImages.push(file);
-                                }
+                                if(!this.loadedImages.contains(file)){ this.loadedImages.push(file); };//see next/prev events
                                 this.loadComplete(img,fileObj.caption);
                         }.bind(this)
@@ -313 +272 @@
                         height:fileObj.size.height,
                         vars:fileObj.vars,
-                        params:{
-                                wMode:'opaque',
-                                swLiveConnect:'false'
-                        }
-                });
-
-                this.loadComplete($(swfObj),fileObj.caption);
+                        params:{ wMode:'opaque', swLiveConnect:'false' }
+                });
+                
+                this.loadComplete(document.id(swfObj),fileObj.caption);
         },
 
         loadHtml:function(fileObj){
-
+                
                 var query = (fileObj.vars ? '?' + Object.toQueryString(fileObj.vars) : '');
-
+                var extras = (fileObj.extras ? fileObj.extras : '');
+                
                 var iFrame = new Element('iframe',{
-                        src:fileObj.href+query,
-                        styles:{
-                                'border-style':'solid',
-                                'border-width':'0px'
+                        'src':fileObj.href+query,
+                        'frameborder':0,//for IE...
+                        styles:{ 
+                                'border':'none'
                         }
                 });
@@ -340 +297 @@
                         });
                 }
-
+                
                 this.loadComplete(iFrame,fileObj.caption);
         },//loadHtml
@@ -347 +304 @@
         //LOAD COMPLETE ********//
         loadComplete:function(file,caption){
-
-                if(this.closed) {
-                        return;//if an onload event were still running
-                }
-
+                
+                if(this.closed) return;//if an onload event were still running
+                
                 this.fileReady = true;//the file is loaded and ready to be showed (see next_prev_aux())
                 this.stopLoadingCheck();
                 this.currentFile = file;
-
-                var timer; // split due to jsLint: Problem at line 338 character 31: 'timer' has not been fully defined yet.
+                var timer;
                 timer = (function(){
                         if(this.display.ready){
@@ -363 +317 @@
                                 }
                                 clearInterval(timer);
-                        }
+                        }//end if
                 }).periodical(100,this);
-
+                
                 this.fireEvent('fileReady');
         },//end loadComplete
 
         checkFileType:function(file,type){
-                var href = (typeOf(file) !== 'string' ? file.href : file);
-                var regexp = new RegExp('\\.('+type+')$','i');
-                return href.split('?')[0].test(regexp);
+                var href = (typeOf(file) != 'string') ? file.href : file;
+                var splitted = href.split('?')[0];
+                var regexp = new RegExp("\.("+type+")$","i");
+                var test = splitted.test(regexp);
+                
+                if(!test && type=="html"){
+                        test = splitted.test(/\/\d+$/);
+                }
+                
+                return test;
         },
 
@@ -379 +340 @@
                 var names = [];
                 var links = $$('a[data-milkbox]');
-
+                
                 //check names
                 links.each(function(link){
                         var name = link.get('data-milkbox');
-                        if(name === 'single'){
-                                var gallery = new MilkboxGallery(link,{
-                                        name:'single'+this.singlePageLinkId++
-                                });
-                                // [i_a] make sure this gallery is only created when there's actually something to show (supported formats and all that)
-                                if (gallery.items && gallery.items.length > 0) {
-                                        this.galleries.push(gallery);
-                                }
+                        if(name == 'single'){
+                                this.galleries.push(new MilkboxGallery(link,{name:'single'+this.singlePageLinkId++, remove_title:this.options.removeTitle }));
                         } else if(!names.contains(name)){
                                 names.push(name);
                         }
                 },this);
-
+                                
                 names.each(function(name){
-                        var gallery = new MilkboxGallery($$('a[data-milkbox='+name+']'),{
-                                name:name
-                        });
-                        // [i_a] make sure this gallery is only created when there's actually something to show (supported formats and all that)
-                        if (gallery.items && gallery.items.length > 0) {
-                                this.galleries.push(gallery);
-                        }
+                        this.galleries.push(new MilkboxGallery($$('a[data-milkbox='+name+']'),{ name:name, remove_title:this.options.removeTitle }));
                 },this);
-
+                
                 //set default autoplay // override with setAutoPlay
                 if(this.options.autoPlay){
-                        this.galleries.each(function(g){
-                                g.setOptions({
-                                        autoplay:this.options.autoPlay,
-                                        autoplay_delay:this.options.autoPlayDelay
-                                });
-                        });
-                }
-
-                //console.log(this.galleries);
+                        this.galleries.each(function(g){ 
+                                g.setOptions({autoplay:this.options.autoPlay,autoplay_delay:this.options.autoPlayDelay});
+                                g.refresh();
+                        }.bind(this));
+                }
+                
         },//getPageGalleries
 
-        reloadPageGalleries:function(){
+        reloadPageGalleries:function(){         
                 //reload page galleries
                 this.removePageGalleryEvents();
 
                 this.galleries = this.galleries.filter(function(gallery){
-                        if(!gallery.external) {
-                                gallery.clear();
-                        }
-                        return gallery.external;
-                });
-
+                        if(!gallery.external) gallery.clear();
+                        return gallery.external; 
+                });
+                
                 this.getPageGalleries();
                 this.addPageGalleriesEvents();
-
-                if(!this.activated){
-                        this.prepare(true);
-                }
+                
+                if(!this.activated){ this.prepare(true); }
         },//end reloadPageGalleries
 
@@ -441 +383 @@
         resetExternalGalleries:function(list){
                 this.galleries = this.galleries.filter(function(gallery){
-                        if(gallery.external) {
-                                gallery.clear();
-                        }
+                        if(gallery.external) gallery.clear();
                         return !gallery.external;
                 });
 
-                if(!list) {
-                        return;
-                }
-                var array = (typeOf(list) === 'array' ? list : [list]);
-                array.each(function(data){
-                        this.addGalleries(data);
-                }, this);
+                if(!list) return;
+                var array = (typeOf(list) == 'array') ? list : [list];
+                array.each(function(data){ this.addGalleries(data); }, this);
         },
 
         //utility
         addGalleries:function(data){
-                if(!this.activated){
-                        this.prepare(true);
-                }
-                if (typeOf(data) === 'string' && data.split('?')[0].test(/\.(xml)$/i)) {
+                if(!this.activated){ this.prepare(true); }
+                if (typeOf(data) == 'string' && data.split('?')[0].test(/\.(xml)$/i)) {
                         this.loadXml(data);
                 } else {//array or object
                         this.setObjectGalleries(data);
                 }
-                if(!this.activated){
-                        this.prepare(true);
-                }
-        },
-
+                if(!this.activated){ this.prepare(true); }
+        },
+        
         loadXml:function(xmlfile){
                 var r = new Request({
@@ -483 +415 @@
                                 this.setXmlGalleries(new Element('div',{ html:t }));
                         }.bind(this),
-                        onFailure:function(transport){
-                                alert('Milkbox :: loadXml: XML file path error or local Ajax test: please test xml galleries on-line');
-                        }
+                        onFailure:function(transport){ alert('Milkbox :: loadXml: XML file path error or local Ajax test: please test xml galleries on-line'); }
                 }).send();
         },
-
+        
         setXmlGalleries:function(container){
                 var c = container;
                 var xml_galleries = c.getElements('.gallery');
+                var links;
+                var aplist = [];
                 xml_galleries.each(function(xml_gallery,i){
-
-                        var options = {
-                                name:xml_gallery.getProperty('name'),
+                                                
+                        var options = { 
+                                name:xml_gallery.getProperty('name'), 
                                 autoplay:Boolean(xml_gallery.getProperty('autoplay')),
                                 autoplay_delay:Number(xml_gallery.getProperty('autoplay_delay'))
-                        };
-
-                        var links = xml_gallery.getChildren('a').map(function(tag){
-                                return {
-                                        href:tag.href,
-                                        size:tag.get('data-milkbox-size'),
-                                        title:tag.get('title')
-                                };
+                        }
+                        
+                        var links = xml_gallery.getChildren('a').map(function(tag){ 
+                                return { href:tag.href, size:tag.get('data-milkbox-size'), title:tag.get('title') }
                         },this);
-
-                        var gallery = new MilkboxGallery(links,options);
-                        // [i_a] make sure this gallery is only created when there's actually something to show (supported formats and all that)
-                        if (gallery.items && gallery.items.length > 0) {
-                                this.galleries.push(gallery);
-                        }
+                        
+                        this.galleries.push(new MilkboxGallery(links,options));
                 },this);
-
+                        
                 this.fireEvent('xmlGalleries');
         },//end setXmlGalleries
-
-        //[{ name:'gall1', autoplay:true, autoplay_delay:7, files:[{href:'file1.jpg',size:'width:900,height:100', title:'text'},{href:'file2.html',size:'w:800,h:200', title:'text'}] },{...},{...}]
+        
+        //[{ name:'gall1', autoplay:true, autoplay_delay:7, files:[{href:'file1.jpg',size:'width:900,height:100', title:'text'},{href:'file2.html',size:'w:800,h:200', title:'text'}] },{...},{...}]    
         setObjectGalleries:function(data){
-                var array = (typeOf(data) === 'array' ? data : [data]);
+                var array = (typeOf(data) == 'array') ? data : [data];
                 array.each(function(newobj){
                         var options = {
-                                name:newobj.name,
+                                name:newobj.name, 
                                 autoplay:newobj.autoplay,
                                 autoplay_delay:newobj.autoplay_delay
-                        };
-                        var gallery = new MilkboxGallery(newobj.files,options);
-                        // [i_a] make sure this gallery is only created when there's actually something to show (supported formats and all that)
-                        if (gallery.items && gallery.items.length > 0) {
-                                this.galleries.push(gallery);
-                        }
+                        }                       
+                        this.galleries.push(new MilkboxGallery(newobj.files,options));
                 },this);
         },
-
+        
         //utility
         getGallery:function(name){
-                var g = this.galleries.filter(function(gallery){
-                        return gallery.name == name;
-                },this);
-                return (g[0] || null);
-        },
-
+                var g = this.galleries.filter(function(gallery){ return gallery.name == name; },this);
+                return g[0] || null;
+        },
+        
         //HTML
         prepareHTML:function(){
                 this.display = new MilkboxDisplay({
-                        init_width:this.options.initialWidth,
-                        init_height:this.options.initialHeight,
-                        overlay_opacity:this.options.overlayOpacity,
-                        margin_top:this.options.marginTop,
-                        filebox_border_color:this.options.fileboxBorderColor,
-                        filebox_padding:this.options.fileboxPadding,
-                        resize_duration:this.options.resizeDuration,
-                        resize_transition:this.options.resizeTransition,
+                        initialWidth:this.options.initialWidth,
+                        initialHeight:this.options.initialHeight,
+                        overlayOpacity:this.options.overlayOpacity,
+                        marginTop:this.options.marginTop,
+                        fileboxBorderWidth:this.options.fileboxBorderWidth,
+                        fileboxBorderColor:this.options.fileboxBorderColor,
+                        fileboxPadding:this.options.fileboxPadding,
+                        resizeDuration:this.options.resizeDuration,
+                        resizeTransition:this.options.resizeTransition,
                         centered:this.options.centered,
-                        auto_size:this.options.autoSize,
-                        autosize_max_height:this.options.autoSizeMaxHeight,
-                        autosize_max_width:this.options.autoSizeMaxWidth,
-                        autosize_min_height:this.options.autoSizeMinHeight,
-                        autosize_min_width:this.options.autoSizeMinWidth,
-                        image_of_text:this.options.imageOfText
-                });
+                        autoSize:this.options.autoSize,
+                        autoSizeMaxHeight:this.options.autoSizeMaxHeight,
+                        imageOfText:this.options.imageOfText
+                });
+        },
+        
+        refreshDisplay:function(options,keepBackup){
+                if(!this.activated) return;
+        
+                var options_bkup = this.display.options;//save original options
+                var new_options = Object.merge({},options_bkup,options);        
+                if(this.display){ this.display.clear() }
+                this.display = new MilkboxDisplay(new_options);
+                this.addDisplayEvents();
+                
+                if(keepBackup){
+                        this.options_bkup = options_bkup;//restored in close();
+                } else {
+                        this.options_bkup = null;
+                }
         },
 
         checkFormElements:function(){
                 this.formElements = $$('select, textarea');
-                if(this.formElements.length === 0) {
-                        return;
-                }
+                if(this.formElements.length == 0) return;
 
                 this.formElements = this.formElements.map(function(elem){
@@ -576 +506 @@
                 });
         },
-
+        
         hideFormElements:function(){
-                if(this.formElements.length === 0) {
-                        return;
-                }
-                this.formElements.each(function(elem){
-                        elem.setStyle('display','none');
-                });
-        },
-
+                if(this.formElements.length == 0) return;
+                this.formElements.each(function(elem){ elem.setStyle('display','none'); });
+        },
+        
         showFormElements:function(){
-                if(this.formElements.length === 0) {
-                        return;
-                }
+                if(this.formElements.length == 0) return;
                 this.formElements.each(function(elem){
                         elem.setStyle('visibility',elem.retrieve('visibility'));
                         elem.setStyle('display',elem.retrieve('display'));
-                });
-        },
-
+                })
+        },
+        
         //EVENTS
         addPageGalleriesEvents:function(){
-                var pageGalleries = this.galleries.filter(function(gallery){
-                        return !gallery.external;
-                });
+                var pageGalleries = this.galleries.filter(function(gallery){ return !gallery.external });
                 pageGalleries.each(function(gallery){
                         gallery.items.each(function(item){
@@ -610 +532 @@
                 },this);
         },
-
+        
         removePageGalleryEvents:function(){
-                var pageGalleries = this.galleries.filter(function(gallery){
-                        return !gallery.external;
-                });
+                var pageGalleries = this.galleries.filter(function(gallery){ return !gallery.external });
                 pageGalleries.each(function(gallery){
                         gallery.items.each(function(item){
@@ -621 +541 @@
                 });
         },
-
-        prepareEventListeners:function(){
-
-                this.addPageGalleriesEvents();
-
+        
+        addDisplayEvents:function(){
                 this.display.addEvent('nextClick',function(){
                         this.navAux(true,'next');
                 }.bind(this));
-
+                
                 this.display.addEvent('prevClick',function(){
                         this.navAux(true,'prev');
                 }.bind(this));
-
+                
                 this.display.addEvent('playPauseClick',function(){
                         if(this.paused){
@@ -642 +559 @@
                         this.display.set_paused(this.paused);
                 }.bind(this));
-
+                
                 this.display.addEvent('disappear',function(){
+                        if(this.options_bkup){ this.refreshDisplay(this.options_bkup); }
                         this.close(false);
                 }.bind(this));
-
+                
                 this.display.addEvent('resizeComplete',function(){
                         this.busy = false;//see navAux
                 }.bind(this));
-
+        },
+
+        prepareEventListeners:function(){
+                
+                this.addPageGalleriesEvents();
+                this.addDisplayEvents();
+                
                 //reset overlay height and position onResize
                 window.addEvent('resize',function(){
-                        if(this.display.ready){
-                                this.display.resetOverlaySize();
-                        }
+                        if(this.display.ready){ this.display.resetOverlaySize(); }
                 }.bind(this));
-
+                
                 //keyboard next/prev/close
                 window.document.addEvent('keydown',function(e){
-                        if(this.busy == true || this.closed){
-                                return;
+                        if(this.busy == true || this.closed){ return; }
+                        if(e.key == 'right' || e.key == 'left' || e.key == 'space'){ e.preventDefault(); }
+
+                        if(this.display.mode != 'single'){
+                                if(e.key == 'right' || e.key == 'space'){ this.navAux(e,'next'); }
+                                else if(e.key == 'left'){ this.navAux(e,'prev'); }
                         }
-                        switch (e.key)
-                        {
-                        case 'right':
-                        case 'space':
-                                e.preventDefault();
-                                this.navAux(e,'next');
-                                break;
-
-                        case 'left':
-                                e.preventDefault();
-                                this.navAux(e,'prev');
-                                break;
-
-                        case 'esc':
-                                e.stop();
-                                this.close(true);
-                                break;
-                        }
+                        
+                        if(e.key == 'esc'){ this.display.disappear(); }
                 }.bind(this));
         },
 
         navAux:function(e,direction){
-
+                                
                 if(e){//called from a button/key event
                         this.pauseAutoPlay();
                 } else {//called from autoplay
-                        if(this.busy || !this.fileReady){
-                                //prevent autoplay()
-                                return;
-                        }
+                        if(this.busy || !this.fileReady){ return; }//prevent autoplay()
                 }
 
                 this.busy = true; //for keyboard and autoplay
-
-                var i1, i2;
-
-                if(direction === 'next'){
-                        i1 = (this.currentIndex != this.currentGallery.items.length-1 ? this.currentIndex + 1 : 0);
-                        this.currentIndex = i1;
-                        i2 = (this.currentIndex != this.currentGallery.items.length-1 ? this.currentIndex + 1 : 0);
+                
+                var i, _i;
+
+                if(direction == "next"){
+                        i= (this.currentIndex != this.currentGallery.items.length-1) ? this.currentIndex += 1 : this.currentIndex = 0;
+                        _i= (this.currentIndex != this.currentGallery.items.length-1) ? this.currentIndex + 1 : 0;
                 } else {
-                        i1 = (this.currentIndex != 0 ? this.currentIndex - 1 : this.currentGallery.items.length-1);
-                        this.currentIndex = i1;
-                        i2 = (this.currentIndex != 0 ? this.currentIndex - 1 : this.currentGallery.items.length-1);
-                }
-
-                this.loadFile(this.currentGallery.get_item(i1),[this.currentGallery.get_item(i2)]);
+                        i= (this.currentIndex != 0) ? this.currentIndex -= 1 : this.currentIndex = this.currentGallery.items.length-1;
+                        _i= (this.currentIndex != 0) ? this.currentIndex - 1 : this.currentGallery.items.length-1;              
+                };
+
+                this.loadFile(this.currentGallery.get_item(i),[this.currentGallery.get_item(_i)]);
         }
 
@@ -725 +630 @@
 
         Implements:[Options,Events],
-
+        
         options:{
-                init_width:100,
-                init_height:100,
-                overlay_opacity:1,
-                margin_top:0,
-                filebox_border_color:'#000000',
-                filebox_padding:'0px',
-                resize_duration:0.5,
-                resize_transition:'sine:in:out',
+                initialWidth:100,
+                initialHeight:100,
+                overlayOpacity:1,
+                marginTop:0,
+                fileboxBorderWidth:'0px',
+                fileboxBorderColor:'#000000',
+                fileboxPadding:'0px',
+                resizeDuration:.5,
+                resizeTransition:'sine:in:out',
                 centered:false,
-                auto_size:false,
-                autosize_max_height:0,
-                autosize_max_width:0,
-                autosize_min_height:0,
-                autosize_min_width:0,
-                fixup_dimension:true,
-                image_of_text:'of',
-                zIndex: 410000,  // required to be a high number > 400000 as the 'filemanager as tinyMCE plugin' sits at z-index 400K+
+                autoSize:false,
+                autoSizeMaxHeight:0,
+                imageOfText:'of',
                 onNextClick:function(){},
                 onPrevClick:function(){},
@@ -750 +651 @@
                 onResizeComplete:function(){}
         },
-
+        
         initialize: function(options){
                 this.setOptions(options);
-
-                this.overlay = null;
-                this.mainbox = null;
-                this.filebox = null;
-                this.bottom = null;
-                this.controls = null;
-                this.caption = null;
-                this.close = null;
-                this.next = null;
-                this.prev = null;
-                this.playpause = null;
+                
+                this.overlay;
+                this.mainbox;
+                this.filebox;
+                this.bottom;
+                this.controls;
+                this.caption;
+                this.close;
+                this.next;
+                this.prev;
+                this.playpause;
                 this.paused = false;
-                this.count = null;
-
+                this.count;
+                
                 this.mode = 'standard';
                 this.ready = false;//after overlay and mainbox become visible == true
-
-                this.overlay_show_fx = null;
-                this.overlay_hide_fx = null;
-
-                this.mainbox_show_fx = null;
-                this.mainbox_hide_fx = null;
-                this.mainbox_resize_fx = null;
-
+                
+                this.overlay_show_fx;
+                this.overlay_hide_fx;
+
+                this.mainbox_show_fx;
+                this.mainbox_hide_fx;
+                this.mainbox_resize_fx;
+                
                 this.current_file = null;
 
@@ -784 +685 @@
 
         },//end init
-
+        
         build_html:function(){
-                this.overlay = new Element('div', {
+                this.overlay = new Element('div', { 
                         'id':'mbox-overlay',
                         'styles':{
@@ -792 +693 @@
                                 'position':'fixed',
                                 'display':'none',
-                                'z-index': this.options.zIndex,
                                 'left':0,
                                 'width':'100%',
@@ -801 +701 @@
                                 'padding':0
                         }
-                }).inject($(document.body));
+                }).inject(document.id(document.body));
 
                 this.mainbox = new Element('div', {
                         'id':'mbox-mainbox',
                         'styles': {
-                                'position':(this.options.centered ? 'fixed' : 'absolute'),
+                                'position':(this.options.centered) ? 'fixed' : 'absolute',
                                 'overflow':'hidden',
                                 'display':'none',
-                                'z-index': this.options.zIndex + 1,   // required to be > overlay.z-index
-                                'width':this.options.init_width,
-                                'height':this.options.init_height,
+                                'z-index':50001,//overlay z-index (see css) + 1
+                                'width':this.options.initialWidth,
+                                'height':this.options.initialHeight,
                                 'opacity':0,
                                 'margin':0,
                                 'left':'50%',
-                                'marginLeft':-(this.options.init_width/2),
-                                'marginTop':(this.options.centered ? -(this.options.init_height/2) : ''),
-                                'top':(this.options.centered ? '50%' : '')
+                                'marginLeft':-(this.options.initialWidth/2),
+                                'marginTop':(this.options.centered) ? -(this.options.initialHeight/2) : '',
+                                'top':(this.options.centered) ? '50%' : ''
                         }
-                }).inject($(document.body));
-
-                this.filebox = new Element('div#mbox-filebox').inject(this.mainbox);
-
+                }).inject(document.id(document.body));
+                
+                this.filebox = new Element('div',{
+                        'id':'mbox-filebox',
+                        'styles':{
+                                'border-style':'solid',
+                                'border-width':this.options.fileboxBorderWidth,
+                                'border-color':this.options.fileboxBorderColor,
+                                'padding':this.options.fileboxPadding,
+                                'opacity':0
+                        }
+                }).inject(this.mainbox);
+                
                 this.bottom = new Element('div#mbox-bottom').setStyle('visibility','hidden').inject(this.mainbox);
-                this.controls = new Element('div#mbox-controls'); //.setStyle('visibility','hidden');
+                this.controls = new Element('div#mbox-controls');
                 this.caption = new Element('div#mbox-caption',{'html':'test'}).setStyle('display','none');
 
                 this.bottom.adopt(new Element('div.mbox-reset'),this.controls, this.caption, new Element('div.mbox-reset'));
-
+                
                 this.close = new Element('div#mbox-close');
                 this.next = new Element('div#mbox-next');
@@ -834 +743 @@
                 this.playpause = new Element('div#mbox-playpause');
                 this.count = new Element('div#mbox-count');
-
-                //$$(this.next, this.prev, this.count, this.playpause).setStyle('display','none');
+                
                 $$(this.next, this.prev, this.close, this.playpause).setStyles({
                         'outline':'none',
@@ -843 +751 @@
                 this.controls.adopt(new Element('div.mbox-reset'), this.close, this.next, this.prev, this.playpause, new Element('div.mbox-reset'), this.count);
         },
-
+        
         prepare_effects:function(){
-                this.overlay_show_fx = new Fx.Tween(this.overlay,{
+                this.overlay_show_fx = new Fx.Tween(this.overlay,{ 
                                 duration:'short',
                                 link:'cancel',
                                 property:'opacity',
                                 onStart:function(){
-                                        //console.log('overlay_show_fx start');
                                         this.element.setStyles({
                                                 'top':-window.getScroll().y,
-                                                'height':window.getScrollSize().y + window.getScroll().y,
+                                                'height':window.getScrollSize().y+window.getScroll().y,
                                                 'display':'block'
                                         });
                                 },
                                 onComplete:function(){
-                                        //console.log('overlay_show_fx complete');
                                         this.mainbox_show_fx.start(1);
                                 }.bind(this)
                 });
 
-                this.overlay_hide_fx = new Fx.Tween(this.overlay,{
+                this.overlay_hide_fx = new Fx.Tween(this.overlay,{ 
                                 duration:'short',
                                 link:'cancel',
@@ -870 +776 @@
                                 onComplete:function(){
                                         this.overlay.setStyle('display','none');
+                                        this.fireEvent('disappear');
                                 }.bind(this)
                 });
-
-                this.mainbox_show_fx = new Fx.Tween(this.mainbox,{
+                
+                this.mainbox_show_fx = new Fx.Tween(this.mainbox,{ 
                                 duration:'short',
                                 link:'cancel',
                                 property:'opacity',
                                 onStart:function(){
-                                        //console.log('mainbox_show_fx start');
                                         this.mainbox.setStyle('display','block');
                                 }.bind(this),
                                 onComplete:function(){
-                                        //console.log('mainbox_show_fx complete');
                                         this.ready = true;
                                 }.bind(this)
                 });
 
-                this.mainbox_hide_fx = new Fx.Tween(this.mainbox,{
+                this.mainbox_hide_fx = new Fx.Tween(this.mainbox,{ 
                                 duration:'short',
                                 link:'cancel',
@@ -898 +803 @@
                                 }.bind(this)
                 });
-
-
-                this.mainbox_resize_fx = new Fx.Morph(this.mainbox,{
-                                duration:this.options.resize_duration*1000,
-                                transition:this.options.resize_transition,
+                
+                
+                this.mainbox_resize_fx = new Fx.Morph(this.mainbox,{ 
+                                duration:this.options.resizeDuration*1000,
+                                transition:this.options.resizeTransition,
                                 link:'cancel',
                                 onStart:function(){
-                                        //console.log('resize_fx start');
-                                },
+                                        this.filebox.setStyle('opacity',0)
+                                }.bind(this),
                                 onComplete:function(){
-                                        var w, h;
-                                        w = this.current_file.width;
-                                        h = this.current_file.height;
-                                        if (w < this.options.autosize_min_width) w = this.options.autosize_min_width;
-                                        if (h < this.options.autosize_min_height) h = this.options.autosize_min_height;
                                         this.show_bottom();
-                                        this.filebox.setStyle('width', w+'px');
-                                        this.filebox.setStyle('height', h+'px');
-                                        this.filebox.setStyle('opacity',0).grab(this.current_file).tween('opacity',1);
+                                        this.filebox.setStyle('height',this.current_file.height+'px');
+                                        this.filebox.grab(this.current_file).tween('opacity',1);
                                         this.fireEvent('resizeComplete');
                                 }.bind(this)
                 });
-
+                
                 this.filebox.set('tween',{ duration:'short', link:'chain' });
         },//end prepare_effects
-
+        
         prepare_events:function(){
-                $$(this.overlay,this.close).addEvent('click', function(){
-                        this.disappear();
-                }.bind(this));
-                this.prev.addEvent('click',function(){
-                        this.fireEvent('prevClick');
-                }.bind(this));
-                this.next.addEvent('click',function(){
-                        this.fireEvent('nextClick');
-                }.bind(this));
-                this.playpause.addEvent('click',function(){
-                        this.fireEvent('playPauseClick');
-                }.bind(this) );
+                $$(this.overlay,this.close).addEvent('click', function(){ this.disappear(); }.bind(this));
+                this.prev.addEvent('click',function(){ this.fireEvent('prevClick') }.bind(this));
+                this.next.addEvent('click',function(){ this.fireEvent('nextClick') }.bind(this));
+                this.playpause.addEvent('click',function(){ this.fireEvent('playPauseClick') }.bind(this) );
         },
 
         show_file:function(file,caption,index,length){
 
-                //this.clear_display();
                 this.hide_loader();
-
-                if(file.match && file.match('img') && (this.options.auto_size || this.options.centered)){
-                        file = this.get_resized_image(file);
-                }
-
-                var file_size = {
-                        w:file.width.toInt(),
-                        h:file.height.toInt()
+                
+                if(file.match && file.match('img') && (this.options.autoSize || this.options.centered)){
+                        var file = this.get_resized_image(file);
                 };
-                if(!file_size.w || !file_size.h){
-                        //data-milkbox-size not passed
-                        if (!this.options.fixup_dimension) {
-                                alert('Milkbox error: you must pass size values if the file is swf or html or a free file (openWithFile)');
-                                return;
-                        }
-                        // assume some sensible defaults:
-                        var dims = Window.getSize();
-                        file.width = dims.x;
-                        file.height = dims.y;
-                        file_size = {
-                                w: dims.x * 0.85,
-                                h: dims.y * 0.85
-                        };
-                        file.set({ 'width':file_size.w.toInt(), 'height':file_size.h.toInt() });
-                }
-
-                if(this.options.autosize_min_height > file_size.h){
-                        var mt = Math.round((this.options.autosize_min_height - file_size.h) / 2);
-                        var mb = this.options.autosize_min_height - file_size.h - mt;
-                        file.setStyles({
-                                'margin-top': mt,       // no need to say "+'px'": mootools takes care of that!
-                                'margin-bottom': mb
-                        });
-                        file_size.h = this.options.autosize_min_height;
-                }
-                if(this.options.autosize_min_width > file_size.w){
-                        var ml = Math.round((this.options.autosize_min_width - file_size.w) / 2);
-                        var mr = this.options.autosize_min_width - file_size.w - ml;
-                        file.setStyles({
-                                'margin-left': ml,
-                                'margin-right': mr
-                        });
-                        file_size.w = this.options.autosize_min_width;
-                }
-
-                file_size = Object.map(file_size,function(value){
-                        return value.toInt();
-                });
-
-                this.caption.innerHTML = (caption ? caption : '');
+
+                var file_size = { w:file.width.toInt(), h:file.height.toInt() };
+                if(!file_size.w || !file_size.h){ alert('Milkbox error: you must pass size values if the file is swf or html or a free file (openWithFile)'); return; }//data-milkbox-size not passed
+                file_size = Object.map(file_size,function(value){ return value.toInt(); });
+                
+                this.caption.innerHTML = (caption) ? caption : '';
                 this.update_count(index,length);
-
+                
                 var filebox_addsize = this.filebox.getStyle('border-width').toInt()*2+this.filebox.getStyle('padding').toInt()*2;
+                                
                 var final_w = file_size.w+filebox_addsize;
-
+                
                 //so now I can predict the caption height
                 var caption_adds = this.caption.getStyles('paddingRight','marginRight');
-                this.caption.setStyle('width',final_w-caption_adds.paddingRight.toInt()-caption_adds.marginRight.toInt());
+                this.caption.setStyle('width',final_w-caption_adds.paddingRight.toInt()-caption_adds.marginRight.toInt() - 2);
                 $$(this.bottom,this.controls).setStyle('height',Math.max(this.caption.getDimensions().height,this.controls.getComputedSize().totalHeight));
                 var mainbox_size = this.mainbox.getComputedSize();
 
                 var final_h = file_size.h+filebox_addsize+this.bottom.getComputedSize().totalHeight;
-
-                var target_size = {
+                
+                var target_size = { 
                         w:final_w,
                         h:final_h,
                         total_w:final_w+mainbox_size.totalWidth-mainbox_size.width,
                         total_h:final_h+mainbox_size.totalHeight-mainbox_size.height
-                };
-
+                }
+                
                 this.current_file = file;
                 this.resize_to(target_size);
@@ -1023 +874 @@
                 var ratio;
                 var check;
-
-                var i_size = {
-                        w:image.get('width').toInt(),
-                        h:image.get('height').toInt()
-                };
-
+                
+                var i_size = { w:image.get('width').toInt(), h:image.get('height').toInt() };
+                
                 //cut out some pixels to make it better
                 var w_size = window.getSize();
-                max_size = {
-                        w:w_size.x-60,
-                        h:w_size.y-68-this.options.margin_top*2
+                var max_size = { 
+                        w:w_size.x-60, 
+                        h:w_size.y-68-this.options.marginTop*2
                 };
 
@@ -1045 +893 @@
                         check = 'w';
                 }
-
-                ratio = (ratio <= 1 ? ratio : 1);
-
-                i_size = Object.map(i_size,function(value){
-                        return value*ratio;
-                });
-
-                ratio = (max_size[check]/i_size[check] <= 1 ? max_size[check]/i_size[check] : 1);
-                i_size = Object.map(i_size,function(value){
-                        return value*ratio;
-                });
-
-                if(this.options.autosize_max_height > 0){
-                        ratio = (this.options.autosize_max_height/i_size.h < 1 ? this.options.autosize_max_height/i_size.h : 1);
-                        i_size = Object.map(i_size,function(value){
-                                return value*ratio;
-                        });
-                }
-                if(this.options.autosize_max_width > 0){
-                        ratio = (this.options.autosize_max_width/i_size.w < 1 ? this.options.autosize_max_width/i_size.w : 1);
-                        i_size = Object.map(i_size,function(value){
-                                return value*ratio;
-                        });
-                }
-
-                image.set({ 'width': Math.round(i_size.w), 'height': Math.round(i_size.h) });
-
+                
+                ratio = (ratio <= 1) ? ratio : 1;
+                
+                i_size = Object.map(i_size,function(value){ return Math.floor(value*ratio); });
+                
+                ratio = (max_size[check]/i_size[check] <= 1) ? max_size[check]/i_size[check] : 1;
+                i_size = Object.map(i_size,function(value){ return Math.floor(value*ratio); });
+                
+                if(this.options.autoSizeMaxHeight > 0){
+                        ratio = (this.options.autoSizeMaxHeight/i_size.height < 1) ? this.options.autoSizeMaxHeight/i_size.height : 1;
+                        i_size = Object.map(i_size,function(value){ return Math.floor(value*ratio); });
+                }
+
+                image.set({ 'width':i_size.w, 'height':i_size.h });
+                
                 return image;
         },//get_resized_image
@@ -1080 +916 @@
                         'height':target_size.h,
                         'marginLeft':-(target_size.total_w/2).round(),
-                        'marginTop':(this.options.centered ? -(target_size.total_h/2).round() : '')
-                });
-        },
-
+                        'marginTop':(this.options.centered) ? -(target_size.total_h/2).round() : ''
+                });
+        },
+        
         show_loader:function(){
                 this.mainbox.addClass('mbox-loading');
         },
-
+        
         hide_loader:function(){
                 this.mainbox.removeClass('mbox-loading');
@@ -1098 +934 @@
                 $$(this.bottom,this.controls).setStyle('height','');
         },
-
+        
         hide_bottom:function(){
                 this.caption.setStyle('display','none');
@@ -1108 +944 @@
                 this.bottom.setStyle('visibility','visible');
         },
-
+        
         appear:function(){
-                if(!this.options.centered){
-                        this.mainbox.setStyle('top',window.getScroll().y+this.options.margin_top);
-                }
-                this.overlay_show_fx.start(this.options.overlay_opacity);
-        },
-
+                if(!this.options.centered){ this.mainbox.setStyle('top',window.getScroll().y+this.options.marginTop); }
+                this.overlay_show_fx.start(this.options.overlayOpacity);
+        },
+        
         disappear:function(){
                 this.cancel_effects();
-
+                
                 this.current_file = null;
                 this.ready = false;
@@ -1129 +963 @@
                 this.caption.setStyle('display','none').empty();
                 this.bottom.setStyle('visibility','hidden');
-
+                
                 //TODO anche opacity a 0 se si usa un tween per il file
                 this.filebox.setStyle('height','').empty();
-
+                
                 this.mainbox.setStyles({
                         'opacity':0,
                         'display':'none',
-                        'width':this.options.init_width,
-                        'height':this.options.init_height,
-                        'marginLeft':-(this.options.init_width/2),
-                        'marginTop':(this.options.centered ? -(this.options.init_height/2) : ''),
-                        'top':(this.options.centered ? '50%' : '')
-                });
-
+                        'width':this.options.initialWidth,
+                        'height':this.options.initialHeight,
+                        'marginLeft':-(this.options.initialWidth/2),
+                        'marginTop':(this.options.centered) ? -(this.options.initialHeight/2) : '',
+                        'top':(this.options.centered) ? '50%' : ''
+                });
+                
+                this.filebox.setStyle('opacity',0);
+                
                 this.overlay_hide_fx.start(0);
-
-                this.fireEvent('disappear');
+                
+                //this.fireEvent('disappear');
         },//end disappear
-
+        
         cancel_effects:function(){
                 [this.mainbox_resize_fx,
@@ -1154 +990 @@
                 this.overlay_hide_fx,
                 this.overlay_show_fx
-                ].each(function(fx){
-                        fx.cancel();
-                });
-        },
-
+                ].each(function(fx){ fx.cancel(); });
+        },
+        
         set_mode:function(gallery_type){
-
+                
                 this.mode = gallery_type;
                 var close_w = this.close.getComputedSize().width;
@@ -1167 +1001 @@
                 var playpause_w = this.playpause.getComputedSize().width;
                 var offset = this.mainbox.getStyle('border-right-width').toInt();//for design purposes
-
+                
                 switch(gallery_type){
                         case 'autoplay':
@@ -1185 +1019 @@
                                 return;
                 }
-
+        
                 this.caption.setStyle('margin-right',this.controls.getComputedSize().totalWidth);
         },//end set_mode
-
+        
         set_paused:function(paused){
                 this.paused = paused;
-                var pos = (this.paused ? '0 -66px' : '');
+                var pos = (this.paused) ? '0 -66px' : '';
                 this.playpause.setStyle('background-position',pos);
         },
-
+        
         update_count:function(index,length){
-                this.count.set('text',index+' '+this.options.image_of_text+' '+length);
+                this.count.set('text',index+' '+this.options.imageOfText+' '+length);
         },
 
         resetOverlaySize:function(){
-                if(this.overlay.getStyle('opacity') == 0){
-                        //resize only if visible
-                        return;
-                }
-                var h = window.getSize().y;
-                this.overlay.setStyles({ 'height':h });
+                if(this.overlay.getStyle('opacity') == 0){ return; };//resize only if visible
+                var h = window.getScrollSize().y+window.getScroll().y;
+                this.overlay.setStyles({ 'height':h, 'top':-window.getScroll().y });
+        },
+        
+        clear:function(){
+                this.overlay.destroy();
+                this.mainbox.destroy();
         }
-
+        
 });//END
 
@@ -1215 +1051 @@
 
 //Class: MilkboxGallery
-//args: source,options
+//args: source,options 
 //      *source: element, elements, array
 //      *options: name, autoplay, autoplay_delay
@@ -1226 +1062 @@
                 name:null,
                 autoplay:null,
-                autoplay_delay:null
+                autoplay_delay:null,
+                remove_title:true
         },
 
         initialize:function(source,options){
-
+                
                 this.setOptions(options);
-
+                
                 this.source = source;
                 this.external = false;
@@ -1243 +1080 @@
 
         prepare_gallery:function(){
-                switch(typeOf(this.source))
-                {
-                case 'element'://single
-                        if(this.check_extension(this.source.href)){
-                                this.items = [this.source];
-                        }
-                        break;
-                case 'elements'://html
-                        this.items = this.source.filter(function(link){
-                                return this.check_extension(link.href);
-                        },this);
-                        break;
-                case 'array'://xml, array
-                        this.items = this.source.filter(function(link){
-                                return this.check_extension(link.href);
-                        },this);
-                        this.external = true;
-                        break;
-                default:
-                        return;
-                }
-        },
-
+                switch(typeOf(this.source)){
+                        case 'element'://single
+                                if(this.check_extension(this.source.href)){ this.items = [this.source]; }
+                                else{ alert('Wrong file extension: '+this.source.href); }
+                                break;
+                        case 'elements'://html
+                                this.items = this.source.filter(function(link){ return this.check_extension(link.href); },this);
+                                break;
+                        case 'array'://xml, array
+                                this.items = this.source.filter(function(link){ return this.check_extension(link.href); },this);
+                                this.external = true;
+                                break;
+                        default:
+                                return;
+                }
+                
+                if(this.items.length == 0){ alert('Warning: gallery '+this.name+' is empty'); }
+        },
+        
         //turns everything into an object
         prepare_elements:function(){
-                //console.log('items gallery', this.items);
-                if(!this.items || this.items.length === 0) {
-                        return;   // [i_a] prevent crash when none have been set up
-                }
-
                 this.items = this.items.map(function(item){
                         var splitted_url = item.href.split('?');
                         var output = {};
-                        output.element = (typeOf(item) === 'element' ? item : null);
+                        output.element = (typeOf(item) == 'element') ? item : null;
                         output.href = splitted_url[0];
-                        output.vars = (splitted_url[1] ? splitted_url[1].parseQueryString() : null);
+                        output.vars = (splitted_url[1]) ? splitted_url[1].parseQueryString() : null;
                         output.size = null;
-                        output.caption = (output.element ? output.element.get('title') : item.title);
-                        var size_string = (output.element ? output.element.get('data-milkbox-size') : item.size);
-                        if(size_string){
-                                output.size = Object.map(this.get_item_props(size_string),function(value,key){
-                                        return value.toInt();
-                                });
-                        }
+                        output.caption = (output.element) ? output.element.get('title') : item.title;
+                        if(this.options.remove_title && output.element){ output.element.removeProperty('title') }
+                        
+                        var size_string = (output.element) ? output.element.get('data-milkbox-size') : item.size;
+                        if(size_string){ output.size = Object.map(this.get_item_props(size_string),function(value,key){ return value.toInt(); }); }
+                        
+                        var extras = (output.element) ? output.element.get('data-milkbox-extras') : item.extras;
+                        output.extras = (extras) ? extras : '';
+                        
                         return output;
                 },this);
-
-                if(this.items.length === 0) {
-                        return;
-                }
-
-                this.type = (this.items.length === 1 ? 'single' : (this.options.autoplay ? 'autoplay' : 'standard'));
-        },
-
+                
+                if(this.items.length == 0) return;
+                
+                this.type = (this.items.length == 1) ? 'single' : (this.options.autoplay) ? 'autoplay' : 'standard';
+        },
+        
         check_extension:function(string){
-                return string.split('?')[0].test(/\.(gif|jpg|jpeg|png|bmp|tif|tiff|swf|html)$/i);
-        },
-
+                var splitted, regular_file, dyn_url;
+                
+                splitted  = string.split('?')[0];
+                
+                regular_file = splitted.test(/\.(gif|jpg|jpeg|png|swf|html)$/i);
+                if(!regular_file){ dyn_url = splitted.test(/\/\d+$/); }
+                
+                var pass = (regular_file || dyn_url) ? true : false;
+                
+                return pass;
+        },
+        
         get_index_of:function(item){
-                var index = (typeOf(item) === 'string' ? this.items.indexOf(this.items.filter(function(i){
-                                return i.href === item;
-                        })[0]) : this.items.indexOf(item));
-                return index;
-        },
-
+                var index = (typeOf(item) == 'string') ? this.items.indexOf(this.items.filter(function(i){ return i.href === item; })[0]) : this.items.indexOf(item);
+                return this.items.indexOf(item);
+        },
+        
         get_item:function(index){
                 return this.items[index];
         },
-
+        
         get_item_props:function(prop_string){
                 var props = {};
-                prop_string.split(',').each(function(p,i){
+                var s = prop_string.split(',').each(function(p,i){
                         var clean = p.trim().split(':');
                         props[clean[0].trim()] = clean[1].trim();
@@ -1320 +1155 @@
                 return props;
         },
-
+        
         refresh:function(){
-                this.type = (this.items.length === 1 ? 'single' : (this.options.autoplay ? 'autoplay' : 'standard'));
-        },
-
+                this.type = (this.items.length == 1) ? 'single' : (this.options.autoplay) ? 'autoplay' : 'standard';
+        },
+        
         clear:function(){
                 this.source = null;
@@ -1334 +1169 @@
 
 
-// Creating Milkbox instance: set __MILKBOX_NO_AUTOINIT__ to instantiate Milkbox somewhere else instead.
-if (typeof __MILKBOX_NO_AUTOINIT__ === 'undefined')
-{
-        window.addEvent('domready', function(){
-                this.milkbox = new Milkbox({
-                        centered:false
-                });
+//Creating Milkbox instance: you can comment this code and instantiate Milkbox somewhere else instead.
+window.addEvent('domready', function(){ 
+        //milkbox = new Milkbox({overlayOpacity:1, fileboxBorderWidth:'10px', fileboxBorderColor:'#ff0000', fileboxPadding:'20px', centered:true});
+        milkbox = new Milkbox({ 
+                //autoPlay:true
         });
-}
-
-/*
-jsLint settings:
-disallow undefined variables, assume browser
-predefined variables: alert, Class, Options, Events, instanceOf, typeOf, Request, Fx, Asset, Swiff, $, $$, Element
-                      include these to shut up jsLint about further undefined/too early errors:     Milkbox, MilkboxGallery, MilkboxDisplay
-expect ~ 15 errors reported
-*/
+});

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Language/Language.pt.js

@@ -7 +7 @@
 */
 
-FileManager.Language.en = {
+FileManager.Language.pt = {
         more: 'Detalhes',
         width: 'Largura:',

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/FileManager.js

@@ -84 +84 @@
                 createFolders: false,
                 filter: '',
+                listType: 'thumb',                                                              // the standard list type can be 'list' or 'thumb'
     keyboardNavigation: true,         // set to false to turn off keyboard navigation (tab, up/dn/pageup/pagedn etc)
                 detailInfoMode: '',               // (string) whether you want to receive extra metadata on select/etc. and/or view this metadata in the preview pane (modes: '', '+metaHTML', '+metaJSON'. Modes may be combined)
@@ -92 +93 @@
                 hideClose: false,
                 hideOverlay: false,
-                hideQonDelete: false,
+                hideOnDelete: false,
                 hideOnSelect: true,               // (boolean). Default to true. If set to false, it leavers the FM open after a picture select.
     showDirGallery: true,
@@ -135 +136 @@
                 this.root = null;
                 this.CurrentDir = null;
-                this.listType = 'list';
+                this.listType = this.options.listType;
                 this.dialogOpen = false;
                 this.storeHistory = false;
@@ -273 +274 @@
                         this.diag.log('pathTitle-click event: ', e, ' @ ', e.target.outerHTML);
                         e.stop();
-                        if (this.header.getElement('span.filemanager-dir') != null) {
+                        if (this.header.getElement('span.filemanager-dir') !== null) {
                                 this.selectablePath.setStyle('width',(this.header.getSize().x - this.pathTitle.getSize().x - 55));
                                 this.selectablePath.replaces(this.clickablePath);
@@ -373 +374 @@
                                 'style' : 'margin-right: 10px;',
                                 'title': this.language.toggle_side_boxes
-                        }).set('opacity',0.5).addEvents({
+                        }).setStyle('opacity',0.5).addEvents({
                                 click: this.toggleList.bind(this)
                         });
@@ -380 +381 @@
                                 'class':'listType',
                                 'title': this.language.toggle_side_list
-                        }).set('opacity',1).addEvents({
+                        }).setStyle('opacity',1).addEvents({
                                 click: this.toggleList.bind(this)
                         });
+
+                if(this.listType == 'thumb') {
+                        this.browserMenu_thumb.setStyle('opacity',1);
+                        this.browserMenu_list.setStyle('opacity',0.5);
+                }
+
+                // set startup list type
+                if(this.options.thumbnailList === true)
+                        this.toggleList.bind(this);
 
                 // Add a scroller to scroll the browser list when dragging a file
@@ -395 +405 @@
                 });
 
+    if(this.options.showDirGallery)
+    {
 // Partikule : Thumbs list in preview panel
                 this.browserMenu_thumbList = new Element('a',{
@@ -419 +431 @@
                         }.bind(this));
 // /Partikule
-
+    }
 
                 this.browser_dragndrop_info = new Element('a',{
@@ -427 +439 @@
                 this.browser_paging = new Element('div',{
                                 'id':'fm_view_paging'
-                        }).set('opacity', 0); // .setStyle('visibility', 'hidden');
+                        }).setStyle('opacity', 0); // .setStyle('visibility', 'hidden');
                 this.browser_paging_first = new Element('a',{
                                 'id':'paging_goto_first'
-                        }).set('opacity', 1).addEvents({
+                        }).setStyle('opacity', 1).addEvents({
                                 click: this.paging_goto_first.bind(this)
                         });
                 this.browser_paging_prev = new Element('a',{
                                 'id':'paging_goto_previous'
-                        }).set('opacity', 1).addEvents({
+                        }).setStyle('opacity', 1).addEvents({
                                 click: this.paging_goto_prev.bind(this)
                         });
                 this.browser_paging_next = new Element('a',{
                                 'id':'paging_goto_next'
-                        }).set('opacity', 1).addEvents({
+                        }).setStyle('opacity', 1).addEvents({
                                 click: this.paging_goto_next.bind(this)
                         });
                 this.browser_paging_last = new Element('a',{
                                 'id':'paging_goto_last'
-                        }).set('opacity', 1).addEvents({
+                        }).setStyle('opacity', 1).addEvents({
                                 click: this.paging_goto_last.bind(this)
                         });
@@ -522 +534 @@
                 // Thumbs list container (in preview panel)
                 this.dir_filelist = new Element('div', {'class': 'filemanager-filelist'});
+                // creates a list, HELPS to make the thumblist DRAGABLE
+                this.dir_filelist_thumbUl = new Element('ul');
+                this.dir_filelist_thumbUl.inject(this.dir_filelist);
 
 // /Partikule
@@ -553 +568 @@
                         }
                 });
+
+                // add toolTips
                 if (!this.options.hideClose) {
                         this.tips.attach(this.closeIcon);
                 }
+                this.tips.attach(this.browserMenu_thumb);
+                this.tips.attach(this.browserMenu_list);
+                this.tips.attach(this.browserMenu_thumbList);
 
                 this.imageadd = Asset.image(this.assetBasePath + 'Images/add.png', {
@@ -563 +583 @@
                                 'z-index': this.options.zIndex + 1600
                         }
-                }).set('opacity', 0).set('tween', {duration: 'short'}).inject(this.container);
+                }).setStyle('opacity', 0).set('tween', {duration: 'short'}).inject(this.container);
 
                 if (!this.options.hideOverlay) {
@@ -734 +754 @@
                 else
                 {
-                        var parent = (this.options.parentContainer != null ? $(this.options.parentContainer) : this.container.getParent());
+                        var parent = (this.options.parentContainer !== null ? document.id(this.options.parentContainer) : this.container.getParent());
                         if (parent)
                         {
@@ -769 +789 @@
                 if (e) e.stop();
 
+                // if the clicked elelement is from the preview gallery, get the corresponding element
+                if(el.retrieve('el_ref'))
+                                el = el.retrieve('el_ref');
+
                 // ignore mouse clicks while drag&drop + resulting copy/move is pending.
                 //
                 // Theoretically only the first click originates from the same mouse event as the 'drop' event, so we
                 // COULD reset 'drop_pending' after processing that one.
-                if (this.drop_pending != 0)
+                if (this.drop_pending !== 0)
                 {
                         this.drop_pending = 0;
@@ -811 +835 @@
 
                         this.switchButton4Current();
+
+                        // // // now make sure we can see the selected item in the left pane: scroll there:
+                        this.browserSelection('current');
                 }
         },
@@ -817 +844 @@
 
         /**
-         * Catches both single and double click on thumb list icon in the directory preview thumb/gallery list
-         */
-        relayDblClick: function(e, self, dg_el, file, clicks)
+        * Catches double clicks and open the file if selectable is true */
+        relayDblClick: function(e, el)
         {
+                if(this.options.selectable === false)
+                        return;
                 if (e) e.stop();
 
-                this.diag.log('on relayDblClick file = ', file, ', current dir: ', this.CurrentDir, ', # clicks: ', clicks);
+                this.diag.log('on relayDblClick file = ', el.retrieve('file'), ', current dir: ', this.CurrentDir);
 
                 this.tips.hide();
 
-                var el_ref = dg_el.retrieve('el_ref');
-
-                if (this.Current)
-                {
-                        this.Current.removeClass('selected');
-                }
-
-                this.Current = el_ref.addClass('selected');
-                file = el_ref.retrieve('file');
-
-                this.CurrentFile = file;
-
-                // now make sure we can see the selected item in the left pane: scroll there:
-                this.browserSelection('none');
-
-                // only simulate the 'select' button click by doubleclick on thumbnail in directory preview, when 'select' is actually allowed.
-                if (clicks === 2 && this.options.selectable)
-                {
+                this.CurrentFile = el.retrieve('file');
+
+                if (this.CurrentFile.mime !== 'text/directory')
                         this.open_on_click(null);
-                }
-                else
-                {
-                        // the single-click action is to simulate a click on the corresponding line in the directory view (left pane)
-                        this.relayClick(e, el_ref);
-                }
         },
 
@@ -859 +866 @@
                 if (e) e.stop();
 
-                $$('.filemanager-browserheader a.listType').set('opacity',0.5);
+                $$('.filemanager-browserheader a.listType').setStyle('opacity',0.5);
                 if (!this.browserMenu_thumb.retrieve('set',false)) {
                         this.browserMenu_list.store('set',false);
-                        this.browserMenu_thumb.store('set',true).set('opacity',1);
+                        this.browserMenu_thumb.store('set',true).setStyle('opacity',1);
                         this.listType = 'thumb';
                         if (typeof jsGET !== 'undefined') jsGET.set('fmListType=thumb');
                 } else {
                         this.browserMenu_thumb.store('set',false);
-                        this.browserMenu_list.store('set',true).set('opacity',1);
+                        this.browserMenu_list.store('set',true).setStyle('opacity',1);
                         this.listType = 'list';
                         if (typeof jsGET !== 'undefined') jsGET.set('fmListType=list');
@@ -912 +919 @@
                         case 'fmFile':
                                 var hot_item = (this.Current && this.Current.retrieve('file'));
-                                if (hot_item == null || value !== hot_item.name)
+                                if (hot_item === null || value !== hot_item.name)
                                 {
                                         this.browser.getElements('span.fi span').each((function(current)
@@ -946 +953 @@
                 if (typeof loaddir === 'undefined') loaddir = null;
 
-                if (loaddir == null && typeof jsGET !== 'undefined')
-                {
-                        if (jsGET.get('fmPath') != null)
+                if (loaddir === null && typeof jsGET !== 'undefined')
+                {
+                        if (jsGET.get('fmPath') !== null)
                         {
                                 loaddir = jsGET.get('fmPath');
                         }
                 }
-                if (loaddir == null)
+                if (loaddir === null)
                 {
                         if (this.CurrentDir)
@@ -970 +977 @@
                                 this.diag.log('on show: set onShow on fmFile: ', jsGET.get('fmFile'));
                         }
-                        if (jsGET.get('fmListType') != null) {
-                                $$('.filemanager-browserheader a.listType').set('opacity',0.5);
+                        if (jsGET.get('fmListType') !== null) {
+                                $$('.filemanager-browserheader a.listType').setStyle('opacity',0.5);
                                 this.listType = jsGET.get('fmListType');
                                 if (this.listType === 'thumb')
-                                        this.browserMenu_thumb.store('set',true).set('opacity',1);
+                                        this.browserMenu_thumb.store('set',true).setStyle('opacity',1);
                                 else
-                                        this.browserMenu_list.store('set',true).set('opacity',1);
+                                        this.browserMenu_list.store('set',true).setStyle('opacity',1);
                         }
                         jsGET.set({
@@ -1437 +1444 @@
                                                 this.view_fill_timer = null;
 
+                                                // was here before
+                                        }
+                                }
+
+                                // -> move this here, so it always reloads the thumbnail pane in the preview window
                                                 rerendering_list = true;
                                                 this.fill(null, this.get_view_fill_startindex(), this.listPaginationLastSize);
-                                        }
-                                }
+
                                 // make sure fade does not clash with parallel directory (re)load:
                                 if (!rerendering_list)
@@ -1452 +1463 @@
                                 }
                                 this.browserLoader.fade(0);
+
+                                // clear preview pane thumbnails
+                                // this.dir_filelist.empty();
+
                         }).bind(this),
                         onComplete: function() {},
@@ -1464 +1479 @@
 
         destroy: function(file) {
-                if (this.options.hideQonDelete) {
+                if (this.options.hideOnDelete) {
                         this.destroy_noQasked(file);
                 }
@@ -1557 +1572 @@
 
         browserSelection: function(direction) {
-                var csel;
+                var csel,current;
 
                 this.diag.log('browserSelection : direction = ', direction);
-                if (this.browser.getElement('li') == null) return;
+                if (this.browser.getElement('li') === null) return;
 
                 if (direction === 'go-bottom')
@@ -1569 +1584 @@
                         // blow away any lingering 'selected' after a page switch like that
                         csel = this.browser.getElement('span.fi.selected');
-                        if (csel != null)
+                        if (csel !== null)
                                 csel.removeClass('selected');
                 }
@@ -1579 +1594 @@
                         // blow away any lingering 'selected' after a page switch like that
                         csel = this.browser.getElement('span.fi.selected');
-                        if (csel != null)
+                        if (csel !== null)
                                 csel.removeClass('selected');
                 }
-                else if (this.browser.getElement('span.fi.hover') == null && this.browser.getElement('span.fi.selected') == null)
+                else if (this.browser.getElement('span.fi.hover') === null && this.browser.getElement('span.fi.selected') === null)
                 {
                         // none is selected: select first item (folder/file)
                         current = this.browser.getFirst('li').getElement('span.fi');
                 }
+                else if(direction === 'current') {
+                        current = this.Current;
+                }
                 else
                 {
                         // select the current file/folder or the one with hover
-                        var current = null;
-                        if (this.browser.getElement('span.fi.hover') == null && this.browser.getElement('span.fi.selected') != null) {
+                        current = null;
+                        if (this.browser.getElement('span.fi.hover') === null && this.browser.getElement('span.fi.selected') !== null) {
                                 current = this.browser.getElement('span.fi.selected');
                         }
-                        else if (this.browser.getElement('span.fi.hover') != null) {
+                        else if (this.browser.getElement('span.fi.hover') !== null) {
                                 current = this.browser.getElement('span.fi.hover');
                         }
@@ -1628 +1646 @@
                         // when we're at the bottom of the view and there are more pages, go to the next page:
                         next = current.getNext('li');
-                        if (next == null)
+                        if (next === null)
                         {
                                 if (this.paging_goto_next(null, 'go-bottom'))
@@ -1637 +1655 @@
                                 for ( ; stepsize > 0; stepsize--) {
                                         next = current.getNext('li');
-                                        if (next == null)
+                                        if (next === null)
                                                 break;
                                         current = next;
@@ -1668 +1686 @@
                         // when we're at the top of the view and there are pages before us, go to the previous page:
                         var previous = current.getPrevious('li');
-                        if (previous == null)
+                        if (previous === null)
                         {
                                 if (this.paging_goto_prev(null, 'go-top'))
@@ -1677 +1695 @@
                                 for ( ; stepsize > 0; stepsize--) {
                                         previous = current.getPrevious('li');
-                                        if (previous == null)
+                                        if (previous === null)
                                                 break;
                                         current = previous;
@@ -1700 +1718 @@
                         this.Current = current;
                         csel = this.browser.getElement('span.fi.selected');
-                        if (csel != null) // remove old selected one
+                        if (csel !== null) // remove old selected one
                                 csel.removeClass('selected');
 
@@ -1707 +1725 @@
                         this.diag.log('on key ENTER file = ', currentFile);
                         if (currentFile.mime === 'text/directory') {
-                                this.load(currentFile.dir + currentFile.name /*.replace(this.root,'')*/);
+                                this.load(currentFile.path /*.replace(this.root,'')*/);
                         }
                         else {
@@ -1725 +1743 @@
                         var parent = current.getParent('li');
                         next = parent.getNext('li');
-                        if (next == null) {
+                        if (next === null) {
                                 next = parent.getPrevious('li');
                         }
-                        if (next != null) {
+                        if (next !== null) {
                                 next = next.getElement('span.fi');
                                 next.addClass('hover');
@@ -1896 +1914 @@
 
                 // Adding the thumbnail list in the preview panel: blow away any pre-existing list now, as we'll generate a new one now:
-                this.dir_filelist.empty();
+                this.dir_filelist_thumbUl.empty();
 
                 // set history
@@ -2194 +2212 @@
                         file = j.dirs[idx];
 
-                        if (idx % 10 == 0) {
+                if (idx % 10 === 0) {
                                 // try not to spend more than 100 msecs per (UI blocking!) loop run!
                                 loop_duration = new Date().getTime() - loop_starttime;
@@ -2240 +2258 @@
                         editButtons.each(function(v) {
                                 //icons.push(
-                                Asset.image(this.assetBasePath + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').set('opacity', 0).addEvent('mouseup', (function(e, target) {
+                                Asset.image(this.assetBasePath + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').setStyle('opacity', 0).addEvent('mouseup', (function(e, target) {
                                         // this = el, self = FM instance
                                         e.preventDefault();
@@ -2275 +2293 @@
                                 file = j.files[idx - dir_count];
 
-                                if (idx % 10 == 0) {
+                                if (idx % 10 === 0) {
                                         // try not to spend more than 100 msecs per (UI blocking!) loop run!
                                         loop_duration = new Date().getTime() - loop_starttime;
@@ -2453 +2471 @@
                                 }
 
+                                // add double click functionality to the list elements
+                                if(this.options.selectable === true) {
+                                        el.addEvent('dblclick', (function(e) {
+                                                self.diag.log('is_file:DBLCLICK: ', e);
+                                                var node = this;
+                                                self.relayDblClick.apply(self, [e, node]);
+                                        }).bind(el));
+                                }
+
                                 editButtons = [];
 
@@ -2461 +2488 @@
 
                                 editButtons.each(function(v) {
-                                        Asset.image(this.assetBasePath + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').set('opacity', 0).addEvent('mouseup', (function(e, target) {
+                                        Asset.image(this.assetBasePath + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').setStyle('opacity', 0).addEvent('mouseup', (function(e, target) {
                                                 // this = el, self = FM instance
                                                 e.preventDefault();
@@ -2510 +2537 @@
 // Partikule
 // Thumbs list
+// edit: Fabian Vogelsteller: made thumblist DRAGGABLE
 
                                 // use a closure to keep a reference to the current dg_el, otherwise dg_el, file, etc. will carry the values they got at the end of the loop!
                                 (function(dg_el, el, file)
                                 {
-                                        dg_el.store('el_ref', el).addEvents({
-                                                'click': function(e)
-                                                {
-                                                        clearTimeout(self.dir_gallery_click_timer);
-                                                        self.dir_gallery_click_timer = self.relayDblClick.delay(700, self, [e, this, dg_el, file, 1]);
-                                                },
-                                                'dblclick': function(e)
-                                                {
-                                                        clearTimeout(self.dir_gallery_click_timer);
-                                                        self.dir_gallery_click_timer = self.relayDblClick.delay(0, self, [e, this, dg_el, file, 2]);
-                                                }
-                                        });
-
-                                        dg_el.inject(this.dir_filelist);
+                                        var thumbLi = new Element('li');
+
+                                        dg_el.store('el_ref', el).store('file',file).store('parent',thumbLi);
+
+                                        thumbLi.inject(this.dir_filelist_thumbUl);
+                                        dg_el.inject(thumbLi);
                                 }).bind(this)(dg_el, el, file);
 
@@ -2563 +2583 @@
                 //this.diag.log(' + time taken in array traversal + revert = ', duration);
 
+                // -> made preview thumblist DRAGGABLE
+                // add the thumbnail pane in preview window to the dropable elements
+                this.dir_filelist.getChildren('ul li div.fi').each((function(thumb){
+                        els[0].push(thumb);
+                }).bind(this));
+
+                // make draggable
                 if (support_DnD_for_this_dir) {
                         // -> make draggable
@@ -2750 +2777 @@
                                                                                 this.view_fill_timer = null;
 
-                                                                                rerendering_list = true;
-                                                                                this.fill(null, this.get_view_fill_startindex(), this.listPaginationLastSize);
+                                                                                // was here
                                                                         }
                                                                 }
+
+                                                                // -> moves this here so it always reloads the thumbnail pane in the preview window
+                                                                rerendering_list = true;
+                                                                this.fill(null, this.get_view_fill_startindex(), this.listPaginationLastSize);
 
                                                                 // make sure fade does not clash with parallel directory (re)load:
@@ -2795 +2825 @@
                 }
 
+                // add tooltip for drag n drop icon
+                this.tips.attach(this.browser_dragndrop_info);
+
                 // check how much we've consumed so far:
                 duration = new Date().getTime() - starttime;
@@ -2925 +2958 @@
 
                         this.diag.log('fillInfo: request detail for file: ', Object.clone(file), ', dir: ', dir);
-      if(this.options.showDirGallery == false && file.mime === 'text/directory') return;
+      if(this.options.showDirGallery === false && file.mime === 'text/directory') return;
                         var tx_cfg = this.options.mkServerRequestURL(this, 'detail', {
                                                         directory: this.dirname(file.path),
@@ -3150 +3183 @@
               .inject(previewArea);
               
-    previewArea = new Element('div', {class: 'filemanager-preview-content'}).inject(previewArea);
+    previewArea = new Element('div', {'class': 'filemanager-preview-content'}).inject(previewArea);
     
     var dewplayer = this.assetBasePath + '/dewplayer.swf';
@@ -3175 +3208 @@
                 });
 
-                $(appearOn).addEvents({
+                document.id(appearOn).addEvents({
                         mouseenter: (function() {
-                                                        this.set('opacity', opacity[0]);
+                                                        this.setStyle('opacity', opacity[0]);
                                                 }).bind(icon),
                         mouseleave: (function() {
-                                                        this.set('opacity', opacity[1]);
+                                                        this.setStyle('opacity', opacity[1]);
                                                 }).bind(icon)
                 });
@@ -3718 +3751 @@
                 if (autofocus_el)
                 {
-                        if (('autofocus' in autofocus_el) && !(Browser.Engine && Browser.Engine.webkit))
-                        {
                                 // HTML5 support: see    http://diveintohtml5.org/detect.html
-                                //
-                                // Unfortunately, it's not really working for me in webkit browsers (Chrome, Safari)  :-((
-                                autofocus_el.set('autofocus', 'autofocus');
-                                autofocus_el = null;
-                        }
-                        else
-                        {
-                                // Safari / Chrome have trouble focussing on things not yet fully rendered!
-                        }
+                        autofocus_el.setProperty('autofocus', 'autofocus');
+      autofocus_el.focus();
                 }
                 this.el.center().fade(1).get('tween').chain((function() {
@@ -3863 +3887 @@
                 this.resize();
 
-                this.el.setStyles({
-                        opacity: 0,
-                        display: 'block'
-                }).get('tween'). /* pause(). */ start('opacity', 0.5);
+                this.el.setStyle('display', 'block');
+                this.el.fade('hide').fade(0.5);
 
                 window.addEvent('resize', this.resize.bind(this));
@@ -3908 +3930 @@
                 if (this.objects && this.objects.length) {
                         this.objects.each(function(el) {
-                                el.style.visibility = 'visible';
+                                        el.setStyle('visibility', 'visible');
                         });
                 }

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/Gallery.js

@@ -9 +9 @@
 
 requires:
-  core/1.3.1: '*'
-  more/1.3.1.1: [Sortables]
+  core/1.4.5: '*'
+  more/1.4.0.1: [Sortables]
 
 provides: FileManager.Gallery
@@ -73 +73 @@
                                 }
                                 self.hideClone();
-                                self.wrapper.setStyle('display', 'none');
+                                // self.wrapper.setStyle('display', 'none');
                         },
 
@@ -90 +90 @@
                         styles:
                         {
-                                'z-index': this.options.zIndex + 10
+                                'z-index': this.options.zIndex - 10
                         }
                 }).inject(this.container);
@@ -105 +105 @@
                         styles:
                         {
-                                'z-index': this.options.zIndex + 750
-                        },
-                        tween: {duration: 'short'},
-                        opacity: 0,
-                        events: {
-                                mouseenter: function() {
-                                        if (self.options.closeCaptionEditorOnMouseOut)
-                                        {
-                                                clearTimeout(timer);
-                                        }
-                                },
-                                mouseleave: function(e) {
-                                        var target = this;
-
-                                        if (self.options.closeCaptionEditorOnMouseOut)
-                                        {
-                                                timer = (function() {
-                                                        self.removeClone(e, target);
-                                                }).delay(500);
-                                        }
-                                }
-                        }
+                                'z-index': this.options.zIndex + 750,
+                                'opacity': 0,
+                                'display': 'none'
+                        },
+                        tween: {duration: 'short'}
                 }).adopt(
                         new Element('span', {text: this.language.gallery.text}),
@@ -178 +161 @@
                         w: wrapper_pos.width
                 };
-
                 this.droppables.push(this.gallery);
 
@@ -285 +267 @@
 
                 this.hideClone();
-                this.wrapper.setStyle('display', 'none');
+                // this.wrapper.setStyle('display', 'none');
         },
 
@@ -329 +311 @@
                 var cw = this.captionImgContainerSize.x;
                 var ch = this.captionImgContainerSize.y;
+                var redux;
                 if (w > cw)
                 {
-                        var redux = cw / w;
+                        redux = cw / w;
                         w *= redux;
                         h *= redux;
@@ -337 +320 @@
                 if (h > ch)
                 {
-                        var redux = ch / h;
+                        redux = ch / h;
                         w *= redux;
                         h *= redux;
@@ -380 +363 @@
                 });
 
-                //li_wrapper.set('opacity', 0);
+                // clone image for caption container
+                //li_wrapper.setStyle('opacity', 0);
                 this.clone = img_el.clone();
-                this.clone.store('file', file).store('parent', li_wrapper).addClass('filemanager-clone').setStyles(this.animation.from).set({
-                        morph: {link: 'chain'},
+                this.clone.store('file', file).store('parent', li_wrapper).addClass('filemanager-clone').set({
                         styles: {
-                                position: 'absolute',
+                                position: 'relative',
+                                width: w,
+                                height: h,
+                                top: ((260- h) / 2) - 2,
+                                left: ((260- w) / 2) - 1,
                                 'z-index': this.options.zIndex + 800
-                        },
-                        events: {
-                                click: function(e) {
-                                        if (!self.files[name])
-                                                return;
-                                        self.fireEvent('galleryPreview', [file.path, self.files[name], li_wrapper, self]);
-                                }
-                        }
-                }).inject(document.body).morph(this.animation.to).get('morph').chain(function() {
-                        if (!self.files[name])
-                                return;
-                        self.input.set('value', self.files[name].caption || '');
-                        self.wrapper.setStyles({
-                                opacity: 1,
-                                display: 'block',
-                                left: self.animation.to.left + self.captionDialogOffsets.x /* -12 */,
-                                top: self.animation.to.top + self.captionDialogOffsets.y /* -53 */
-                        }).fade(1).get('tween').chain(function() {
-                                self.input.focus();
-                        });
-                });
+                        }
+                }).inject(self.wrapper.getChildren('div.img')[0]);
+
+                // blend in the caption container
+                if (!this.files[name])
+                        return;
+                this.input.set('value', self.files[name].caption || '');
+                this.wrapper.setStyles({
+                        'position':'fixed',
+                        'display': 'block',
+                        'left': this.animation.to.left /* -12 */,
+                        'top': this.animation.to.top - this.captionDialogOffsets.y /* -53 */
+                }).fade('hide').fade(1).get('tween').chain((function() {
+                        this.input.focus();
+                }).bind(this));
         },
 
@@ -426 +407 @@
                 var cw = this.imgContainerSize.x;
                 var ch = this.imgContainerSize.y;
+                var redux;
                 if (w > cw)
                 {
-                        var redux = cw / w;
+                        redux = cw / w;
                         w *= redux;
                         h *= redux;
@@ -434 +416 @@
                 if (h > ch)
                 {
-                        var redux = ch / h;
+                        redux = ch / h;
                         w *= redux;
                         h *= redux;
@@ -461 +443 @@
                                         if (e) e.stop();
                                         if (!self.isSorting) {
-                                                 self.show_caption_editor(img_el, li_wrapper, file);
+                                                self.show_caption_editor(img_el, li_wrapper, file);
                                         }
                                         self.isSorting = false;
@@ -527 +509 @@
                         events: {
                                 click: function(e) {
-                                        if (e) e.stop();
-
+                                        if(e) e.stop();
                                         self.erasePicture(name);
                                 }
                         }
                 });
-
-                /*
-                 * as 'imgcontainer.getSize() won't deliver the dimensions as set in the CSS, we turn it the other way around:
-                 * we set the w/h of the image container here explicitly; the CSS can be used for other bits of styling.
-                 */
+                // hide on start
+                destroyIcon.setStyle('opacity',0);
+
+                /**
+                * as 'imgcontainer.getSize() won't deliver the dimensions as set in the CSS, we turn it the other way around:
+                * we set the w/h of the image container here explicitly; the CSS can be used for other bits of styling.
+                */
                 var imgcontainer = new Element('div', {
                         'class': 'gallery-image',
@@ -671 +654 @@
                 this.files[name].caption = (this.input.value || '');
 
-                this.clone.morph(this.animation.from).get('morph').clearChain().chain((function() {
-                        //this.clone.retrieve('parent').set('opacity', 1);
-                        this.clone.destroy();
-                }).bind(this));
+                self = this;
 
                 this.wrapper.fade(0).get('tween').chain(function() {
                         this.element.setStyle('display', 'none');
+                        self.clone.destroy();
                 });
         },
@@ -688 +669 @@
                 var parent = this.clone.retrieve('parent');
                 if (parent) {
-                        //parent.set('opacity', 1);
+                        //parent.setStyle('opacity', 1);
                 }
                 this.clone.destroy();
                 this.wrapper.setStyles({
                         opacity: 0,
-                        display: 'none'
+                        'display': 'none'
                 });
         },

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/Uploader/Fx.ProgressBar.js

@@ -30 +30 @@
 
   initialize: function(element, options) {
-    this.element = $(element);
+    this.element = document.id(element);
     this.parent(options);
 
@@ -70 +70 @@
     this.element.setStyle('backgroundPosition', css + ' 0px').title = Math.round(to) + '%';
 
-    var text = $(this.options.text);
+    var text = document.id(this.options.text);
     if (text) text.set('text', Math.round(to) + '%');
 

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/Uploader/Swiff.Uploader.js

@@ -126 +126 @@
 
     // container options for Swiff class
-    this.options.container = this.box = new Element('span', {'class': 'swiff-uploader-box',events: { click: function(e) { e.stopPropagation(); } }}).inject($(this.options.container) || document.body);
+    this.options.container = this.box = new Element('span', {'class': 'swiff-uploader-box',events: { click: function(e) { e.stopPropagation(); } }}).inject(document.id(this.options.container) || document.body);
 
     // target
-    this.target = $(this.options.target);
+    this.target = document.id(this.options.target);
     if(this.target) {
       var scroll = window.getScroll();
@@ -226 +226 @@
   initializeSwiff: function() {
     this.appendCookieData();          // looks like there's a bit of trouble with xSetOptions, so we circumvent it by passing it all in one go through xInitialize
-        //if (typeof console !== 'undefined' && console.log) console.log('initializeSwiff: data count = ' + this.options.data.length + ' : ' + this.options.data);
+        // if (typeof console !== 'undefined' && console.log) console.log('initializeSwiff: data count = ' + this.options.data.length + ' : ' + this.options.data);
 
     // extracted options for the swf
@@ -259 +259 @@
   reposition: function(coords) {
     // update coordinates, manual or automatically
-    coords = coords || (this.target && this.target.offsetHeight)
-      ? this.target.getCoordinates(this.box.getOffsetParent())
-      : {top: window.getScrollTop(), left: 0, width: 40, height: 40};
+    coords = coords || (this.target && this.target.offsetHeight) ? this.target.getCoordinates(this.box.getOffsetParent()) : {top: window.getScrollTop(), left: 0, width: 40, height: 40};
     this.box.setStyles(coords);
     this.fireEvent('reposition', [coords, this.box, this.target]);
@@ -267 +265 @@
 
   setOptions: function(options) {
-        //if (typeof console !== 'undefined' && console.log) console.log('Swiff.Uploader: BASE::setOptions');
+        // if (typeof console !== 'undefined' && console.log) console.log('Swiff.Uploader: BASE::setOptions');
     if (options) {
       if (options.url) options.url = Swiff.Uploader.qualifyPath(options.url);
@@ -274 +272 @@
       if (this.loaded) {
                 this.remote('xSetOptions', options);
-          }
+    }
     }
     return this;
@@ -316 +314 @@
   appendCookieData: function() {
     var append = this.options.appendCookieData;
-        //if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: ' + (1 * append) + ' / ' + append);
+        // if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: ' + (1 * append) + ' / ' + append);
     if (!append) return;
 
@@ -323 +321 @@
     document.cookie.split(/;\s*/).each(function(cookie) {
       cookie = cookie.split('=');
-          //if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: cookie: "' + cookie[0] + '"(' + cookie.length + ') = "' + (cookie.length > 1 ? cookie[1] : '???') + '"');
+      //if (typeof console !== 'undefined' && console.log) console.log('appendCookieData: cookie: "' + cookie[0] + '"(' + cookie.length + ') = "' + (cookie.length > 1 ? cookie[1] : '???') + '"');
       if (cookie.length == 2) {
         //hash['\"' + decodeURIComponent(cookie[0]) + '\"'] = decodeURIComponent(cookie[1]);    // allow session IDs such as the ASP.NET ones, which come with a dot, etc.
@@ -331 +329 @@
 
     var data = this.options.data || {};
-    if (typeOf(append) === 'string') {
-                data[append] = hash;
-        }
-    else {
-                Object.append(data, hash);
-        }
-
+    if (typeOf(append) == 'string') {
+      data[append] = hash;
+  } else {
+    Object.append(data, hash);
+  }
     this.setOptions({data: data});
   },
@@ -484 +480 @@
       if (options.url) {
                 options.url = Swiff.Uploader.qualifyPath(options.url);
-          }
+    }
       this.base.remote('xFileSetOptions', this.id, options);
       this.options = Object.merge(this.base.options, options);