Changeset 7204 for sandbox/2.5.0-expresso1

Timestamp:

09/13/12 17:33:31 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Implementação arquivar/desarquivar várias mensagens

Location:

sandbox/2.5.0-expresso1/expressoMail1_2/js

Files:

• draw_api.js (modified) (2 diffs)
• mail_archiver.js (modified) (2 diffs)
• main.js (modified) (4 diffs)
• messages_controller.js (modified) (1 diff)

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

@@ -5603 +5603 @@
                 ((expresso_offline)?" ":'<span class="message_options_export"><span ' + change_font_color + ' title="'+get_lang("Export")+'" class="message_options" onclick="proxy_mensagens.export_all_messages()">'+get_lang("Export")+'</span></span>') +
                 ((expresso_offline)?" ":'<span class="message_options_import"><span ' + change_font_color + ' title="'+get_lang("Import")+'" class="message_options" onclick="import_window()">'+get_lang("Import")+'</span></span>');
+
+    //Marcosw inicio - Inserido link arquivar e desarquivar com ação
+    /*
         if(preferences.use_local_messages==1 && !expresso_offline)
                 if(proxy_mensagens.is_local_folder(current_folder))
@@ -5608 +5611 @@
                 else
                         span_options.innerHTML += '&nbsp; <span id="localOption" ' + change_font_color + ' title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
+    */
+    //MAILARCHIVER
+    if(preferences.use_local_messages==1){
+        if(expresso_mail_archive.enabled){
+           if(proxy_mensagens.is_local_folder(current_folder))//Unarchive link
+             span_options.innerHTML += '&nbsp; <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="expresso_mail_archive.unarchieve(\''+folder+'\', null, null);">'+get_lang("Unarchive")+'</span>';
+           else//Archive link                 
+             span_options.innerHTML += '&nbsp; <span title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null,null)">'+get_lang("Archive")+'</span>';
+        }
+    }
+    //Marcosfim
+
         if (use_spam_filter) {
                 if ( current_folder == 'INBOX'+cyrus_delimiter+'Spam' ) {

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

@@ -599 +599 @@
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0){       
             expresso_mail_archive.message_list = new Array();
+    }
             expresso_mail_archive.CreateMessageList(msgs_number);
             if((expresso_mail_archive.message_list.length > 0) && (expresso_mail_archive.message_list[0] != '')) {
@@ -612 +613 @@
                 (new_folder != null)?expresso_mail_archive.unarchievenewfolder = new_folder:expresso_mail_archive.unarchievenewfolder='INBOX';
                 expresso_mail_archive.unarchieveHandler();
+
+                //Marcos Início - É preciso remover a aba da mensagem
+                if(currentTab.toString().indexOf("_r") != -1){
+                    delete_border(currentTab,'false');  
+                }
+                //Marcos Fim 
             }
             else{

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

@@ -937 +937 @@
                          
                         if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 
-                    if(currentTab == 0)
-                                                msgs_number = get_selected_messages();
+                    // Marcosw início - msgs_number teve de ser comentando para evitar inconsistência, já é setado anteriormente
+                    //if(currentTab == 0)
+                                        //      msgs_number = get_selected_messages();
+                                        // Marcosw fim
                             move_msgs2(folder, ""+msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg ); 
-                                return;
-        }
+                                        return;
+                                }
 
         var handler_delete_msgs = function(data){
@@ -1018 +1020 @@
         }
         
-        if(currentTab == 0 )
-                msgs_number = get_selected_messages();
+        // Marcosw início - msgs_number teve de ser comentando para evitar inconsistência, já é setado anteriormente
+        // if(currentTab == 0)
+        //      msgs_number = get_selected_messages();
+        // Marcosw fim
 
         if (msgs_number.length > 0 || parseInt(msgs_number) > 0)
@@ -1361 +1365 @@
 
     //Marcosw inicio - Inserida validação para recuperar o id caso não seja aba de listagem
-        if(currentTab == 0)
+        if (currentTab == 0 && msgs_number == "selected")
                 msgs_number = get_selected_messages();
-        else
+        else if (currentTab != 0 && msgs_number == "selected")
                 msgs_number = currentTab.substr(0,currentTab.indexOf('_r'));
     //Marcosw fim
@@ -1607 +1611 @@
     
     if (parseInt(id_msgs) > 0 || id_msgs.length > 0){       
-        expresso_mail_archive.Archive(folder,folder_dest,id_msgs);
+        //expresso_mail_archive.Archive(folder,folder_dest,id_msgs);
+        window.setTimeout("expresso_mail_archive.Archive('" + folder + "','" + folder_dest + "','" + id_msgs + "')", 1);
+        selectAllFolderMsgs(false);
     }
     else

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

@@ -163 +163 @@
                 if (msgs_number == 'selected' && currentTab != 0) //Recupera apenas o id da mensagem aberta
                         msgs_number = currentTab.substr(0,currentTab.indexOf('_r'));
-        else
+        else if (msgs_number == 'selected' && currentTab == 0)
             msgs_number = get_selected_messages();
         //Marcos fim