Changeset 4915 for branches/2.2/filemanager/js/handler.js

Timestamp:

08/09/11 17:14:05 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #2199 - Corrigido bug para criar e mover arquivos dentro do filemanager

File:

• branches/2.2/filemanager/js/handler.js (modified) (4 diffs)

branches/2.2/filemanager/js/handler.js

@@ -12 +12 @@
 
                 if (returnVal[0] == 'wpasswd')
-        {
-                write_error(get_lang('Wrong password'));
-                return;
-        }
-        else
-                write_msg(get_lang('Your operation was successfully executed'));
-
-        toolbar.control('reload');
+                {
+                        write_error(get_lang('Wrong password'));
+                        return;
+                }
+                else
+                        write_msg(get_lang('Your operation was successfully executed'));
+
+                toolbar.control('reload');
         }
 
@@ -79 +79 @@
         function draw_folders_list(data)
         {
+                var contentFolders = document.getElementById('content_folders');
+                
                 toolbar.control('reload');
                 folders_tree = new dFTree({name: 'main'});
-
                 folders = unserialize(data);
-
+                
+                contentFolders.innerHTML = "";
+                
                 var rootFold = new dNode({id:'root', caption: get_lang("Directories")});
+                
                 folders_tree.add(rootFold,'root');
 
@@ -118 +122 @@
                 }
 
-                document.getElementById('content_folders').innerHTML = "";
-
-                folders_tree.draw(document.getElementById('content_folders'));
+                folders_tree.draw(contentFolders);
 
                 folders_tree.openTo(currentPath);
 
                 folders_tree.getNodeById(currentPath)._select();
+
         }
 
         function moveto(data) 
         {
-                returnVal = data.split('|');
+                var returnVal = data.split('|');
+                
                 if (returnVal[0] == 'NODIR')
+                {
                         write_error(get_lang('Could not copy file because no destination directory is given'));
-                else if(returnVal[0] == 'SOMEERROR'){
-                        write_error(get_lang('Could not move %1 file(s)',returnVal[1]));
-                }
-                else  if(returnVal[0] == 'MOVED'){
-                        if (returnVal[1] == 1)
-                                write_msg(get_lang('File moved successfuly'));
-                        else
-                                write_msg(get_lang('%1 files moved successfuly', returnVal[1]));
-                }
-                handler.refreshDir();
+                }       
+                else if( returnVal[0] == 'SOMEERROR' )
+                {
+                        write_error( get_lang('Could not move %1 file(s)',returnVal[1]) );
+                }
+                else  if( returnVal[0] == 'MOVED')
+                {
+                        if ( returnVal[1] == 1 )
+                        {       
+                                write_msg( get_lang('File moved successfuly') );
+                                toolbar.control('reload');
+                        }
+                        else
+                        {
+                                write_msg( get_lang('%1 files moved successfuly', returnVal[1]) );
+                        }
+                }
         }
 
         function refreshDir(data) 
         {
-                cExecute_('./index.php?menuaction=filemanager.uifilemanager.get_folders_list', handler.draw_folders_list);
+                if( data.toString() === "True" )
+                {
+                        var _action = './index.php?menuaction=filemanager.uifilemanager.get_folders_list';
+                        
+                        cExecute_( _action , draw_folders_list );
+                }
+                else
+                {
+                        write_msg( data );
+                }
         }
 
@@ -342 +363 @@
         handler.prototype.draw_folders_list     = draw_folders_list;
         handler.prototype.moveto                        = moveto;
-        handler.prototype.refreshDir                    = refreshDir;
+        handler.prototype.refreshDir            = refreshDir;
         handler.prototype.rename                        = rename;
-        handler.prototype.restricted                    = restricted;
-        handler.prototype.updateComment = updateComment;
+        handler.prototype.restricted            = restricted;
+        handler.prototype.updateComment         = updateComment;
         handler.prototype.upload                        = upload;