Changeset 1889 for sandbox/filemanager/js

Timestamp:

12/23/09 09:51:15 (15 years ago)

Author:

amuller

Message:

Ticket #597 - Melhoria do FM. melhorias na interface, melhoria na cópia, ao mover e etc...

Location:

sandbox/filemanager/js

Files:

• common_functions.js (modified) (1 diff)
• draw_api.js (modified) (2 diffs)
• handler.js (modified) (1 diff)

sandbox/filemanager/js/common_functions.js

@@ -85 +85 @@
                         return null;
                 ret = "";
-                for ( var i=0;i < data.length; i++ )
+                for ( var i=0;(i < data.length && data.charCodeAt(i) > 31); i++ )
                 {
                         ret += String.fromCharCode(data.charCodeAt(i) ^ sec_key.charCodeAt(i));

sandbox/filemanager/js/draw_api.js

@@ -523 +523 @@
                         }
                         var elements = new Array();
-                        inputEl = document.getElementById('content_folders');
-                        for(i=0; i< inputEl.childNodes.length; i++)
+                        for(i=0; i< folders.length; i++)
                         {
-                                if (inputEl.childNodes[i].nodeName != 'SPAN')
-                                        continue;
                                 elements[i] = new Array();
-                                elements[i]['text']=inputEl.childNodes[i].innerHTML;
+                                elements[i]['text']=folders[i];
                                 address = document.location.toString();
                                 address = address.split("&");
-                                elements[i]['url'] = address[0]+
-                                        "&"+escape(arg)+".x=10"+
-                                        "&from="+base64_encode(currentPath)+
-                                        "&to="+base64_encode(inputEl.childNodes[i].innerHTML)+
-                                        filesUrl;
-
+                                elements[i]['url'] = "javascript:"+escape(arg)+"('"+folders[i]+"','"+filesUrl+"')";
                         }
                         draw_menu(arg,elements);
@@ -586 +578 @@
         cExecute('./index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
 }
+function move_to(to,filesUrl){
+        cExecute('./index.php?menuaction=filemanager.vfs_functions.moveto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.moveto);
+}
+function copy_to(to,filesUrl){
+        cExecute('./index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto);
+}
 
 function draw_card(filename){

sandbox/filemanager/js/handler.js

@@ -145 +145 @@
         folders_tree.getNodeById(currentPath)._select();
 }
+handler.prototype.copyto = function (data) {
+        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 copy %1 file(s)',returnVal[1]));
+        }
+        else  if(returnVal[0] == 'COPIED'){
+                if (returnVal[1] == 1)
+                        write_msg(get_lang('File copied successfuly'));
+                else
+                        write_msg(get_lang('%1 files copied successfuly', returnVal[1]));
+        }
+}
+handler.prototype.moveto = function (data) {
+        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();
+}
 handler.prototype.refreshDir = function (data) {
         cExecute('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);