#6026 Keyboard multiselection in Firefox broken in Table and Tree

svn changeset:16462/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index f743e8d7c6f1e94576064646927decb4353fec79..a46a9df7e29984de0aff55537646230d3514169a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -5398,7 +5398,12 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             // scrolling)
             event.preventDefault();
         } else if (hasFocus) {
-            if (handleNavigation(event.getNativeEvent().getKeyCode(),
+            int keyCode = event.getNativeEvent().getKeyCode();
+            if (keyCode == 0) {
+                keyCode = event.getNativeEvent().getCharCode();
+            }
+
+            if (handleNavigation(keyCode,
                     event.isControlKeyDown() || event.isMetaKeyDown(),
                     event.isShiftKeyDown())) {
                 event.preventDefault();

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index f903d60cc40b6dcdefb5144d2773e5c2230b91bb..ec09b4299bdbf0aa13f2221c14507da46786823f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -1556,7 +1556,11 @@ public class VTree extends SimpleFocusablePanel implements Paintable,
      * .gwt.event.dom.client.KeyPressEvent)
      */
     public void onKeyPress(KeyPressEvent event) {
-        if (handleKeyNavigation(event.getNativeEvent().getKeyCode(),
+        int keyCode = event.getNativeEvent().getKeyCode();
+        if (keyCode == 0) {
+            keyCode = event.getNativeEvent().getCharCode();
+        }
+        if (handleKeyNavigation(keyCode,
                 event.isControlKeyDown() || event.isMetaKeyDown(),
                 event.isShiftKeyDown())) {
             event.preventDefault();