Changeset 6470 for branches/2.4

Timestamp:

06/12/12 17:47:19 (12 years ago)

Author:

eduardow

Message:

Ticket #2841 - Problema ao arrastar uma mensagem aberta para uma pasta.

Location:

branches/2.4

Files:

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

branches/2.4/expressoMail1_2/js/abas.js

@@ -306 +306 @@
                                                         var border_id = ui.draggable.find("input[type=hidden]").attr("name");
                                                         if(folder_to_move == "border_tr"){
-                                                                var id_msg = border_id.substring("_");
+                                                                var id_msg = border_id.split("_")[0]; 
                                                                 folder = $("#input_folder_"+border_id+"_r")[0] ? $("#input_folder_"+border_id+"_r").val() : (openTab.imapBox[border_id] ? openTab.imapBox[border_id]:get_current_folder());
                                                                 move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true);
@@ -400 +400 @@
         }
         var caption = "";
-        Element("font_"+border.id).style.width = (border_width - 35)+'px';
-        Element("font_"+border.id).innerHTML = title;
+        if (border != null){ 
+                    Element("font_"+border.id).style.width = (border_width - 35)+'px'; 
+                    Element("font_"+border.id).innerHTML = title; 
+        } 
         return(title);
 }

branches/2.4/expressoMail1_2/js/main.js

@@ -1148 +1148 @@
 
         // se a aba estiver aberta e selecionada, apenas a msg da aba é movida
-        if(currentTab.toString().indexOf("_r") != -1)
+        if(currentTab.toString().indexOf("_r") != -1 && currentTab == border_ID) 
         {
                 //se a aba for aberta atraves de uma pesquisa

branches/2.4/prototype/modules/mail/js/foldertree.js

@@ -233 +233 @@
                         // eventnsagens : SE O DROP VIER DE UMA ABA ABERTA
                         else if(folder_to_move == "border_tr"){
-                                var id_msg = border_id.substring("_");
+                                var id_msg = border_id.split("_")[0]; 
                                 folder = $("#input_folder_"+border_id+"_r")[0] ? $("#input_folder_"+border_id+"_r").val() : (openTab.imapBox[border_id] ? openTab.imapBox[border_id]:get_current_folder());
                                 move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true);