Changeset 3144

Timestamp:

08/05/10 17:11:16 (14 years ago)

Author:

niltonneto

Message:

Ticket #1155 - Corrigido comportamento incorreto ao responder ou encaminhar msg.

Location:

trunk/expressoMail1_2/js/base

Files:

• abas.js (modified) (2 diffs)
• main.js (modified) (2 diffs)

trunk/expressoMail1_2/js/base/abas.js

@@ -12 +12 @@
         'forward':6,
         'reply_with_history':7,
-        'reply_to_all_with_history':7,
-        'reply_without_history':7,
-        'reply_to_all_without_history':7,
+        'reply_to_all_with_history':8,
+        'reply_without_history':9,
+        'reply_to_all_without_history':10,
         'edit':5
 };
@@ -249 +249 @@
         openTab.toPreserve[ID] = false;
         openTab.imapUid[ID] = 0;
+        delete(openTab.type[ID]);
 
         if (preferences.auto_save_draft == 1)

trunk/expressoMail1_2/js/base/main.js

@@ -942 +942 @@
         }
         var new_border_ID = draw_new_message(parseInt(border_ID));
+        
+        if(typeof(openTab.type[new_border_ID]) != "undefined") {
+                if(tabTypes[type] == openTab.type[new_border_ID]) {
+                        return new_border_ID;
+                } else {
+                        delete_border(currentTab);
+                        new_border_ID = draw_new_message(parseInt(border_ID));
+                }
+        }
+                
         if (new_border_ID == false){
                 setTimeout('new_message(\''+type+'\',\''+border_ID+'\');',500);
@@ -1908 +1918 @@
                 sendButton.style.visibility="hidden";
 
-        if (openTab.imapBox[border_id] && openTab.type[border_id] != 6 && openTab.type[border_id] != 7) //Gets the imap folder
+        if (openTab.imapBox[border_id] && openTab.type[border_id] < 6) //Gets the imap folder
                 var folder_id = openTab.imapBox[border_id];
         else