Changeset 5327 for trunk/filemanager/js

Timestamp:

01/09/12 09:17:50 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #2260 - Sincronismo do módulo Filemanager para o trunk.

Location:

trunk/filemanager/js

Files:

• draw_api.js (modified) (4 diffs)
• handler.js (modified) (5 diffs)

trunk/filemanager/js/draw_api.js

@@ -351 +351 @@
         var midnight = Date.parse(now.toDateString());
         var dtString = "";
-        if (preferences.created =='1') {
-                var created = new Date();
-                created.setTime(file.created*1000);
-                if (created.getTime() > midnight)
-                        if (created.getMinutes() < 10 )
-                                dtString = created.getHours()+":0"+created.getMinutes();
-                        else
-                                dtString = created.getHours()+":"+created.getMinutes();
-                else {
-                        dtString = (created.getDate() < 10) ? "0"+created.getDate()+"/" : created.getDate()+"/";
-                        dtString += (created.getMonth() < 9) ? "0" : "";
-                        dtString += (created.getMonth()+1)+"/"+created.getFullYear();
-                }
-                retBuff += fl.td+dtString+'</td>';
-        }
-        if (preferences.modified =='1'){
-                var modified = new Date();
-                modified.setTime(file.modified*1000);
-                if (file.modified != "")
-                        if (modified.getTime() > midnight)
-                                if (modified.getMinutes() < 10)
-                                        dtString = modified.getHours()+":0"+modified.getMinutes();
-                                else
-                                        dtString = modified.getHours()+":"+modified.getMinutes();
-                        else {
-                                dtString = (modified.getDate() < 10) ? "0"+modified.getDate()+"/" : modified.getDate()+"/";
-                                dtString += (modified.getMonth() < 9) ? "0" : "";
-                                dtString += (modified.getMonth()+1)+"/"+modified.getFullYear();
-                        }
-                else
-                        dtString = "";
-                retBuff += fl.td+dtString+'</td>';
+        
+        if (preferences.created =='1')
+        {
+                retBuff += fl.td+file.created+'</td>';
+        }
+        
+        if ( preferences.modified =='1' )
+        {
+                retBuff += fl.td+file.modified+'</td>';
         }
         if (preferences.owner =='1'){
@@ -521 +498 @@
 
 }
-toolbar.prototype.getCheckedFiles = function () {
+
+toolbar.prototype.getCheckedFiles = function()
+{
         filesUrl = "";
         var one_checked = false;
-        files=document.getElementsByName('fileman');
+        var files = document.getElementsByName('fileman');
         var j=0;
+        
         for (i = 0; i <  files.length; i++)
-                if (files[i].checked){
+        {       
+                if (files[i].checked)
+                {
                         one_checked = true;
                         filesUrl += "&fileman["+j+"]="+base64_encode(files[i].value);
                         j++;
                 }
+        }
+        
         if (!one_checked)
         {
@@ -537 +521 @@
                 return;
         }
+        
         return filesUrl;
 }
@@ -905 +890 @@
         }
         menu.innerHTML = content;
-
         menu.style.visibility = 'visible';
         clearTimeout(menuTimeout);

trunk/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();
+
         }
 
@@ -146 +149 @@
         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 +354 @@
         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;