Changeset 606

Timestamp:

01/14/09 15:59:54 (15 years ago)

Author:

niltonneto

Message:

Resolve #352

File:

• trunk/expressoMail1_2/js/abas.js (modified) (5 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -76 +76 @@
         if (typeof(ID) == 'number')
         {
-                current_folder = openBox.tab_folder[ID];
+                current_folder = openTab.imapBox[ID];
+                openTab.type[ID] = 0;
                 numBox=ID;
         }
+        currentTab=ID;
         return ID;
 }
@@ -105 +107 @@
                 if (typeof(id_value) == 'string')
                         for (var bord = 1; bord <= 10; bord++)
-                                if (newMessageTab.imapUid[bord] == id_value.substr(0,id_value.length-2)){
+                                if (openTab.imapUid[bord] == id_value.substr(0,id_value.length-2)){
                                         alternate_border(bord); // It's opened already! (in a new message)
                                         return false;
@@ -211 +213 @@
                 return false;
 
-        Element("border_id_" + ID).onclick = null;
+        Element("border_id_" + ID).onclick = null; // It's avoid a FF3 bug
 
         if (msg_sent == 'false')
@@ -220 +222 @@
                         try
                         {
-                                var save_link = Element("save_message_options");
-                                if (newMessageTab.toPreserve[ID] == undefined)
-                                        newMessageTab.toPreserve[ID] = false;
-                                if ((! newMessageTab.toPreserve[ID] && ! ID.match("_r")) || (body.contentWindow.document.designMode.toLowerCase() == 'on') && (save_link.onclick != ''))
+                                var save_link = Element("save_message_options_"+ID);
+                                if (openTab.toPreserve[ID] == undefined)
+                                        openTab.toPreserve[ID] = false;
+                                if ((! openTab.toPreserve[ID] && ! ID.match("_r")) || (body.contentWindow.document.designMode.toLowerCase() == 'on') && (save_link.onclick != ''))
                                 {
                                         var discard_msg = confirm(get_lang("Your message has not been sent. Discard your message?"), "");
                                         if (!discard_msg)
                                         {
+                                                Element("border_id_"+ID).onclick = function () { alternate_border(ID);};
                                                 return;
                                         }
                                         else
                                         {
-                                                if (newMessageTab.imapBox[ID] && !newMessageTab.toPreserve[ID]){
-                                                        delete_msgs(newMessageTab.imapBox[ID], newMessageTab.imapUid[ID].toString(), 0)
-                                                        delete(newMessageTab.imapBox[ID]);
-                                                        newMessageTab.toPreserve[ID] = false;
+                                                if (openTab.imapBox[ID] && !openTab.toPreserve[ID]){
+                                                        delete_msgs(openTab.imapBox[ID], openTab.imapUid[ID].toString(), 0)
+                                                        delete(openTab.imapBox[ID]);
+                                                        openTab.toPreserve[ID] = false;
                                                         }
-                                                        //cExecute ("$this.imap_functions.delete_msgs&folder="+newMessageTab.imapBox[ID]+"&msgs_number="+newMessageTab.imapUid[ID],function(data){ return });
+                                                        //cExecute ("$this.imap_functions.delete_msgs&folder="+openTab.imapBox[ID]+"&msgs_number="+openTab.imapUid[ID],function(data){ return });
                                                 Element('to_'+ID).focus();
                                         }
@@ -248 +251 @@
         }
 
-        newMessageTab.toPreserve[ID] = false;
-        newMessageTab.imapUid[ID] = 0;
+        openTab.toPreserve[ID] = false;
+        openTab.imapUid[ID] = 0;
 
         hold_session = false;