Changeset 7449 for trunk

Timestamp:

10/22/12 10:23:49 (11 years ago)

Author:

marcosw

Message:

Ticket #3088 - Correção para não exibir alerta ao remover mensagem de arquivamento

Location:

trunk/expressoMail1_2/js

Files:

• mail_archiver.js (modified) (8 diffs)
• main.js (modified) (2 diffs)

trunk/expressoMail1_2/js/mail_archiver.js

@@ -171 +171 @@
     this.selectedfolder = null;
     this.allmessagesbyfolder = new Array();
+    this.isArchiveOperation = false; //Se estiver em andamento uma operação de arquivamento/desarquivamento.
 }
 
@@ -411 +412 @@
         expresso_mail_archive.folder_origin = source_folder;
         expresso_mail_archive.CreateMessageList(msgs_id);
+        expresso_mail_archive.isArchiveOperation = true;
         var tagsHandler = function(data){
             if(data){
@@ -510 +512 @@
         }
     }
-
+    
     //if user preference is setted to move messages, here, whe will call a delete message at mailserver
     if(preferences.keep_archived_messages == 0){
@@ -538 +540 @@
         draw_tree_local_folders();
         //ttreeBox.update_folder(true);    
+        expresso_mail_archive.isArchiveOperation = false; 
     }
     //close_lightbox();
@@ -585 +588 @@
     try{ 
         write_msg(get_lang("Starting to unarchive messages"));
+        expresso_mail_archive.isArchiveOperation = true;
         if(currentTab.toString().indexOf("_r") != -1){
             msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
@@ -709 +713 @@
             write_msg(get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length));
             cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params);
-
         }
         
-        write_msg(get_lang('Opening message %1 to unarchive', (expresso_mail_archive.unarchivecounter + 1)));
-    
         UnarchiveReqHandler.handler.open("GET", email, true);
         if(UnarchiveReqHandler.handler.overrideMimeType){
@@ -781 +782 @@
         //clear message list
         expresso_mail_archive.message_list = new Array();
+        expresso_mail_archive.isArchiveOperation = false;
     }
 }
@@ -828 +830 @@
     connector.purgeCache();
     //ttreeBox.update_folder(true);
-    if(expresso_mail_archive.message_list.length > 1){
-        write_msg(get_lang("The messages were deleted."));
-    }else{
-        write_msg(get_lang("The message was deleted."));
-    } 
+    if(!expresso_mail_archive.isArchiveOperation){
+        if(expresso_mail_archive.message_list.length > 1){
+            write_msg(get_lang("The messages were deleted."));
+        }else{
+            write_msg(get_lang("The message was deleted."));
+        } 
+    }
     expresso_mail_archive.update_counters = true;
     expresso_mail_archive.messageslisted = new Array();

trunk/expressoMail1_2/js/main.js

@@ -1046 +1046 @@
                 }
 
-                if (show_success_msg){
-                        if (data.msgs_number.length == 1)
-                                write_msg(get_lang("The message was deleted."));
-                        else
-                                write_msg(get_lang("The messages were deleted."));
+                //Se pref. usar mensagens locais ativaada e não for operação de arquivamento exibe mensagem de remoção.
+                if(preferences.use_local_messages == 1){
+                        if(!expresso_mail_archive.isArchiveOperation){
+                                if (show_success_msg){
+                                        if (data.msgs_number.length == 1)
+                                                write_msg(get_lang("The message was deleted."));
+                                        else
+                                                write_msg(get_lang("The messages were deleted."));
+                                }
+                        }
+                }
+                else{
+                        if (show_success_msg){
+                                if (data.msgs_number.length == 1)
+                                        write_msg(get_lang("The message was deleted."));
+                                else
+                                        write_msg(get_lang("The messages were deleted."));
+                        }
                 }
 
@@ -1585 +1598 @@
     selectAllFolderMsgs(false);
     updateSelectedMsgs();
-        
 }