Changeset 3673

Timestamp:

01/10/11 14:49:45 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1379 - Assinando a applet de envio avancado com os dados do Expresso Livre

Location:

branches/2.2/filemanager/js

Files:

• common_functions.js (modified) (2 diffs)
• draw_api.js (modified) (3 diffs)

branches/2.2/filemanager/js/common_functions.js

@@ -91 +91 @@
 function newUpload( )
 {
-        var _newUpload = function(data)
-        {
-                loadXtools();
-                
-                var pArgs = unserialize(data);
-                        pArgs.lang_add_file             = get_lang("Add file");
-                        pArgs.lang_click_here   = get_lang("Click here");
-                        pArgs.lang_more_files   = get_lang("More files");
-                        pArgs.lang_send_email   = get_lang("Send email");
-                        pArgs.height                    = 210;
-                        pArgs.path_filemanager  = path_filemanager;
-                        pArgs.width                     = 450;
-        
-                var _html = Xtools.parse( Xtools.xml("upload_files"), "upload.xsl", pArgs );
-                
-                draw_window( _html, 490, 350, get_lang("upload files") );
-        
-                if( pArgs.emails_to != null )
-                        sendNotification( pArgs.emails_to );
-        }
-        
-        address = document.location.toString();
-        address = address.split("?");
-        var url = address[0]+"?menuaction=filemanager.uifilemanager.showUploadboxes&path="+base64_encode(currentPath);
-        cExecute_( url, _newUpload );
+        if( document.getElementById("dwindownewUpload__parent") == null )
+        {
+                var _newUpload = function(data)
+                {
+                        loadXtools();
+                        
+                        var pArgs = unserialize(data);
+                                pArgs.lang_add_file             = get_lang("Add file");
+                                pArgs.lang_click_here   = get_lang("Click here");
+                                pArgs.lang_more_files   = get_lang("More files");
+                                pArgs.lang_send_email   = get_lang("Send email");
+                                pArgs.height                    = 210;
+                                pArgs.path_filemanager  = path_filemanager;
+                                pArgs.width                     = 450;
+                
+                        var _html = Xtools.parse( Xtools.xml("upload_files"), "upload.xsl", pArgs );
+                        
+                        draw_window( _html, 490, 350, get_lang("upload files"), "newUpload" );
+                
+                        if( pArgs.emails_to != null )
+                                sendNotification( pArgs.emails_to );
+                }
+                
+                address = document.location.toString();
+                address = address.split("?");
+                var url = address[0]+"?menuaction=filemanager.uifilemanager.showUploadboxes&path="+base64_encode(currentPath);
+                cExecute_( url, _newUpload );
+        }
 }
 
@@ -124 +127 @@
                 if ( navigator.plugins[i].name.match('Java') || navigator.plugins[i].name.match('libnpjp2') )
                 {
-                        close_window();
+                        _winBuild( "dwindownewUpload" , "remove" );
 
                         loadXtools();

branches/2.2/filemanager/js/draw_api.js

@@ -44 +44 @@
 function close_window()
 {
-        _winBuild( 'dwindow' + (zIndex-1) , "remove" );
+        _winBuild( 'dwindow' + ( zIndex-1 ) , "remove" );
 }
 
@@ -55 +55 @@
                 var sizeH               = ( arguments[2] ) ? arguments[2] : 200 ;
                 var titleAction = ( arguments[3] ) ? " - " + arguments[3] : "";
-                
+                var id_window   = ( arguments[4] ) ? "dwindow" + arguments[4] : "dwindow" + zIndex;
                 
                 var _janela = 
                 {
-                        id_window       : "dwindow"+zIndex,
+                        id_window       : id_window,
                         width           : sizeW,
                         height          : sizeH,
@@ -75 +75 @@
                 _winBuild( _janela );
         }
-        
 }