From 871960c70866e3c70eeaedfa20b1a1b6917f68fa Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 15 Apr 2016 18:39:10 +0300
Subject: Only handle shortcuts targeted for UI or body element (#19498)

Change-Id: I796d7e4ac94db1b2b9d8698e9753a5be007a1c8c
---
 client/src/com/vaadin/client/ui/ui/UIConnector.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'client')

diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index 9ffb9cfba9..6f4872729d 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -507,8 +507,16 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
             @Override
             public void onKeyDown(KeyDownEvent event) {
                 if (getWidget().actionHandler != null) {
-                    getWidget().actionHandler.handleKeyboardEvent((Event) event
-                            .getNativeEvent().cast());
+                    Element target = Element.as(event.getNativeEvent()
+                            .getEventTarget());
+                    if (target == Document.get().getBody()
+                            || getWidget().getElement().isOrHasChild(target)) {
+                        // Only react to body and elements inside the UI
+                        getWidget().actionHandler
+                                .handleKeyboardEvent((Event) event
+                                        .getNativeEvent().cast());
+                    }
+
                 }
             }
         }, KeyDownEvent.getType());
-- 
cgit v1.2.3