Changeset 2625

Timestamp:

04/23/10 14:59:54 (14 years ago)

Author:

niltonneto

Message:

Ticket #1040 - Corrige problemas ao redimensionar altura e largura das divs principais.

Location:

branches/2.1/expressoMail1_2

Files:

• js/abas.js (modified) (3 diffs)
• js/common_functions.js (modified) (3 diffs)
• js/draw_api.js (modified) (9 diffs)
• js/main.js (modified) (1 diff)
• js/search.js (modified) (2 diffs)
• templates/classic/index.tpl (modified) (1 diff)
• templates/default/index.tpl (modified) (1 diff)

branches/2.1/expressoMail1_2/js/abas.js

@@ -125 +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;
@@ -153 +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);
@@ -274 +259 @@
         content = Element('content_id_' + ID);
         content.parentNode.removeChild(content);
+        resizeWindow();
         return true;
 }

branches/2.1/expressoMail1_2/js/common_functions.js

@@ -1 @@
-// BEGIN: FUNCTION RESIZE WINDOW
 if (!expresso_offline) {
         var _showBar = showBar;
@@ -32 +31 @@
     }
 }
-
+// BEGIN: FUNCTION RESIZE WINDOW
 function resizeWindow(){
-
-        var bar = Element("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden') 
-                offset = (bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight);     
-
-        var screenHeight = document.body.clientHeight ? document.body.clientHeight : document.body.offsetHeight;
-        var defaultHeight = screenHeight - offset;
+        var divScrollMain = Element("divScrollMain_"+numBox);
+        var table_message = Element("table_message");
+        var content_folders = Element("content_folders");
+        var clientHeight = ((window.innerHeight ? window.innerHeight : document.body.offsetHeight) - 8);
+        var clientWidth = ((window.innerWidth ? window.innerWidth : document.body.offsetWidth));        
+
+        if(divScrollMain){
+                divScrollMain.style.height = (clientHeight - (findPosY(divScrollMain) + (table_message.clientHeight ? table_message.clientHeight : table_message.offsetHeight))) + "px";
+        }
 
         if(typeof(BordersArray) != 'undefined') {
@@ -47 +47 @@
                         var div_scroll = Element("div_message_scroll_"+BordersArray[i].sequence);
                         var div = Element("content_id_"+BordersArray[i].sequence);
-
-                        // This comented code cause/avoid (!?) Firefox to stuck some request
-                        if(div)
-//                              div.setAttribute("style","height: "+parseInt(defaultHeight - 90)+"px;");
-                                div.style.height = defaultHeight - 90;
-                        if(div_scroll)
-//                              div_scroll.setAttribute("style","height: "+parseInt(defaultHeight - 130)+"px;");
-                                div_scroll.style.height = defaultHeight - 130;
-                }
-        }
-
-        if(Element('content_folders'))
-                Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150);
-        if(Element("divScrollMain_"+numBox))
-                Element("divScrollMain_"+numBox).style.height   = defaultHeight - (is_ie ? 111 : 110);
+                        if(div){
+                                div.style.height = (clientHeight - (findPosY(div) + (table_message.clientHeight ? table_message.clientHeight : table_message.offsetHeight)+2)) + "px";
+                                div.style.width = (clientWidth - (findPosX(div)+10)) + "px";
+                        }
+                        if(div_scroll){
+                                div_scroll.style.height = (clientHeight - (findPosY(div_scroll) + (table_message.clientHeight ? table_message.clientHeight : table_message.offsetHeight)+5)) + "px";
+                                div_scroll.style.width = (clientWidth - (findPosX(div_scroll)+10)) + "px";
+                        }
+                }
+        }
+
+        if(content_folders){
+                var search_div = Element("search_div");
+                var contentFoldersY = findPosY(content_folders);
+                content_folders.style.height = (clientHeight - (contentFoldersY + (contentFoldersY > findPosY(search_div) ? 0 : (search_div.clientHeight ? search_div.clientHeight : search_div.offsetHeight) + 5))) + "px";
+        }
 }
 // END: FUNCTION RESIZE WINDOW

branches/2.1/expressoMail1_2/js/draw_api.js

@@ -698 +698 @@
         var _divScroll = document.getElementById("divScrollMain_"+numBox);
 
-        var bar = document.getElementById("toolbar");
-        var offset = 0;
-
         if(!_divScroll){                
                 _divScroll = document.createElement("DIV");
@@ -714 +711 @@
                 _divScroll.style.width  ="99.3%";
         }
-        // Inicio: Redimensiona DIV SCROLL
-        var bar = Element("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden') 
-                offset = (bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight);             
-        var screenHeight = document.body.clientHeight ? document.body.clientHeight : document.body.offsetHeight;
-        var defaultHeight = screenHeight - offset;              
-        _divScroll.style.height         = defaultHeight - 110;
-        Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150);
-        // Fim: Redimensiona DIV SCROLL
         _divScroll.appendChild(table_element);
         openTab.content_id[numBox].appendChild(_divScroll);
@@ -765 +752 @@
         draw_footer_box(headers_msgs.num_msgs); 
         Element('main_table').style.display = '';
+        if(is_ie6)      // Stupid Fixing on IE6.
+                setTimeout("resizeWindow()",1);
+        else
+                resizeWindow();
         if(debug) {
                 var _eTime = new Date();
@@ -1092 +1083 @@
 function draw_message(info_msg, ID){
         var content = document.getElementById('content_id_' + ID);
-        var defaultWidth = document.body.offsetWidth - 37;
-        
         var menuHidden = Element("folderscol").style.display == 'none' ? true : false;
-        if(!menuHidden)
-                defaultWidth -= Element("folderscol").offsetWidth;
          //////////////////////////////////////////////////////////////////////////////////////////////////////
         //Make the next/previous buttom.
@@ -1216 +1203 @@
         var tbody_message = document.createElement("TBODY");
         table_message.border = "0";
-        table_message.width = defaultWidth ;
 
         //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1487 +1473 @@
         var table_message_others_options = document.createElement("TABLE");
         table_message_others_options.id = 'table_message_others_options_' + ID;
-        table_message_others_options.width =  defaultWidth - 30;
         table_message_others_options.style.display = 'none';
         table_message_others_options.className = "table_message";
@@ -1803 +1788 @@
 
 
-        // BEGIN MAKE THE SCROLL HEIGHT
-        var bar = document.getElementById("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden')
-                offset = bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight;
         var div = document.createElement("DIV");
         div.id = "div_message_scroll_"+ID;
         div.style.background = 'WHITE';
-        div.style.height = document.body.clientHeight - offset - 125;
-        content.style.height = document.body.clientHeight - offset - 90;
         div.style.overflow = "auto";
-        div.style.width = defaultWidth - (is_ie ? 5 : 0);
-        // END MAKE THE SCROLL HEIGHT
         table_message_others_options.appendChild(tbody_message_others_options);
         var tr = document.createElement("TR");
@@ -1942 +1918 @@
         table_message.appendChild(tbody_message);
         content.appendChild(table_message);
+        resizeWindow();
         var msg_number = document.createElement('INPUT');
         msg_number.id = "msg_number_" + ID;
@@ -2512 +2489 @@
         if(!expresso_offline)
                 draw_from_field(sel_from,tr1_1);
+
+        resizeWindow();
         return ID;
 }

branches/2.1/expressoMail1_2/js/main.js

@@ -318 +318 @@
 
                 
-                if(Element("border_id_" + id_msg_read)) 
-                        alternate_border(id_msg_read);          
+                if(Element("border_id_" + id_msg_read)){ 
+                        alternate_border(id_msg_read);
+                        resizeWindow();
+                }
                 else {
                         var border_id = create_border(msg_info.subject, id_msg_read);

branches/2.1/expressoMail1_2/js/search.js

@@ -549 +549 @@
 
         var content_search =  Element('content_id_search_' + numBox);
-        // BEGIN MAKE THE SCROLL HEIGHT         
-        var defaultWidth = document.body.offsetWidth - 31;
-        var menuHidden = Element("folderscol").style.display == 'none' ? true : false;
-        if(!menuHidden)
-                defaultWidth -= Element("folderscol").offsetWidth;                      
-        var bar = Element("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden') 
-                offset = bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight;               
         var div_scroll_result = document.createElement("DIV");
         div_scroll_result.id = "divScrollMain_"+numBox;
-        div_scroll_result.style.height = document.body.clientHeight - offset - 120;
-        content_search.style.height = document.body.clientHeight - offset - 80;
         div_scroll_result.style.overflow = "auto";
-        div_scroll_result.style.width = defaultWidth - (is_ie ? 7 : 0);
-        // END MAKE THE SCROLL HEIGHT           
-                
         
                 if(is_ie)
@@ -710 +696 @@
                         content_search.appendChild(div_scroll_result);
                 }
+                resizeWindow();
         }
 

branches/2.1/expressoMail1_2/templates/classic/index.tpl

@@ -70 +70 @@
                                                 <tbody id="border_tbody">
                                                         <tr id="border_tr">
-                                                                <td nowrap class="menu" onClick="alternate_border(0);"  id="border_id_0">&nbsp;{lang_inbox}&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">0</span> / <span id="tot_m">0</span>]</font>
+                                                                <td nowrap class="menu" onClick="alternate_border(0);resizeWindow();"  id="border_id_0">&nbsp;{lang_inbox}&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">0</span> / <span id="tot_m">0</span>]</font>
                                                                 </td>
                                                                 <td nowrap id="border_blank" class="last_menu" width="100%">&nbsp;</td>                                                         

branches/2.1/expressoMail1_2/templates/default/index.tpl

@@ -97 +97 @@
                                 <tbody id="border_tbody">
                                         <tr id="border_tr">
-                                                <td nowrap class="menu" onClick="alternate_border(0);"  id="border_id_0">
+                                                <td nowrap class="menu" onClick="alternate_border(0);resizeWindow();"  id="border_id_0">
                                                         &nbsp;{lang_inbox}&nbsp;<font face="Verdana" size="1" color="#505050">[
                                                         <span id="new_m">0</span> /