Changeset 7153 for trunk/expressoMail1_2/js/shortcut.js

Timestamp:

09/04/12 10:00:21 (12 years ago)

Author:

douglasz

Message:

Ticket #3091 - Inconsistência ao excluir mensagem pelo atalho del.

File:

• trunk/expressoMail1_2/js/shortcut.js (modified) (1 diff)

trunk/expressoMail1_2/js/shortcut.js

@@ -288 +288 @@
 shortcut.add("Delete",function(){
         
-        
-        var selected_shortcut_msgs = '';
-        var tbody_box = Element('tbody_box');
-        all_messages = Element('tbody_box').childNodes;
-        
-        for ( var i=0; i < all_messages.length; i++ )
-        {
-                if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
+        if(currentTab == 0){
+                var selected_shortcut_msgs = '';
+                var tbody_box = Element('tbody_box');
+                all_messages = Element('tbody_box').childNodes;
+                
+                for ( var i=0; i < all_messages.length; i++ )
                 {
-                        selected_shortcut_msgs += all_messages[i].id + ',';
+                        if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
+                        {
+                                selected_shortcut_msgs += all_messages[i].id + ',';
+                                
+                                if( all_messages[i].nextSibling )
+                                        selMessageShortcut = all_messages[i].nextSibling.id + "-" + "down";
+                                else if(all_messages[i].previousSibling)
+                                        selMessageShortcut = all_messages[i].previousSibling.id + "-" + "up";
+                        }
+                }
+                
+                selected_shortcut_msgs = selected_shortcut_msgs.substring(0,(selected_shortcut_msgs.length-1));
+                
+                if ( Element('border_id_0').className === 'menu-sel' )
+                {
+                        proxy_mensagens.delete_msgs(current_folder, selected_shortcut_msgs, 'null');
+                }
+                else
+                {
+                        //exec_msg_action('delete');
+                        select_msg(selMessageShortcut.substring(0, selMessageShortcut.indexOf("-")),
+                                           selMessageShortcut.substring(selMessageShortcut.indexOf("-")), true );
                         
-                        if( all_messages[i].nextSibling )
-                                selMessageShortcut = all_messages[i].nextSibling.id + "-" + "down";
-                        else if(all_messages[i].previousSibling)
-                                selMessageShortcut = all_messages[i].previousSibling.id + "-" + "up";
+                        proxy_mensagens.delete_msgs(current_folder, selected_shortcut_msgs, 'null');
                 }
-        }
-        
-        selected_shortcut_msgs = selected_shortcut_msgs.substring(0,(selected_shortcut_msgs.length-1));
-        
-        if ( Element('border_id_0').className === 'menu-sel' )
-        {
-                proxy_mensagens.delete_msgs(current_folder, selected_shortcut_msgs, 'null');
-        }
-        else
-        {
-                exec_msg_action('delete');
-                select_msg(selMessageShortcut.substring(0, selMessageShortcut.indexOf("-")),
-                                   selMessageShortcut.substring(selMessageShortcut.indexOf("-")), true );
-                
-                proxy_mensagens.delete_msgs(current_folder, selected_shortcut_msgs, 'null');
+        }else{
+                proxy_mensagens.delete_msgs(openTab.imapBox[currentTab], currentTab.substring(0, selMessageShortcut.indexOf("_r")), 'null');
+        
         }