Changeset 4802

Timestamp:

07/19/11 13:33:32 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Menu de contexto não é exibido em todos resultados de pesquisa.r4654

Location:

trunk/expressoMail1_2/js

Files:

• abas.js (modified) (1 diff)
• drag_area.js (modified) (5 diffs)
• draw_api.js (modified) (3 diffs)
• globals.js (modified) (1 diff)
• main.js (modified) (1 diff)
• search.js (modified) (3 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -391 +391 @@
         return true;
 }
+
+function getTabPrefix() {
+        if (typeof(currentTab)!='number')
+                return currentTab+"_";
+        else
+                return "";
+}
+
+function getMessageIdFromRowId(row_id) {
+        if (row_id.match("_s"))
+                return row_id.substr(0,3);
+        else
+                return row_id;
+}

trunk/expressoMail1_2/js/drag_area.js

@@ -65 +65 @@
                         var _checkb = Element("check_box_message_"+ msg_number);
 
+                        var _checkb = Element(getTabPrefix() + "check_box_message_" + msg_number);
+
                         if(_checkb) {
                                 if(!_checkb.checked) {
+                                        _checkb.checked = true;
                                         changeBgColor(is_ie ? window.event : e, msg_number);
-                                        _checkb.checked = true;
                                 }
                                 ConstructRightMenu(is_ie ? window.event : e);
@@ -96 +98 @@
 
         var msg_number = _dragArea.from_list ? _dragArea.msg_number : _dragArea.msg_number.replace('_r','');
+        var _checkbox_element = Element(getTabPrefix()+"check_box_message_"+msg_number);
         if(_dragArea.from_list) {
 
-                if((Element("check_box_message_"+msg_number)) && (! Element("check_box_message_"+msg_number).checked)) {
+                if((_checkbox_element) && (! _checkbox_element.checked)) {
                         if (is_ie)
                                 changeBgColor(window.event,msg_number);
                         else
                                 changeBgColor(e,msg_number);
-                        Element("check_box_message_"+ msg_number).checked = true;       
+                        _checkbox_element.checked = true;
                 }
                 id_messages_to_drag = get_selected_messages();
@@ -177 +180 @@
         var     _target = is_ie ? _event.srcElement : _event.target;
         var _button = is_ie ? _event.button : _event.which;
-        
+        var _tab_prefix = getTabPrefix();
+        var _msg_id;
+
         if(_button != 2 && _button != 3) {              
 
@@ -189 +194 @@
                 
                                 for(var i = 0; id_messages_to_drag && i < id_messages_to_drag.length; i++) {                    
-                                        Element("check_box_message_"+id_messages_to_drag[i]).checked = true;                            
-                                        changeBgColor(_event ,id_messages_to_drag[i]);                          
+                                        _msg_id = getMessageIdFromRowId(id_messages_to_drag[i]);
+                                        Element(_tab_prefix+"check_box_message_"+_msg_id).checked = false;
+                                        changeBgColor(_event ,_msg_id);
                                 }
                                 //Element("chk_box_select_all_messages").checked = false;
@@ -240 +246 @@
                         
                                 for(var i = 0; id_messages_to_drag && i < id_messages_to_drag.length; i++) {                            
-                                        Element("check_box_message_"+id_messages_to_drag[i]).checked = true;                            
+                                        Element(_tab_prefix+"check_box_message_"+id_messages_to_drag[i]).checked = false;
                                         changeBgColor(_event ,id_messages_to_drag[i]);                          
                                 }

trunk/expressoMail1_2/js/draw_api.js

@@ -3377 +3377 @@
 
 function changeBgColorToON(all_messages, begin, end){
+        var _tab_prefix = getTabPrefix();
+        var _msg_id;
         for (begin; begin<=end; begin++)
         {
+                _msg_id = getMessageIdFromRowId(all_messages[begin].id);
                 add_className(all_messages[begin], 'selected_msg');
-                Element("check_box_message_" + all_messages[begin].id).checked = true;
+                Element(_tab_prefix + "check_box_message_" + _msg_id).checked = true;
         }
 }
@@ -3395 +3398 @@
         }
 }
-
-function changeBgColor(event, msg_number){
-        actual_tr = Element(msg_number);
+function changeBgColor(event, msg_number) {
+        var _element_id = msg_number.toString();
+        var first_order, last_order;
+
+        if (typeof(currentTab)!='number') {
+                _element_id = _element_id+'_s'+numBox;
+        }
+        actual_tr = Element(_element_id);
 
         if (event.shiftKey)
         {
-                last_tr = Element(last_message_selected);
+                var last_tr = Element(last_message_selected);
                 if(!last_tr)
                         last_tr = actual_tr;
 
-                all_messages = actual_tr.parentNode.childNodes;
+                var all_messages = actual_tr.parentNode.childNodes;
 
                 for (var i=0; i < all_messages.length; i++)
@@ -3422 +3430 @@
         else{
                 //if ( exist_className(actual_tr, 'selected_msg') )
-                if ( Element('check_box_message_' + msg_number).checked )
+                if ( Element(getTabPrefix()+'check_box_message_' + msg_number).checked )
                         add_className(actual_tr, 'selected_msg');
                 else
                         remove_className(actual_tr, 'selected_msg');
         }
-        last_message_selected = msg_number;
+        last_message_selected = _element_id;
 }
 

trunk/expressoMail1_2/js/globals.js

@@ -20 +20 @@
 var tree_folders = '';
 var folders = new Array();
-var global_search = 1;
+//var global_search = 1; // use numBox instead of this!
 var title_app_menu = '<table height="16px" align=center border=0 width=100% cellspacing=0 cellpadding=2>'+
         '<tr><td align=left height=16px width="1%" nowrap class="table_top">&nbsp;'+

trunk/expressoMail1_2/js/main.js

@@ -2452 +2452 @@
         while(felement)
         {
-        if (select)
-                felement.firstChild.firstChild.checked = true;
-        else
-                felement.firstChild.firstChild.checked = false;
-        felement = felement.nextSibling;
+                if (select) {
+                        felement.firstChild.firstChild.checked = true;
+                        add_className(felement, 'selected_msg');
+                }
+                else {
+                        felement.firstChild.firstChild.checked = false;
+                        remove_className(felement, 'selected_msg');
+                }
+                felement = felement.nextSibling;
         }
 }

trunk/expressoMail1_2/js/search.js

@@ -426 +426 @@
                         var subject = aux.subject; 
                         
-                        tr.id = uid_msg+"_s"+global_search;
+                        tr.id = uid_msg+"_s"+numBox;
 
                         // Keep the two lines together please
@@ -448 +448 @@
                                 {
                                         td.setAttribute("width", colSizes[1][0]);
-                                        var td1 = '<input type="checkbox" id="search_' + numBox + '_check_box_message_'+uid_msg+'"></input>';
+                                        var chk_onclick;
+                                        if (is_ie)
+                                                chk_onclick = "changeBgColor(window.event,"+uid_msg+");";
+                                        else
+                                                chk_onclick = "changeBgColor(event,"+uid_msg+");";
+                                        var td1 = '<input type="checkbox" onclick="' + chk_onclick + '" id="search_' + numBox + '_check_box_message_'+uid_msg+'"></input>';
                                         
                                 }
@@ -599 +604 @@
                 }
                 
-                global_search++; //Tabs from search must not have the same id on its tr's
+                //global_search++; //Tabs from search must not have the same id on its tr's // use numBox instead of this!
                 
                 table.appendChild(tbody);