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

Timestamp:

07/19/11 08:37:25 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Tratada as interações da janela de pesquisa por F9, em IE e FF.r4635

File:

• trunk/expressoMail1_2/js/shortcut.js (modified) (1 diff)

trunk/expressoMail1_2/js/shortcut.js

@@ -242 +242 @@
 shortcut.add("Esc",function(){
         var window_closed = false;
-        for(var window in arrayJSWin)
-        {
-                if (arrayJSWin[window].visible)
-                {
+        var search_win = document.getElementById( 'window_QuickCatalogSearch' );
+        
+        for(var window in arrayJSWin)
+        {
+                if (arrayJSWin[window].visible)
+                {
+                    window_closed = true;
+                    if(search_win.style.visibility == 'hidden'){
                         arrayJSWin[window].close();
-                        var search_win = document.getElementById( 'window_QuickCatalogSearch' );
-                        search_win.style.visibility = 'hidden';
-                        window_closed = true;
-                }
-        }
-    
+                    }
+                }
+        }
+        if((search_win) && (search_win.style.visibility == 'visible')){
+            search_win.style.visibility = 'hidden';
+            win.close();
+       }        
+
         if (!window_closed)
                 delete_border(get_msg_id(), 'false');