Changeset 5922

Timestamp:

04/11/12 17:24:39 (12 years ago)

Author:

eduardow

Message:

Ticket #2599 - Correcao da inconsistencia na selecao de mensagens.

File:

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

trunk/expressoMail1_2/js/main.js

@@ -15 +15 @@
                 Element('tableDivAppbox').width = '100%';
 
-        var save_contacts = function(data){
+        var save_contacts = function(data){Atualizar
                 contacts = data;
                 if (preferences.use_local_messages == 1 && window.google && google.gears)
@@ -1026 +1026 @@
                 if ( preferences.use_shortcuts == '1') {
                         var all_messages = Element('tbody_box').childNodes;
-
-                        //Last msg is selected
-                        if ( exist_className(all_messages[all_messages.length-1], 'selected_shortcut_msg') ) {
-                                select_msg('null', 'up', true);
-                        }
-                        else {
-                                if (!select_msg('null', 'down', true)) {
+                        // verificar se a msg selecionada com o checkbox é a mesma selecionada com o shortcut
+                        var msg_list_shortcut = get_selected_messages_shortcut().split(',');
+                        if(data.msgs_number.length > 0 && msg_list_shortcut.length > 0 && data.msgs_number.toString() == msg_list_shortcut.toString()){
+                                //Last msg is selected
+                                if ( exist_className(all_messages[all_messages.length-1], 'selected_shortcut_msg') ) {
                                         select_msg('null', 'up', true);
+                                }
+                                else {
+                                        if (!select_msg('null', 'down', true)) {
+                                                select_msg('null', 'up', true);
+                                        }
                                 }
                         }
@@ -1356 +1359 @@
 }
 
+function get_selected_messages_shortcut(){
+        var main;
+        try{
+                main = document.getElementById("divScrollMain_"+numBox).firstChild.firstChild;
+        }catch(e){
+        };
+
+        if (! main)
+                main = Element("tbody_box_"+numBox);
+
+        if (! main)
+                main = Element("tbody_box");
+
+        // Get all TR (messages) in tBody.
+        var main_list = main.childNodes;
+        var selected_messages_by_shortcuts = '';
+        var j = 0;
+        for (j; j<(main_list.length); j++)
+        {
+
+                if ( exist_className(Element(main_list[j].id), 'selected_shortcut_msg') )
+                {
+                        selected_messages_by_shortcuts += main_list[j].id + ',';
+                }
+
+        }
+        selected_messages_by_shortcuts = selected_messages_by_shortcuts.substring(0,(selected_messages_by_shortcuts.length-1));
+
+        return selected_messages_by_shortcuts;
+
+}
+
 function get_selected_messages(){
         var main;
@@ -1379 +1414 @@
         {
 
-if ( (!isNaN(parseInt(numBox))) && (numBox == 0)) { 
-                                        check_box = Element("check_box_message_" + main_list[j].id); 
-                                } else { 
-                                        id_mensagem = main_list[j].id.split('_'); 
-                                                                check_box = Element("search_" + numBox + "_check_box_message_" + id_mensagem[0]); 
-                                }        
+                if ( (!isNaN(parseInt(numBox))) && (numBox == 0)) { 
+                        check_box = Element("check_box_message_" + main_list[j].id); 
+                } else { 
+                        id_mensagem = main_list[j].id.split('_'); 
+                                                check_box = Element("search_" + numBox + "_check_box_message_" + id_mensagem[0]); 
+                }        
                                  
-                                if ( (check_box) && (check_box.checked) ) 
-                    selected_messages += main_list[j].id + ',';
+                if ( (check_box) && (check_box.checked) ) 
+                        selected_messages += main_list[j].id + ',';
 
                 if (preferences.use_shortcuts == '1')
@@ -1416 +1451 @@
                 var array_selected_messages = selected_messages.split(",");
 
-                if ((array_selected_messages.length <= 1) && (array_selected_messages_by_shortcuts.length > 1))
+                if ((array_selected_messages.length == 0) && (array_selected_messages_by_shortcuts.length > 0))
                 {
                         return selected_messages_by_shortcuts;