Changeset 6754 for branches/2.4/expressoMail1_2/js/shortcut.js

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

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

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/js/shortcut.js (modified) (4 diffs)

branches/2.4/expressoMail1_2/js/shortcut.js

@@ -327 +327 @@
 shortcut.add('up', function(e)
         {
+                
                 var search_in_focus = false;
                 var search_win = document.getElementById( 'window_QuickCatalogSearch' );
@@ -334 +335 @@
                 if ( !search_in_focus && currentTab == 0 )
                     select_msg('null', 'up');
-                // Ao usuario pressionar o 'up' em uma outra aba, não pode ser removido o 'up'. 
-                            else{} 
-               // shortcut.remove('up'); 
+                // Ao usuario pressionar o 'up' em uma outra aba, não pode ser removido o 'up'.
+                                else{}
+                   // shortcut.remove('up');
                                 e.stopPropagation();
                                 e.preventDefault();
@@ -351 +352 @@
                 if ( !search_in_focus && currentTab == 0 )
                     select_msg('null', 'down');
-                // Ao usuario pressionar o 'down' em uma outra aba, não pode ser removido o 'down'.  
-                else{} 
+                                // Ao usuario pressionar o 'down' em uma outra aba, não pode ser removido o 'down'. 
+                else{}
                    // shortcut.remove('down');
                                 e.stopPropagation();
@@ -519 +520 @@
 
         if (msg_number != 'null') {
-
+        
                 if(Element(msg_number)){
                         unselect_all_msgs();
                         add_className(Element(msg_number), 'selected_shortcut_msg');
                 }
-
-        }else{
+                
+        } else {
                 var scrollMain = Element('divScrollMain_0');
                 var selection_size = parseInt(preferences.line_height) + 10; 
-                if( keyboard_action == 'down') { 
-                                         
-                if(!Element("chk_box_select_all_messages").checked){ 
-                         
-                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){ 
-                         
-                                if($(this).hasClass("selected_shortcut_msg") && $(this).next().length){ 
-                                        $(this).next().addClass("selected_shortcut_msg"); 
-                                        $(this).removeClass("selected_shortcut_msg"); 
-                                        return false; 
-                                } 
-                                 
-                        }); 
-                         
-                } else { 
-                 
-                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){ 
-                                 
-                                if($(this).hasClass("current_selected") && $(this).next().length){ 
-                                        $(this).removeClass("current_selected"); 
-                                    $(this).removeClass("selected_shortcut_msg"); 
-                                        $(this).next().addClass("current_selected"); 
-                                        $(this).next().addClass("selected_shortcut_msg"); 
-                                        return false; 
-                                } 
-                         
-                        }); 
-                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){ 
-                                                if(!$(this).hasClass("current_selected")) 
-                                                        $(this).removeClass("selected_shortcut_msg"); 
-                        });
+                
+                        if( keyboard_action == 'down') {
+                        
+                                if(!Element("chk_box_select_all_messages").checked){
+                                        
+                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                                        
+                                                if($(this).hasClass("selected_shortcut_msg") && $(this).next().length){
+                                                        $(this).next().addClass("selected_shortcut_msg");
+                                                        $(this).removeClass("selected_shortcut_msg");
+                                                        return false;
+                                                }
+                                                
+                                        });
+                                        
+                                } else {
+                                
+                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                                                
+                                                if($(this).hasClass("current_selected") && $(this).next().length){
+                                                        $(this).removeClass("current_selected");
+                                                        $(this).removeClass("selected_shortcut_msg");
+                                                        $(this).next().addClass("current_selected");
+                                                        $(this).next().addClass("selected_shortcut_msg");
+                                                        return false;
+                                                }
+                                        
+                                        });
+                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                                                                if(!$(this).hasClass("current_selected"))
+                                                                        $(this).removeClass("selected_shortcut_msg");
+                                        });
                                 }
                         
-                        } else if( keyboard_action == 'up') { 
-                                         
-                    if(!Element("chk_box_select_all_messages").checked){ 
-                     
-                            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){ 
-                             
-                                    if($(this).hasClass("selected_shortcut_msg") && $(this).prev().length){ 
-                                                    $(this).prev().addClass("selected_shortcut_msg"); 
-                                                    $(this).removeClass("selected_shortcut_msg"); 
-                                                    return false; 
-                                    } 
-                                     
-                            }); 
-                             
-                    } else { 
-                             
-                            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){ 
-                                     
-                                    if($(this).hasClass("current_selected") && $(this).prev().length){ 
-                                            $(this).removeClass("current_selected"); 
-                                            $(this).removeClass("selected_shortcut_msg"); 
-                                            $(this).prev().addClass("current_selected"); 
-                                            $(this).prev().addClass("selected_shortcut_msg"); 
-                                            return false; 
-                                    } 
-                             
-                            }); 
-                            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){ 
-                                                    if(!$(this).hasClass("current_selected")) 
-                                                            $(this).removeClass("selected_shortcut_msg"); 
-                            });
-                                        }
+                        } else if( keyboard_action == 'up') {
+                        
+                                if(!Element("chk_box_select_all_messages").checked){
+                                
+                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                                        
+                                                if($(this).hasClass("selected_shortcut_msg") && $(this).prev().length){
+                                                                $(this).prev().addClass("selected_shortcut_msg");
+                                                                $(this).removeClass("selected_shortcut_msg");
+                                                                return false;
+                                                }
+                                                
+                                        });
+                                        
+                                } else {
+                                        
+                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                                                
+                                                if($(this).hasClass("current_selected") && $(this).prev().length){
+                                                        $(this).removeClass("current_selected");
+                                                        $(this).removeClass("selected_shortcut_msg");
+                                                        $(this).prev().addClass("current_selected");
+                                                        $(this).prev().addClass("selected_shortcut_msg");
+                                                        return false;
+                                                }
+                                        
+                                        });
+                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                                                                if(!$(this).hasClass("current_selected"))
+                                                                        $(this).removeClass("selected_shortcut_msg");
+                                        });
+                                
                                 }
+                  
+                        }
                 return true;
         }