Changeset 214

Timestamp:

03/11/08 14:51:58 (16 years ago)

Author:

niltonneto

Message:

Melhoria nos ícones do menu Ferramentas

Location:

trunk/expressoMail1_2/js

Files:

• doiMenuData.js (modified) (1 diff)
• main.js (modified) (2 diffs)

trunk/expressoMail1_2/js/doiMenuData.js

@@ -9 +9 @@
                                                                 
         var itens = new Array (
-                                                        "preferences_mail()|"+get_lang("Preferences")+"|preferences.gif",
-                                                        "search_emails(\"\")|"+get_lang("Search")+"|search.gif",
-                                                        "filterbox()|"+get_lang("Edit filters")+"|filters.gif",
-                                                        "folderbox()|"+get_lang("Edit folders")+"|editfolders.gif",
-                                                        "sharebox()|"+get_lang("Share mailbox")+"|editfolders.gif",
-                                                        "empty_trash_imap()|"+get_lang("Empty trash")+"|trash.gif"
+                                                        "preferences_mail()|"+get_lang("Preferences")+"|preferences.png",
+                                                        "search_emails(\"\")|"+get_lang("Search")+"|search.png",
+                                                        "filterbox()|"+get_lang("Edit filters")+"|filters.png",
+                                                        "folderbox()|"+get_lang("Edit folders")+"|editfolders.png",
+                                                        "sharebox()|"+get_lang("Share mailbox")+"|usersfolders.png",
+                                                        "empty_trash_imap()|"+get_lang("Empty trash")+"|trash.png"
                                                         );
 

trunk/expressoMail1_2/js/main.js

@@ -156 +156 @@
                 Element('chk_box_select_all_messages').checked = false;
                 mail_msg = Element("tbody_box");
+                
+                if ( preferences.use_shortcuts == '1') {
+                        var all_messages = Element('tbody_box').childNodes;
+
+                        //Last msg is selected
+                        if ( exist_className(all_messages[all_messages.length-1], 'selected_shortcut_msg') ) {
+                                select_msg('null', 'up', true);
+                        }
+                        else {
+                                if (!select_msg('null', 'down', true)) {
+                                        select_msg('null', 'up', true);
+                                }
+                        }
+                }
+                
                 var msg_to_delete;
                 for (var i=0; i<data.msgs_number.length; i++){
                         msg_to_delete = Element(data.msgs_number[i]);
                         if (msg_to_delete){
-                                if ( exist_className(msg_to_delete, 'selected_shortcut_msg') && (preferences.use_shortcuts == '1') )
-                                {
-                                        if (!select_msg('null', 'down', true))
-                                                select_msg('null', 'up', true)
-                                }
                                 mail_msg.removeChild(msg_to_delete);
                         }
@@ -258 +268 @@
                 mail_msg = Element("tbody_box");
                 data.msgs_number = data.msgs_number.split(",");
-                var msg_to_delete;
-                for (var i=0; i<data.msgs_number.length; i++){
+                
+                if ( preferences.use_shortcuts == '1') {
+                        var all_messages = Element('tbody_box').childNodes;
+
+                        //Last msg is selected
+                        if ( exist_className(all_messages[all_messages.length-1], 'selected_shortcut_msg') ) {
+                                select_msg('null', 'up', true);
+                        }
+                        else {
+                                if (!select_msg('null', 'down', true)) {
+                                        select_msg('null', 'up', true);
+                                }
+                        }
+                }
+
+                var msg_to_delete;              
+                for (var i=0; i<data.msgs_number.length; i++)
+                {
                         msg_to_delete = Element(data.msgs_number[i]);
-                        if (msg_to_delete){                             
-                                if ( exist_className(msg_to_delete, 'selected_shortcut_msg') && (preferences.use_shortcuts == '1') )
-                                {
-                                        if (!select_msg('null', 'down', true))
-                                                select_msg('null', 'up', true)
-                                }
+                        if (msg_to_delete)
                                 mail_msg.removeChild(msg_to_delete);
-                        }
                 }