Changeset 4761 for trunk/expressoMail1_2/js/shortcut.js

Timestamp:

07/15/11 10:19:44 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1975 - Solucionada inconsistência do teclado ao navegar na busca por F9

File:

• trunk/expressoMail1_2/js/shortcut.js (modified) (5 diffs)

trunk/expressoMail1_2/js/shortcut.js

@@ -131 +131 @@
         
                         var modifiers = { 
-                                shift: { wanted:false, pressed:false},
-                                ctrl : { wanted:false, pressed:false},
-                                alt  : { wanted:false, pressed:false},
-                                meta : { wanted:false, pressed:false}   //Meta is Mac specific
+                                shift: {wanted:false, pressed:false},
+                                ctrl : {wanted:false, pressed:false},
+                                alt  : {wanted:false, pressed:false},
+                                meta : {wanted:false, pressed:false}    //Meta is Mac specific
                         };
                         
@@ -246 +246 @@
                 if (arrayJSWin[window].visible)
                 {
-                        arrayJSWin[window].close();
+                        arrayJSWin[window].close();
+                        var search_win = document.getElementById( 'window_QuickCatalogSearch' );
+                        search_win.style.visibility = 'hidden';
                         window_closed = true;
                 }
         }
+    
         if (!window_closed)
                 delete_border(get_msg_id(), 'false');
 },{'disable_in_input':false});
 
-shortcut.add("I",function(){ print_all(); },{'disable_in_input':true}); 
-shortcut.add("E",function(){ exec_msg_action('forward'); },{'disable_in_input':true});
-shortcut.add("R",function(){ exec_msg_action('reply'); },{'disable_in_input':true});
-shortcut.add("O",function(){ show_head_option(); },{'disable_in_input':true});
-shortcut.add("M",function(){ show_address_full(); },{'disable_in_input':true});
+shortcut.add("I",function(){print_all();},{'disable_in_input':true});
+shortcut.add("E",function(){exec_msg_action('forward');},{'disable_in_input':true});
+shortcut.add("R",function(){exec_msg_action('reply');},{'disable_in_input':true});
+shortcut.add("O",function(){show_head_option();},{'disable_in_input':true});
+shortcut.add("M",function(){show_address_full();},{'disable_in_input':true});
 
 shortcut.add("Delete",function(){
@@ -296 +299 @@
 ,{'disable_in_input':true});
 
-shortcut.add("Ctrl+Up",function(){ exec_msg_action('previous'); select_msg('null', 'up', true);},{'disable_in_input':true});
-shortcut.add("Ctrl+Down",function(){ exec_msg_action('next'); select_msg('null', 'down', true);},{'disable_in_input':true});
+shortcut.add("Ctrl+Up",function(){exec_msg_action('previous');select_msg('null', 'up', true);},{'disable_in_input':true});
+shortcut.add("Ctrl+Down",function(){exec_msg_action('next');select_msg('null', 'down', true);},{'disable_in_input':true});
 
 if (is_ie)
 {
-        shortcut.add("down",function(){ select_msg('null', 'down'); },{'disable_in_input':false});
-        shortcut.add("up",function(){ select_msg('null', 'up'); },{'disable_in_input':false});  
-        
+//**********************
+shortcut.add('up', function()
+        {
+                var search_in_focus = false;
+                var search_win = document.getElementById( 'window_QuickCatalogSearch' );
+                if ( search_win && search_win.style.visibility == 'visible' )
+                        search_in_focus = true;
+
+                if ( !search_in_focus )
+                    select_msg('null', 'up');
+                else
+                    shortcut.remove('up');
+        },{'disable_in_input':false});
+
+
+        shortcut.add('down', function()
+        {
+                var search_in_focus = false;
+                var search_win = document.getElementById( 'window_QuickCatalogSearch' );
+                if ( search_win && search_win.style.visibility == 'visible' )
+                        search_in_focus = true;
+
+                if ( !search_in_focus )
+                    select_msg('null', 'down');
+                else
+                    shortcut.remove('down');
+        },{'disable_in_input':false});
+
+//****************
+
         shortcut.add("Shift+down",function(){
                 if ( Element('border_id_0').className==='menu-sel' )
@@ -326 +356 @@
 else
 {
-        shortcut.add("down",function(){ select_msg('null', 'down');},{'type':'keypress', 'disable_in_input':false});
-        shortcut.add("up",function(){ select_msg('null', 'up');},{'type':'keypress', 'disable_in_input':false});
+        shortcut.add("down",function(){select_msg('null', 'down');},{'type':'keypress', 'disable_in_input':false});
+        shortcut.add("up",function(){select_msg('null', 'up');},{'type':'keypress', 'disable_in_input':false});
         
         shortcut.add("Shift+down",function(){
@@ -363 +393 @@
                 }
         }
-}
-,{'disable_in_input':true});
+},{'disable_in_input':true});
 
 shortcut.add("f9",function(){