Changeset 8232 for branches/2.5/expressoMail1_2/js/common_functions.js

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/expressoMail1_2/js/common_functions.js (modified) (4 diffs)

branches/2.5/expressoMail1_2/js/common_functions.js

@@ -694 +694 @@
 }
 
+/* 
+        Abre o diálogo de edição de filtro na tela de criação de filtro,  
+        com os dados da mensagem (remetente e assunto) pré-carregados. 
+*/ 
+ function filter_from_msg (msg) { 
+        var html = DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {}); 
+        initialize_container(html); 
+        list_container = create_filter_dialog(); 
+        render_new_rule(msg.from.email, html_entities(msg.subject)); 
+        $('.expresso-window-container').dialog('open'); 
+} 
 
 function sharebox(){
@@ -771 +782 @@
                         var number = id.replace(/_[a-zA-Z0-9]+/,"");
                 }
-                messages.push(onceOpenedHeadersMessages[folder_name][number]);
+                messages.push(onceOpenedHeadersMessages[folder_name][number] || number);
         }
 
@@ -997 +1008 @@
     abas_unseen = abas_unseen.match(/(<font.*?>){0,1} *([0-9]+) *(<\/font>){0,1}/)[2];
 
-        if (folder_unseen){ 
-                //folder_unseen.innerHTML = (parseInt(folder_unseen.innerHTML) + 1); 
-                /*Incrementa recursivamente o contador de mensagens*/
-                $('.selected').parents().find('> span.folder').not('.inbox').each(function(index,ui){
-                   var unseen = $(ui).find('.folder_unseen:last');
-                   unseen.html(parseInt(unseen.html(),10) + 1);
-                }); 
-        } 
+        if (folder_unseen){
+                //folder_unseen.innerHTML = (parseInt(folder_unseen.innerHTML) + 1);
+                /*Incrementa recursivamente o contador de mensagens*/
+                $('.selected').parents().find('> span.folder').not('.inbox').each(function(index,ui){
+                   var unseen = $(ui).find('.folder_unseen:last');
+                   unseen.html(parseInt(unseen.html(),10) + 1);
+                });
+        }
         else
         {
@@ -1046 +1057 @@
         if ((folder_unseen) && (parseInt(folder_unseen.innerHTML) > 1))
         {
-                //folder_unseen.innerHTML = (parseInt(folder_unseen.innerHTML) - 1); 
-                /*Decrementa recursivamente o contador de mensagens*/ 
-                $('.selected').parents().find('> span.folder').not('.inbox').each(function(index,ui){ 
-                   var unseen = $(ui).find('.folder_unseen:last'); 
-                   unseen.html(parseInt(unseen.html(),10) - 1); 
-                });      
+                //folder_unseen.innerHTML = (parseInt(folder_unseen.innerHTML) - 1);
+                /*Decrementa recursivamente o contador de mensagens*/
+                $('.selected').parents().find('> span.folder').not('.inbox').each(function(index,ui){
+                   var unseen = $(ui).find('.folder_unseen:last');
+                   unseen.html(parseInt(unseen.html(),10) - 1);
+                });     
         }
         else if (parseInt(folder_unseen.innerHTML) <= 1)