fixes #6484, added missing META modifier key as a constant and handling on the client...

svn changeset:17385/svn branch:6.5

diff --git a/src/com/vaadin/event/ShortcutAction.java b/src/com/vaadin/event/ShortcutAction.java
index cd426d2f7209b93e768a1524ecdf781eabeeed90..c722d2e80ea4ed08c1ef6114a0f7259d0a9b385a 100644 (file)
--- a/src/com/vaadin/event/ShortcutAction.java
+++ b/src/com/vaadin/event/ShortcutAction.java
@@ -367,5 +367,7 @@ public class ShortcutAction extends Action {
         public static final int CTRL = 17;
 
         public static final int ALT = 18;
+
+        public static final int META = 91;
     }
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
index 77210caa6357f29b248ea3020e418f2e249de857..01f7187aa17585d52080597669cf211a9ca4a5a1 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
@@ -224,6 +224,7 @@ class ShortcutKeyCombination {
     public static final int SHIFT = 16;
     public static final int CTRL = 17;
     public static final int ALT = 18;
+    public static final int META = 91;
 
     char keyCode = 0;
     private int modifiersMask;
@@ -255,6 +256,10 @@ class ShortcutKeyCombination {
                     modifiersMask = modifiersMask
                             | KeyboardListener.MODIFIER_SHIFT;
                     break;
+                case META:
+                    modifiersMask = modifiersMask
+                            | KeyboardListener.MODIFIER_META;
+                    break;
                 default:
                     break;
                 }