Changeset 7234 for sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js

Timestamp:

09/18/12 11:31:47 (12 years ago)

Author:

thiago

Message:

Ticket #3088 - Implementado a funcionalidade de excluir todas as mensagens na spam e trash

File:

• sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js (modified) (4 diffs)

sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js

@@ -3771 +3771 @@
 }
 
-function empty_trash_imap(shared, button){
+function empty_trash_imap(shared, button, type){
         if(shared){
                 var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
@@ -3811 +3811 @@
                 'overlay_opacity' : 0.5,
                 'onClose':  function(caption) {
+
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder"+(shared ? "&shared="+folder : ""), handler_empty_trash);
+                if(type.id == "local_messages_trash"){
+                    expresso_mail_archive.deleteAllMessages(type.id);
+                    cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                } else {
+                    cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder"+(shared ? "&shared="+folder : ""), handler_empty_trash);
+                } 
                         }
                 }
@@ -3818 +3824 @@
 }
 
-function empty_spam_imap(shared, button){
+function empty_spam_imap(shared, button, type){
         if(shared){
                 var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
@@ -3859 +3865 @@
                 'onClose':  function(caption) {
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder"+(shared ? "&shared="+folder : ""), handler_empty_spam);
+                if(type.id == "local_messages_spam"){ 
+                    expresso_mail_archive.deleteAllMessages(type.id);
+                    cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                } else {
+                    cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder"+(shared ? "&shared="+folder : ""), handler_empty_spam);
+                } 
                         }
                 }