Upgrade to ExtJS 4.0.2 - Released 06/09/2011

[extjs.git] / src / FocusManager.js

diff --git a/src/FocusManager.js b/src/FocusManager.js
index cf5645b..16dfeb8 100644 (file)
--- a/src/FocusManager.js
+++ b/src/FocusManager.js
@@ -1,3 +1,17 @@
+/*
+
+This file is part of Ext JS 4
+
+Copyright (c) 2011 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation and appearing in the file LICENSE included in the packaging of this file.  Please review the following information to ensure the GNU General Public License version 3.0 requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department at http://www.sencha.com/contact.
+
+*/
 /**
  * @class Ext.FocusManager
 
@@ -420,10 +434,14 @@ Ext.define('Ext.FocusManager', {
 
         if (!me.focusedCmp || !(parent = me.focusedCmp.up(':focusable'))) {
             me.focusEl.focus();
-            return;
+        } else {
+            parent.focus();
         }
 
-        parent.focus();
+        // In some browsers (Chrome) FocusManager can handle this before other
+        // handlers. Ext Windows have their own Esc key handling, so we need to
+        // return true here to allow the event to bubble.
+        return true;
     },
 
     navigateSiblings: function(e, source, parent) {
@@ -856,4 +874,4 @@ Ext.define('Ext.FocusManager', {
         safeSetFocus(container);
         me.removeDOM();
     }
-});
\ No newline at end of file
+});