Changeset 7450

Timestamp:

10/22/12 15:05:29 (11 years ago)

Author:

thiago

Message:

Ticket #3088 - Implementação da funcionalidade de criar pastas apartir dos delimiter.

Location:

trunk

Files:

• expressoMail1_2/js/mail_archiver.js (modified) (2 diffs)
• expressoMail1_2/js/main.js (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (2 diffs)

trunk/expressoMail1_2/js/mail_archiver.js

@@ -1172 +1172 @@
 //createFolder operation
 MailArchiver.prototype.createFolder = function(parentFolder, folderName){
+    if(typeof(folderName) == "undefined"){
+        return false;
+    }
     
     try{
@@ -1211 +1214 @@
     write_msg(get_lang("The local folder \"%1\" was successfully removed", expresso_mail_archive.drawdata.folderName));
     connector.purgeCache();
-    ttreeBox.name_folder = "root";
-    ttreeBox.update_folder();
+    //ttreeBox.name_folder = "root";
+    //ttreeBox.update_folder();
     draw_tree_local_folders();
-    ttreeBox.update_folder();   
+    //ttreeBox.update_folder(); 
 }
 

trunk/expressoMail1_2/js/main.js

@@ -4879 +4879 @@
 function create_new_local_folder(parentFolderId, name){
 
-    if(typeof(parentFolderId) == "string"){
         parentFolderId = parentFolderId.split("_");
         var parentName = parentFolderId[2];
-    }
-    
 
     expresso_mail_archive.createFolder(parentName, name);

trunk/prototype/modules/mail/js/foldertree.js

@@ -540 +540 @@
                         event.stopPropagation();
 
+                    var ok = false;
+                    var makeChildren = function(auxNameFolder, father){
+                        if(auxNameFolder.length == 0) return true;
+
+
+                        if(auxNameFolder[0] == ""){
+                            auxNameFolder.shift();
+                            makeChildren(auxNameFolder, father);
+                            return true;
+                        }
+                        if(ok == false)
+                            expresso_mail_archive.createFolder((father ? father : "inbox"), auxNameFolder[0]);
+                        
+                        expresso_mail_archive.getFoldersList(father);
+
+                        for(var ii =0; ii<expresso_mail_archive.folders.length; ii++){
+                            if(auxNameFolder[0] == expresso_mail_archive.folders[ii].name){
+                                 auxNameFolder.shift();
+                                 save = expresso_mail_archive.folders;
+                                 expresso_mail_archive.createFolder(expresso_mail_archive.folders[ii].id, auxNameFolder[0]);
+                                 expresso_mail_archive.folders = save; 
+                                 ok = true;
+                                 makeChildren(auxNameFolder, expresso_mail_archive.folders[ii].id);
+                                 return true;
+                            }
+                        }
+                    }
+
 
                         if(event.keyCode == 13){
 
-                            if($(this).parent().parent().parent().find("input[type=hidden]").val() == "localFolder"){
+                            if($(this).parents("li").find("input[type=hidden]").val() == "localFolder"){
 
                                  $(".new_folder").parent().addClass("folders-loading");
@@ -550 +578 @@
                                  var folder = (folderName != "" ? folderName : get_lang("New Folder"));
 
-                                 create_new_local_folder((selected_li.attr('id') ? selected_li.attr('id') : "inbox") , folder);
+                                 if(folderName.indexOf("/") != -1){
+                                    auxNameFolder = folderName.split("/");
+                                    var father = typeof(selected_li.attr('id')) != "undefined" ? selected_li.attr('id').split("_")[2] : "home";
+
+                                    makeChildren(auxNameFolder, father);
+                                 } else {
+                                     var folder = (folderName != "" ? folderName : get_lang("New Folder"));
+                                     create_new_local_folder((selected_li.attr('id') ? selected_li.attr('id') : "inbox") , folder);
+                                 }
+
                                  cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
                             } else {