Changeset 3569 for branches/2.2/filemanager/tp/expressowindow/js

Timestamp:

12/09/10 16:47:45 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1395 - Padronizacao das janelas do filemanager com as do Expresso.

Location:

branches/2.2/filemanager/tp/expressowindow/js

Files:

• dragdrop.js (modified) (4 diffs)
• makeW.js (modified) (6 diffs)
• show_hidden.js (added)
• xtools.js (modified) (2 diffs)

branches/2.2/filemanager/tp/expressowindow/js/dragdrop.js

@@ -6 +6 @@
         var _parent             = null;
 
-        function _configEvent(pObj, pEvent, pHandler)
-        {
-                if ( typeof pObj == 'object' )
+        function _configEvent( pObj, pEvent, pHandler )
+        {
+                if ( pObj && typeof pObj == 'object' )
                 {
                         if ( pEvent.substring(0, 2) == 'on' )
@@ -22 +22 @@
                         else if ( arguments.length == 4 )
                         {
-                                if ( pObj.removeEventListener && pObj.removeEventListener != 'undefined')
-                                        pObj.removeEventListener(pEvent, pHandler, false);
+                                if ( pObj.removeEventListener )
+                                {
+                                        pObj.removeEventListener( pEvent, pHandler, false );
+                                }
                                 else if ( pObj.detachEvent )
-                                        pObj.detachEvent('on' + pEvent, pHandler);
+                                {
+                                        pObj.detachEvent( 'on' + pEvent, pHandler );
+                                }
                         }
                 }
@@ -148 +152 @@
                 if ( _element )
                 {
-                        _mouseUpShadow();
-                        
                         _configEvent(_element, 'onmousemove', _mouseMove, 'remove');
                         _configEvent(top.document, 'onmousemove', _mouseMove, 'remove');
@@ -157 +159 @@
 
                         _element.mouseOffset = null;
-                        _element = null;
+                        _mouseUpShadow();
                 }
         }

branches/2.2/filemanager/tp/expressowindow/js/makeW.js

@@ -4 +4 @@
         var dragDrop    = null;
         var path                = path_filemanager + "tp/expressowindow/";
+                
+        var _dialogs = [ ];
         
         function build(pObj)
@@ -30 +32 @@
                                 _window.setAttribute("leftOld", pObj.left + "px" );
                         
+                        if( pObj.leftOld )
+                                _window.setAttribute("leftOld", pObj.leftOld + "px" );
+                        
                         window.document.body.insertBefore( _window, document.body.lastChild );
                         
-                        getElement(pObj.id_window + '__content').innerHTML = pObj.content; 
+                        if ( pObj.content.constructor == String )
+                                getElement(pObj.id_window + '__content').innerHTML = pObj.content;
+                        else
+                                getElement(pObj.id_window + '__content').appendChild( pObj.content );
+                        
+                        _dialogs[ pObj.id_window ] = getElement(pObj.id_window + '__content').firstChild;
                         
                         if( pObj.draggable )
@@ -42 +52 @@
                 else
                 {
-                        load(pObj.id_window, "display");
+                if ( pObj.barejid && loadscript.windowPOPUP( pObj.barejid ) )
+                        return false;
+
+                load(pObj.id_window, "display");
                 }
         }
@@ -59 +72 @@
                         if ( pVisible == "display" )
                         {
-                                _window.style.left = _window.getAttribute("leftOld");
+                                if( _window.style.left == "-1500px" )
+                                        _window.style.left = _window.getAttribute("leftOld");
                         }
                         
@@ -79 +93 @@
                 if( arguments.length > 0 )
                 {
+                        var pId = null;
                         if( arguments.length == 1 )
                         {
-                                JSLoader.load([path + "css/" + theme_filemanager]);
-                                
                                 var obj = arguments[0];
-                                
-                                setTimeout(function(){ build(obj);}, 200);
+                                pId = obj.id_window
+                                build(obj);
                         }
                         
                         if( arguments.length == 2 )
                         {
-                                load(arguments[0], arguments[1]);
+                                load( ( pId = arguments[0] ), arguments[1]);
                         }       
                 }
+
+                return ( new function( )
+                {
+                        this.content = function( )
+                        {
+                                if ( arguments.length )
+                                        getElement( pId + '__content').appendChild( _dialogs[ pId ] );
+
+                                return _dialogs[ obj.id_window ];
+                        };
+                } );
         }
 
@@ -104 +128 @@
         {       
                 if( arguments.length == 1 )
-                        _win = new bWindow( arguments[0] );
+                        return bWindow( arguments[0] );
                 
                 if( arguments.length == 2 )
-                        _win = new bWindow( arguments[0], arguments[1]);        
+                        return bWindow( arguments[0], arguments[1]);    
         }
+        return false;
 }

branches/2.2/filemanager/tp/expressowindow/js/xtools.js

@@ -90 +90 @@
                                 var params = arguments[2];
                                 for (var i in params )
-                                         xslProc.setParameter(null, i, params[i]);
+                                        if ( params[ i ] && params[ i ].constructor != Function )
+                                                xslProc.setParameter(null, String( i ), String( params[i] ) );
                         }
 
@@ -112 +113 @@
                                 var params = arguments[2];
                                 for (var i in params )
-                                         xslProc.addParameter(i, params[i], '');
+                                        if ( params[ i ] && params[ i ].constructor != Function )
+                                        {
+                                                xslProc.addParameter( String( i ), String( params[i] ), '');
+                                        }
                         }