Changeset 3018 for branches/2.2/expressoMail1_2/js/abas.js

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/js/abas.js (modified) (5 diffs)

branches/2.2/expressoMail1_2/js/abas.js

@@ -113 +113 @@
                         return alternate_border(id_value);
                 var ID = id_value;
+                openTab.imapBox[ID] = current_folder;
         }
         td = document.createElement("TD");
@@ -124 +125 @@
 
         td.setAttribute("align", "right");
-        td.onclick = function(){alternate_border(ID);};
+        td.onclick = function(){alternate_border(ID);resizeWindow()};
         td.setAttribute("noWrap","true");
         td.alt = borderTitle;
@@ -152 +153 @@
         div.style.display='';
 
-        var bar = document.getElementById("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden')
-                offset = bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight;
-
-        div.style.height = document.body.clientHeight - offset - (is_ie ? 76 : 86);
         div.style.overflow = "hidden";
 
-        if(!is_ie) {
-                var menuHidden = Element("folderscol").style.display == 'none' ? true : false;
-                var defaultWidth = document.body.clientWidth - 27;
-                if(!menuHidden)
-                        defaultWidth -= Element("folderscol").offsetWidth;
-
-                div.style.width = defaultWidth;
-        }
         Element("exmail_main_body").insertBefore(div,Element("footer_menu"));
         alternate_border(ID);
@@ -213 +200 @@
                 if (body)
                 {
-                                var save_link = Element("save_message_options_"+ID);
-                                if (openTab.toPreserve[ID] == undefined)
-                                        openTab.toPreserve[ID] = false;
-                                if ((! openTab.toPreserve[ID] && ! ID.toString().match("_r")) || ((body.contentWindow) == 'object' && 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;
+                        var save_link = Element("save_message_options_"+ID);
+                        if (openTab.toPreserve[ID] == undefined)
+                                openTab.toPreserve[ID] = false;
+                        if ((! openTab.toPreserve[ID] && ! ID.toString().match("_r")) || ((body.contentWindow) == 'object' && 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 (openTab.imapBox[ID] && openTab.imapUid[ID] && !openTab.toPreserve[ID]){
+                                                delete_msgs(openTab.imapBox[ID], openTab.imapUid[ID].toString(), 0)
+                                                        openTab.toPreserve[ID] = false;
                                         }
-                                        else
-                                        {
-                                                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;
-                                                        }
-                                                        // Element('to_'+ID).focus(); It crash on IE
-                                        }
-                                }
+                                        delete(openTab.imapBox[ID]);
+                                        // Element('to_'+ID).focus(); It crash on IE 
+                                }
+                        }
                 }
         }
@@ -273 +260 @@
         content = Element('content_id_' + ID);
         content.parentNode.removeChild(content);
+        resizeWindow();
         return true;
 }