Ensure only click events scroll tabs (#9077)

1 files changed, 18 insertions, 15 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java
index 24ea3b2d38..844708a892 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java
@@ -685,24 +685,27 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
 
     @Override
     public void onBrowserEvent(Event event) {
+        if (event.getTypeInt() == Event.ONCLICK) {
+            // Tab scrolling
+            if (isScrolledTabs() && DOM.eventGetTarget(event) == scrollerPrev) {
+                int newFirstIndex = tb.scrollLeft(scrollerIndex);
+                if (newFirstIndex != -1) {
+                    scrollerIndex = newFirstIndex;
+                    updateTabScroller();
+                }
+                return;
+            } else if (isClippedTabs()
+                    && DOM.eventGetTarget(event) == scrollerNext) {
+                int newFirstIndex = tb.scrollRight(scrollerIndex);
 
-        // Tab scrolling
-        if (isScrolledTabs() && DOM.eventGetTarget(event) == scrollerPrev) {
-            int newFirstIndex = tb.scrollLeft(scrollerIndex);
-            if (newFirstIndex != -1) {
-                scrollerIndex = newFirstIndex;
-                updateTabScroller();
-            }
-        } else if (isClippedTabs() && DOM.eventGetTarget(event) == scrollerNext) {
-            int newFirstIndex = tb.scrollRight(scrollerIndex);
-
-            if (newFirstIndex != -1) {
-                scrollerIndex = newFirstIndex;
-                updateTabScroller();
+                if (newFirstIndex != -1) {
+                    scrollerIndex = newFirstIndex;
+                    updateTabScroller();
+                }
+                return;
             }
-        } else {
-            super.onBrowserEvent(event);
         }
+        super.onBrowserEvent(event);
     }
 
     /**