Fixes #5797 by disabling keyboard navigation when Table is disabled.

svn changeset:15736/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 7592839af13ff3488577f21ed68bfa751f85a3b0..dd8453c19b15a406f3ecd3d7af5feec503396113 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1,4 +1,4 @@
-/* 
+/*
 @ITMillApache2LicenseForJavaFiles@
  */
 
@@ -5327,6 +5327,10 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 };
                 scrollingVelocityTimer.scheduleRepeating(100);
             }
+        } else if (!enabled) {
+            // Cancel default keyboard events on a disabled Table (prevents
+            // scrolling)
+            event.preventDefault();
         }
     }
 
@@ -5356,6 +5360,10 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 };
                 scrollingVelocityTimer.scheduleRepeating(100);
             }
+        } else if (!enabled) {
+            // Cancel default keyboard events on a disabled Table (prevents
+            // scrolling)
+            event.preventDefault();
         }
     }
 
@@ -5388,12 +5396,14 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
      * .dom.client.BlurEvent)
      */
     public void onBlur(BlurEvent event) {
-        scrollBodyPanel.removeStyleName("focused");
-        hasFocus = false;
-        navKeyDown = false;
+        if (isFocusable()) {
+            scrollBodyPanel.removeStyleName("focused");
+            hasFocus = false;
+            navKeyDown = false;
 
-        // Unfocus any row
-        setRowFocus(null);
+            // Unfocus any row
+            setRowFocus(null);
+        }
     }
 
     /**
@@ -5428,7 +5438,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
      * @return True if the table can be focused, else false
      */
     public boolean isFocusable() {
-        if (scrollBody != null) {
+        if (scrollBody != null && enabled) {
             boolean hasVerticalScrollbars = scrollBody.getOffsetHeight() > scrollBodyPanel
                     .getOffsetHeight();
             boolean hasHorizontalScrollbars = scrollBody.getOffsetWidth() > scrollBodyPanel
@@ -5445,7 +5455,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
      * @see com.vaadin.terminal.gwt.client.Focusable#focus()
      */
     public void focus() {
-        scrollBodyPanel.focus();
+        if (isFocusable()) {
+            scrollBodyPanel.focus();
+        }
     }
 
     /**
@@ -5469,7 +5481,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
 
     public void onKeyUp(KeyUpEvent event) {
         int keyCode = event.getNativeKeyCode();
-        if (isNavigationKey(keyCode)) {
+        if (isFocusable() && isNavigationKey(keyCode)) {
             if (keyCode == getNavigationDownKey()
                     || keyCode == getNavigationUpKey()) {
                 /*