Changeset 4670

Timestamp:

07/04/11 17:45:13 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2059 - Menu de contexto não é exibido em todos resultados de pesquisa

Location:

branches/2.2.0.1/expressoMail1_2/js

Files:

• abas.js (modified) (3 diffs)
• draw_api.js (modified) (1 diff)
• main.js (modified) (2 diffs)
• search.js (modified) (2 diffs)

branches/2.2.0.1/expressoMail1_2/js/abas.js

@@ -108 +108 @@
         }
 
-        if (typeof(ID) == 'number')
-        {
-        numBox=ID;
-        }
-        else
-        {
-                if (ID.match("search_"))
-                        numBox=ID.substr(7);
-        }
-
+        numBox = getNumBoxFromTabId(ID);
         currentTab=ID;
         
@@ -392 +383 @@
 }
 
-function getTabPrefix() {
+function getTabPrefix() { // define o prefixo para os checkboxes das mensagens
         if (typeof(currentTab)!='number')
                 return currentTab+"_";
@@ -399 +390 @@
 }
 
-function getMessageIdFromRowId(row_id) {
-        if (row_id.match("_s"))
-                return row_id.substr(0,3);
+function getMessageIdFromRowId(row_id) { // extrai o id da mensagem do id da linha
+        var p = row_id.search("_s");
+        if (p>0)
+                return row_id.substr(0,p);
         else
                 return row_id;
 }
+
+function getNumBoxFromTabId(tab_id) { // extrai o numBox do id da tab
+        if (typeof(tab_id)=='number') {
+                return tab_id;
+        }
+        else {
+                var p = tab_id.search(/[0-9]/);
+                return tab_id.substr(p);
+        }
+}

branches/2.2.0.1/expressoMail1_2/js/draw_api.js

@@ -731 +731 @@
                 document.getElementById("table_message_ruler").style.left = ev.clientX;
                 if (document.getElementById("content_id_"+numBox)==null)
-                        document.getElementById("table_message_ruler").style.height = document.getElementById("content_id_search_"+numBox).offsetHeight;
+                        document.getElementById("table_message_ruler").style.height = document.getElementById("content_id_"+currentTab).offsetHeight;
                 else
                         document.getElementById("table_message_ruler").style.height = document.getElementById("content_id_"+numBox).offsetHeight;

branches/2.2.0.1/expressoMail1_2/js/main.js

@@ -575 +575 @@
         var selected_messages = '';
         var temp_msg;
-        var main_list = Element("tbody_box_"+currentTab.substr(7)).childNodes;
+        var main_list = Element("tbody_box_"+getNumBoxFromTabId(currentTab)).childNodes;
         for (j = 0; j < main_list.length; j++)  {
                 var check_box = main_list[j].firstChild.firstChild;
@@ -2422 +2422 @@
 
 function select_all_search_messages(select, id){
-        var search_box = Element("table_resultsearch_" + id.substr(18)).firstChild;
+        var search_box = Element("table_resultsearch_" + getNumBoxFromTabId(id)).firstChild;
         var felement = search_box.firstChild;
         while(felement)

branches/2.2.0.1/expressoMail1_2/js/search.js

@@ -453 +453 @@
                                         else
                                                 chk_onclick = "changeBgColor(event,"+uid_msg+");";
-                                        var td1 = '<input type="checkbox" onclick="' + chk_onclick + '" id="search_' + numBox + '_check_box_message_'+uid_msg+'"></input>';
+                                        var td1 = '<input type="checkbox" onclick="' + chk_onclick + '" id="' + border_id + '_check_box_message_'+uid_msg+'"></input>';
                                         
                                 }
@@ -612 +612 @@
                 table.appendChild(colgr_element);
 
-                var content_search =  Element('content_id_search_' + numBox);
+                var content_search =  Element('content_id_' + border_id);
                 var div_scroll_result = document.createElement("DIV");
                 div_scroll_result.id = "divScrollMain_"+numBox;