Changeset 3742

Timestamp:

02/09/11 16:32:00 (13 years ago)

Author:

eduardoalex

Message:

Ticket #981 - Corrigido atualizacao do filtro nao lida e lida

Location:

branches/2.2/expressoMail1_2/js

Files:

• common_functions.js (modified) (6 diffs)
• main.js (modified) (3 diffs)

branches/2.2/expressoMail1_2/js/common_functions.js

@@ -398 +398 @@
 
 var setTimeout_write_msg = 0;
-var old_msg = false;
+var old_msg = false;    
 // Funcao usada para escrever mensagem
 // notimeout = True : mensagem nao apaga
@@ -762 +762 @@
         var folder_unseen = Element('dftree_'+folder_id+'_unseen');
         var abas_unseen = Element('new_m').innerHTML;
-        abas_unseen = abas_unseen.match( /[0-9]+/);
+    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);
-        }
         else
         {
@@ -773 +771 @@
                 tree_folders.getNodeById(folder_id)._refresh();
         }
-        if (abas_unseen)
-        {
+
+        if( abas_unseen == NaN || abas_unseen == undefined )
+                abas_unseen = 1;
+        else
                 abas_unseen = parseInt(abas_unseen) + 1;
-                Element('new_m').innerHTML = '<font style="color:red">' + abas_unseen + '</font>';
-        }
-        else{
-                abas_unseen = Element('new_m').innerHTML;
-                abas_unseen = abas_unseen.match( /[0-9]+/);
-                abas_unseen = parseInt(abas_unseen) + 1;
-                Element('new_m').innerHTML = '<font style="color:red">' + abas_unseen + '</font>';
-        }
+
+        Element('new_m').innerHTML = '<font style="color:red">' + abas_unseen + '</font>';
+        
         if ( current_folder.indexOf( 'INBOX' ) !== 0 && current_folder.indexOf( 'local_' ) !== 0 )
         {
@@ -800 +795 @@
         tree_folders.getNodeById( node_to_refresh )._refresh();
 }
+
 function decrement_folder_unseen(){
         var folder_id = get_current_folder();
@@ -805 +801 @@
         var folder_unseen = Element('dftree_'+folder_id+'_unseen');
         var abas_unseen = Element('new_m').innerHTML;
-        abas_unseen = abas_unseen.match( /[0-9]+/);
+    abas_unseen = abas_unseen.match( /(<font.*?>){0,1} *([0-9]+) *(<\/font>){0,1}/)[2];
 
         if(!folder_unseen || !abas_unseen)
@@ -821 +817 @@
                 tree_folders.getNodeById(folder_id)._refresh();
         }
-        if ((abas_unseen) && (parseInt(abas_unseen) > 1))
-        {
-                abas_unseen = (parseInt(abas_unseen) - 1);
-                Element('new_m').innerHTML = '<font style="color:red">' + abas_unseen + '</font>';
-        }
-        else if (parseInt(abas_unseen) <= 1)
-        {
+        if (parseInt(abas_unseen) > 1) {
+        Element('new_m').innerHTML = '<font style="color:red">' + (parseInt(abas_unseen) - 1) + '</font>';
+        } else {
                 Element('new_m').innerHTML = '0';
         }

branches/2.2/expressoMail1_2/js/main.js

@@ -431 +431 @@
                                 return false;
 
+                        var total_messages_element = Element('tot_m');
+
                         for (var i=0; i<data.length; i++){
                                 var existent = document.getElementById(data[i].msg_number);
@@ -439 +441 @@
                                         if (data[i].Recent == 'N')
                                                 box.insertBefore(new_msg,box.firstChild);
-                                        else
+                                        else 
                                                 box.appendChild(new_msg);
 
+                                        total_messages_element.innerHTML = parseInt( total_messages_element.innerHTML ) + 1;
                                 }
                         }
@@ -2096 +2099 @@
                                         break;
                         }                               
+                } else {
+                        refresh();
                 }
         }