From: Artur Signell <artur@vaadin.com>
Date: Fri, 19 Dec 2014 15:15:12 +0000 (+0200)
Subject: Prevent key events without key code from triggering actions (#11029)
X-Git-Tag: 7.4.0.beta2~8^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b89213ee880dd1197bc7696f6f5a1919c0ff02c1;p=vaadin-framework.git

Prevent key events without key code from triggering actions (#11029)

Seemingly not possible to auto-test reliably

Change-Id: Idb492465323d91279caf170646590a54847b9414
---

diff --git a/client/src/com/vaadin/client/ui/ShortcutActionHandler.java b/client/src/com/vaadin/client/ui/ShortcutActionHandler.java
index 9e9279267d..a9d5f0731a 100644
--- a/client/src/com/vaadin/client/ui/ShortcutActionHandler.java
+++ b/client/src/com/vaadin/client/ui/ShortcutActionHandler.java
@@ -123,6 +123,9 @@ public class ShortcutActionHandler {
         final int modifiers = KeyboardListenerCollection
                 .getKeyboardModifiers(event);
         final char keyCode = (char) DOM.eventGetKeyCode(event);
+        if (keyCode == 0) {
+            return;
+        }
         final ShortcutKeyCombination kc = new ShortcutKeyCombination(keyCode,
                 modifiers);
         final Iterator<ShortcutAction> it = actions.iterator();
diff --git a/uitest/src/com/vaadin/tests/actions/ActionsWithoutKeyCode.java b/uitest/src/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
new file mode 100644
index 0000000000..e94a4b1ade
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
@@ -0,0 +1,39 @@
+package com.vaadin.tests.actions;
+
+import com.vaadin.event.Action;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.TextField;
+
+@SuppressWarnings("serial")
+public class ActionsWithoutKeyCode extends AbstractTestUIWithLog {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        TextField tf = new TextField();
+        tf.setWidth("100%");
+        tf.setInputPrompt("Enter text with å,ä or ä or press windows key while textfield is focused");
+        addComponent(tf);
+
+        addActionHandler(new Action.Handler() {
+
+            private Action[] actions;
+            {
+                actions = new Action[] { new Action("test1") };
+            }
+
+            @Override
+            public Action[] getActions(Object target, Object sender) {
+                return actions;
+            }
+
+            @Override
+            public void handleAction(Action action, Object sender, Object target) {
+                log("action " + action.getCaption() + " triggered by "
+                        + sender.getClass().getSimpleName() + " on "
+                        + target.getClass().getSimpleName());
+            }
+        });
+    }
+
+}
\ No newline at end of file