diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2010-10-27 10:32:34 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2010-10-27 10:32:34 +0000 |
| commit | c2e2f0c4bf23ffaf71ffe5f64d8d2a7deecaa0cd (patch) | |
| tree | 2a4df6b0c1e5ee4e5a7e00503f283221233d8949 /src/com/vaadin | |
| parent | 52a5925a8b0ecc64b512efae07c3ed81e1b55c81 (diff) | |
| download | vaadin-framework-c2e2f0c4bf23ffaf71ffe5f64d8d2a7deecaa0cd.tar.gz vaadin-framework-c2e2f0c4bf23ffaf71ffe5f64d8d2a7deecaa0cd.zip | |
Fixed #5797 so scrolling timer is removed if the Table is disabled while scrolling.
svn changeset:15739/svn branch:6.4
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index ba7664f35d..b1ebb763bf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -5481,7 +5481,15 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, public void onKeyUp(KeyUpEvent event) { int keyCode = event.getNativeKeyCode(); - if (isFocusable() && isNavigationKey(keyCode)) { + + if (!isFocusable()) { + if (scrollingVelocityTimer != null) { + // Remove velocityTimer if it exists and the Table is disabled + scrollingVelocityTimer.cancel(); + scrollingVelocityTimer = null; + scrollingVelocity = 10; + } + } else if (isNavigationKey(keyCode)) { if (keyCode == getNavigationDownKey() || keyCode == getNavigationUpKey()) { /* |