Changeset 2019 for trunk/filemanager

Timestamp:

02/18/10 10:34:26 (14 years ago)

Author:

amuller

Message:

Ticket #000 - Separando o nome dos connectors do fm e expressoAjax

Location:

trunk/filemanager/js

Files:

• common_functions.js (modified) (6 diffs)
• connector.js (modified) (2 diffs)
• draw_api.js (modified) (10 diffs)
• handler.js (modified) (1 diff)
• refresh.js (modified) (1 diff)

trunk/filemanager/js/common_functions.js

@@ -80 +80 @@
                 address = address.split("?");
                 var url = address[0]+"?menuaction=filemanager.uifilemanager.showUploadboxes&path="+base64_encode(currentPath);
-                cExecute(url,newUpload);
+                cExecute_(url,newUpload);
         }
         else{
@@ -172 +172 @@
         var continue_set = confirm(get_lang('This property will change the visibility of all users that have access to this file, continue?'));
         if (continue_set)
-                cExecute('./index.php?menuaction=filemanager.vfs_functions.setRestricted&file='+base64_encode(name)+'&path='+base64_encode(currentPath),handler.restricted);
+                cExecute_('./index.php?menuaction=filemanager.vfs_functions.setRestricted&file='+base64_encode(name)+'&path='+base64_encode(currentPath),handler.restricted);
 }
 
@@ -186 +186 @@
         if (el.value == oldValue) return;
         var filename = base64_encode(el.id);
-        cExecute('./index.php?menuaction=filemanager.vfs_functions.editComment&file='+filename+'&comment='+base64_encode(el.value),handler.updateComment);
+        cExecute_('./index.php?menuaction=filemanager.vfs_functions.editComment&file='+filename+'&comment='+base64_encode(el.value),handler.updateComment);
 }
 
@@ -213 +213 @@
                                 preferences[checkBoxes[i].value] = '0';
                 }
-                cExecute('./index.php?menuaction=filemanager.user.save_preferences&preferences='+base64_encode(serialize(preferences)),function () { toolbar.control('reload'); EditColumns('close'); });
+                cExecute_('./index.php?menuaction=filemanager.user.save_preferences&preferences='+base64_encode(serialize(preferences)),function () { toolbar.control('reload'); EditColumns('close'); });
                 return;
         }
@@ -252 +252 @@
                 return;
         }
-        cExecute('./index.php?menuaction=filemanager.uifilemanager.search&text='+inputText.value,folderList.drawSearch);
+        cExecute_('./index.php?menuaction=filemanager.uifilemanager.search&text='+inputText.value,folderList.drawSearch);
 }
 function selectAll(el){
@@ -296 +296 @@
 
 function sendFiles(){
-                cExecuteForm(document.getElementById('form_up'),handler.upload);
+                cExecuteForm_(document.getElementById('form_up'),handler.upload);
                 document.getElementById('button_up').style.visibility = "hidden";
                 var line = document.getElementById('uploadOption');

trunk/filemanager/js/connector.js

@@ -98 +98 @@
 var connector = new cConnector();
 
-function cExecuteForm(form, handler){
+function cExecuteForm_(form, handler){
         connector.showProgressBar();
         if(! (divUpload = document.getElementById('divUpload'))) {
@@ -111 +111 @@
                 handlerExecuteForm = null;
         }
-        divUpload.innerHTML= "<iframe onload=\"connector.hideProgressBar();cExecute('./index.php/index.php?menuaction=filemanager.uifilemanager.getReturnExecuteForm',"+form_handler+");\"  style='display:none;width:0;height:0;' name='uploadFile'></iframe>";
+        divUpload.innerHTML= "<iframe onload=\"connector.hideProgressBar();cExecute_('./index.php/index.php?menuaction=filemanager.uifilemanager.getReturnExecuteForm',"+form_handler+");\"  style='display:none;width:0;height:0;' name='uploadFile'></iframe>";
         form.target ="uploadFile";
         form.submit();
 }
 
-function cExecute(requestURL,handler){
+function cExecute_(requestURL,handler){
         if (connector.isVisibleBar == true){
-                setTimeout('cExecute("'+requestURL+'",'+handler+')',150);
+                setTimeout('cExecute_("'+requestURL+'",'+handler+')',150);
                 return;
         }

trunk/filemanager/js/draw_api.js

@@ -12 +12 @@
 
 function loadHistory(filename){
-        cExecute('./index.php?menuaction=filemanager.uifilemanager.history&file='+base64_encode(filename)+"&path="+base64_encode(currentPath),draw_window);
+        cExecute_('./index.php?menuaction=filemanager.uifilemanager.history&file='+base64_encode(filename)+"&path="+base64_encode(currentPath),draw_window);
 }
 
@@ -163 +163 @@
         window.onresize = resizeDiv;
         document.body.style.overflow = "hidden";
-        cExecute('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
+        cExecute_('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
 }
 
@@ -483 +483 @@
                                         inputName.value = filename;
                                         inputName.onclick = function () { oldValue = inputName.value; }
-                                        inputName.onblur = function () { if (inputName.value == oldValue) handler.rename(); else cExecute('./index.php?menuaction=filemanager.vfs_functions.rename&file='+base64_encode(this.id.substr(6))+'&to='+base64_encode(this.value)+"&path="+base64_encode(currentPath),handler.rename) };
+                                        inputName.onblur = function () { if (inputName.value == oldValue) handler.rename(); else cExecute_('./index.php?menuaction=filemanager.vfs_functions.rename&file='+base64_encode(this.id.substr(6))+'&to='+base64_encode(this.value)+"&path="+base64_encode(currentPath),handler.rename) };
                                         inputName.onkeydown=function (event) {if (event.keyCode == KEY_ENTER) this.blur(); };
                                         nameLink.parentNode.appendChild(inputName);
@@ -512 +512 @@
                 case 'delete':
                         var filesUrl = this.getCheckedFiles();
-                        cExecute('./index.php?menuaction=filemanager.vfs_functions.delete&path='+
+                        cExecute_('./index.php?menuaction=filemanager.vfs_functions.delete&path='+
                                         base64_encode(currentPath)+filesUrl,handler.del);
                         break;
@@ -530 +530 @@
                         }
                         var pswd = crypt.encode(password);
-                        cExecute('./index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
+                        cExecute_('./index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
                         break;
                 case 'move_to':
@@ -549 +549 @@
                         last_folder = last_folder ? last_folder : currentPath;
                         current_folder = current_folder ? current_folder : currentPath;
-                        cExecute('./index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles);
+                        cExecute_('./index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles);
                         return;
                 case 'tools':
@@ -584 +584 @@
         if (password == null)
                 return;
-        cExecute('./index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
+        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);
+        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);
+        cExecute_('./index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto);
 }
 
@@ -603 +603 @@
                 case 'user':
                         var url = './index.php?menuaction=filemanager.user.card&lid='+base64_encode(name);
-                        menuTimeout = setTimeout("cExecute('"+url+"',draw_window_card)",500);
+                        menuTimeout = setTimeout("cExecute_('"+url+"',draw_window_card)",500);
                         break;
                 default:
@@ -616 +616 @@
                 {
                         var parentDir = document.getElementById('folders_box').value;
-                        cExecute('./index.php?menuaction=filemanager.uifilemanager.createdir&path='+base64_encode(parentDir)+'&filename='+base64_encode(name),handler.refreshDir);
+                        cExecute_('./index.php?menuaction=filemanager.uifilemanager.createdir&path='+base64_encode(parentDir)+'&filename='+base64_encode(name),handler.refreshDir);
                         currentPath = parentDir+'/'+name;
                         close_window();
@@ -626 +626 @@
                         if (confirm(get_lang('Do you really want to remove folder: %1?',Dfolder), ''))
                         {
-                                cExecute('./index.php?menuaction=filemanager.uifilemanager.removedir&path='+base64_encode(crypt.encode(Dfolder)),handler.refreshDir);
+                                cExecute_('./index.php?menuaction=filemanager.uifilemanager.removedir&path='+base64_encode(crypt.encode(Dfolder)),handler.refreshDir);
                                 var lastIndex = Dfolder.lastIndexOf('/');
                                 currentPath = Dfolder.substr(0,lastIndex);

trunk/filemanager/js/handler.js

@@ -177 +177 @@
 }
 handler.prototype.refreshDir = function (data) {
-        cExecute('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
+        cExecute_('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
 }
 

trunk/filemanager/js/refresh.js

@@ -8 +8 @@
         }
         var filename=document.getElementsByName('edit_file');
-        cExecute("/index.php?menuaction=filemanager.vfs_functions.touch&file="+base64_encode(filename[0].value),handler);
+        cExecute_("/index.php?menuaction=filemanager.vfs_functions.touch&file="+base64_encode(filename[0].value),handler);
         setTimeout("pooling_refresh();",refresh_time);
 }