Changeset 8125

Timestamp:

04/26/13 19:33:09 (10 years ago)

Author:

douglas

Message:

Ticket #3436 - Nao fechamento de aba de visualizacao de mensagem apos seu arquivamento

Location:

branches/2.5/expressoMail1_2/js

Files:

• abas.js (modified) (1 diff)
• draw_api.js (modified) (3 diffs)

branches/2.5/expressoMail1_2/js/abas.js

@@ -241 +241 @@
         td.onclick = function(){alternate_border(ID);resizeWindow()};
         td.setAttribute("noWrap","true");
-    td.alt = ' ';
-    td.title = borderTitle;
+        td.setAttribute("role",get_current_folder());
+        td.title = borderTitle;
         borderTitle = borderTitle ?  borderTitle : id_value ? get_lang("No Subject") : " "      ;
         td.value = borderTitle;

branches/2.5/expressoMail1_2/js/draw_api.js

@@ -5773 +5773 @@
 }
 
+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();
@@ -5798 +5806 @@
                 ((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
@@ -5803 +5812 @@
         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>';
+             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>';
         }
     }