Changeset 7189 for sandbox/2.5.0-expresso1/expressoMail1_2/js/mail_archiver.js

Timestamp:

09/11/12 15:24:49 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Implementação parcial desarquivar por drag/drop (mover)

File:

• sandbox/2.5.0-expresso1/expressoMail1_2/js/mail_archiver.js (modified) (3 diffs)

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

@@ -559 +559 @@
 MailArchiver.prototype.unarchieve = function (folder, new_folder, msgs_number){
     try{ 
-        document.getElementById('main_title').innerHTML = get_lang("Starting to unarchive messages");
+        //Marcosw inicio - Melhoria na exibição de mensagem
+        //document.getElementById('main_title').innerHTML = get_lang("Starting to unarchive messages");
+        write_msg(get_lang("Starting to unarchive messages"));
+        //Marcosw fim
         if(currentTab.toString().indexOf("_r") != -1){
             msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
@@ -573 +576 @@
                 expresso_mail_archive.unarchivecounter = 0;
                 expresso_mail_archive.unarchive_error_counter=0;
-                expresso_mail_archive.getFolderInfo(folder.substr(6, folder.length));
+
+                //Marcosw início - correção de inconsistência com o nome da pasta local
+                //expresso_mail_archive.getFolderInfo(folder.substr(6, folder.length));
+                expresso_mail_archive.getFolderInfo(folder.replace("local_messages",""));
+                //Marcosw fim
+
                 expresso_mail_archive.unarchievefolder = expresso_mail_archive.folder.name;
                 (new_folder != null)?expresso_mail_archive.unarchievenewfolder = new_folder:expresso_mail_archive.unarchievenewfolder='INBOX';
@@ -677 +685 @@
                 expresso_mail_archive.unarchieveController(data);
             }
-            //write_msg(get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length));
-            document.getElementById('main_title').innerHTML = get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length);
+            //Marcosw inicio - Melhoria na exibição de mensagem
+            //document.getElementById('main_title').innerHTML = get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length);
+            write_msg(get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length));
+            //Marcosw fim
+            
             cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params);
 
         }
         
-        document.getElementById('main_title').innerHTML = get_lang('Opening message %1 to unarchive', (expresso_mail_archive.unarchivecounter + 1));
+        //Marcosw inicio - Melhoria na exibição de mensagem
+        //document.getElementById('main_title').innerHTML = get_lang('Opening message %1 to unarchive', (expresso_mail_archive.unarchivecounter + 1));
+        write_msg(get_lang('Opening message %1 to unarchive', (expresso_mail_archive.unarchivecounter + 1)));
+        //Marcosw fim
     
         UnarchiveReqHandler.handler.open("GET", email, true);