Changeset 8119

Timestamp:

04/26/13 09:11:24 (11 years ago)

Author:

thiago

Message:

Ticket #3436 - Problema ao mudar de pasta e clicar em arquivar.

Location:

trunk/expressoMail1_2/js

Files:

• abas.js (modified) (3 diffs)
• draw_api.js (modified) (2 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -17 +17 @@
 function alternate_border(ID)
 {
+   
+
     msg_selected = false;//Controle da seleção de mensagens
     if(isNaN(ID))
@@ -154 +156 @@
     RichTextEditor.setEditable(ID);
     resizeWindow();
+
     return ID;
 }
@@ -241 +244 @@
     td.onclick = function(){alternate_border(ID);resizeWindow()};
     td.setAttribute("noWrap","true");
-    td.alt = ' ';
+    td.setAttribute("role",get_current_folder());
     td.title = borderTitle;
     borderTitle = borderTitle ?  borderTitle : id_value ? get_lang("No Subject") : " "  ;

trunk/expressoMail1_2/js/draw_api.js

@@ -5844 +5844 @@
 }
 
+function verifyContext(type) {
+    if(type == "unarchive"){
+        expresso_mail_archive.unarchieve($(".menu-sel").attr("role"), null, null);
+    } else {
+        archive_msgs($(".menu-sel").attr("role"),null,null)
+    }
+}
+
 function draw_footer_box(num_msgs){
         folder = get_current_folder();
@@ -5869 +5877 @@
                 ((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>');
 
+    
     //Link arquivar e desarquivar com ação
     //MAILARCHIVER
     if(preferences.use_local_messages==1){
         if(expresso_mail_archive.enabled){
+            console.log(2);
            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>';
+             span_options.innerHTML += '&nbsp; <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="verifyContext(\'unarchive\')">'+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>';
+             span_options.innerHTML += '&nbsp; <span title="'+get_lang("Archive")+'" class="message_options" onclick="verifyContext(\'archive\')">'+get_lang("Archive")+'</span>';
         }
     }