Changeset 406

Timestamp:

08/20/08 15:37:48 (16 years ago)

Author:

rafaelraymundo

Message:

Ocorrência #283 no trac da comunidade: Filtros de Relevância
Alteradas as funcoes sort_box - draw_api e funcoes de incremento e decremento do
commom_function para que a contagem de mensagens nao seja sobreposta apos realizar um filtro

Location:

trunk/expressoMail1_2/js

Files:

• common_functions.js (modified) (4 diffs)
• draw_api.js (modified) (2 diffs)

trunk/expressoMail1_2/js/common_functions.js

@@ -568 +568 @@
 function increment_folder_unseen(){
         var folder_id = get_current_folder();
-        
         var folder_unseen = Element('dftree_'+folder_id+'_unseen');
+        var abas_unseen = Element('new_m').innerHTML;
+        abas_unseen = abas_unseen.match( /[0-9]+/);
+
         if (folder_unseen)
         {
                 folder_unseen.innerHTML = (parseInt(folder_unseen.innerHTML) + 1);
-                Element('new_m').innerHTML = '<font face="Verdana" size="1" color="RED">'+folder_unseen.innerHTML+'</font>';
         }
         else
@@ -579 +580 @@
                 tree_folders.getNodeById(folder_id).alter({caption: tree_folders.getNodeById(folder_id).caption + '<font style=color:red>&nbsp(</font><span id="dftree_'+folder_id+'_unseen" style=color:red>1</span><font style=color:red>)</font>'});
                 tree_folders.getNodeById(folder_id)._refresh();
-                Element('new_m').innerHTML = '<font face="Verdana" size="1" color="RED">1</font>';
+        }
+        if (abas_unseen)
+        {
+                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>';
         }
 }
 function decrement_folder_unseen(){
         var folder_id = get_current_folder();
-        
         var folder_unseen = Element('dftree_'+folder_id+'_unseen');
-        if(!folder_unseen)
+        var abas_unseen = Element('new_m').innerHTML;
+        abas_unseen = abas_unseen.match( /[0-9]+/);
+
+        if(!folder_unseen || !abas_unseen)
                 return;
 
@@ -592 +605 @@
         {
                 folder_unseen.innerHTML = (parseInt(folder_unseen.innerHTML) - 1);
-                Element('new_m').innerHTML = '<font face="Verdana" size="1" color="RED">'+folder_unseen.innerHTML+'</font>';
         }
         else if (parseInt(folder_unseen.innerHTML) <= 1)
@@ -600 +612 @@
                 tree_folders.getNodeById(folder_id).alter({caption: folder_name});
                 tree_folders.getNodeById(folder_id)._refresh();
-                Element('new_m').innerHTML = 0;
+        }
+        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)
+        {
+                Element('new_m').innerHTML = '<font style="color:red">0</font>';
         }
 }

trunk/expressoMail1_2/js/draw_api.js

@@ -668 +668 @@
                 draw_box(data, get_current_folder(),true);
                 draw_paging(Element('tot_m').innerHTML);
+                //Mostrar as msgs nao lidas de acordo com o filtro de relevancia
+                var msgs_unseen = 0;
+                for(i in data){
+                        if(data[i].Unseen == 'U')
+                                msgs_unseen++;
+                }
+                Element("new_m").innerHTML = '<font style="color:red">' + msgs_unseen + '</font>';
         }
 
@@ -686 +693 @@
         cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&search_box_type="+search+"&sort_box_type="+sort+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
         current_page = 1;
-        update_menu();
+        //Comentado para nao sobrepor o numero de msgs nao lidas ao utilizar os filtros
+        //update_menu();
 }
 function draw_header_box(){