Changeset 7103

Timestamp:

08/22/12 18:19:40 (11 years ago)

Author:

angelo

Message:

Ticket #3068 - Marcacao anormal em roxo ao excluir mensagens

Location:

trunk/expressoMail1_2/js

Files:

• main.js (modified) (2 diffs)
• shortcut.js (modified) (2 diffs)

trunk/expressoMail1_2/js/main.js

@@ -926 +926 @@
                 else
                         mail_msg = Element("tbody_box");
-
-                if ( preferences.use_shortcuts == '1') {
-                                //Last msg is selected
-                                if (mail_msg && exist_className(mail_msg.childNodes[mail_msg.childNodes.length-1], 'selected_shortcut_msg') ) {
-                                        select_msg('null', 'up', true);
-                                }
-                                else {
-                                        if (!select_msg('null', 'down', true)) {
-                                                select_msg('null', 'up', true);
-                                        }
-                                }
-                        }
-
+                
                 if(data.status == false){
                         write_msg(get_lang("You don't have permission for this operation in this shared folder!"));
                         return false;
                 }
-
+                if ( preferences.use_shortcuts == '1'){
+                        var lastSelected = $("#tbody_box").find("tr input:checked").last().parent().parent();
+                        var msgToSelect = lastSelected.next().length > 0 ? lastSelected.next() : lastSelected.prev();   
+                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                    $(this).prev().removeClass("current_selected_shortcut_msg");
+                    $(this).removeClass("selected_shortcut_msg");
+                        });             
+                        select_msg(msgToSelect.attr("id"));
+                }
                 if (show_success_msg){
                         if (data.msgs_number.length == 1)
@@ -986 +982 @@
                                 if (msg_to_delete){
                                                 removeAll(msg_to_delete.id);
-                                                 delete selectedPagingMsgs[data.msgs_number[i]]; 
-                                }
-                                 totalFolderMsgs = totalFolderMsgs - data.msgs_number.length; 
+                                                 delete selectedPagingMsgs[data.msgs_number[i]];
+                                } 
+                totalFolderMsgs = totalFolderMsgs - data.msgs_number.length;
                 }
                 Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - data.msgs_number.length;

trunk/expressoMail1_2/js/shortcut.js

@@ -586 +586 @@
 
                 if($(this).hasClass("selected_shortcut_msg") && $(this).next().length){
-                    $(this).next().addClass("selected_shortcut_msg");
+                    
+                    $(this).next().addClass("selected_shortcut_msg current_selected_shortcut_msg");
                     $(this).removeClass("selected_shortcut_msg");
                     return false;
@@ -619 +620 @@
 
                 if($(this).hasClass("selected_shortcut_msg") && $(this).prev().length){
-                    $(this).prev().addClass("selected_shortcut_msg");
+                    $(this).prev().addClass("selected_shortcut_msg current_selected_shortcut_msg");
                     $(this).removeClass("selected_shortcut_msg");
                     return false;