Fixed button highlighting when dragging #10917

Change-Id: I69ff2c5a987e26d5d065f7c5a7ac45f9d6fa289a

diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss
index 66c7c13ce80e6bc3feae6708aff3fe5ef49f0b04..694e49a35935c7c7b6cfe0a584c90861f39a00f2 100644 (file)
--- a/WebContent/VAADIN/themes/base/button/button.scss
+++ b/WebContent/VAADIN/themes/base/button/button.scss
@@ -18,9 +18,11 @@
        font: inherit;
        font-size: $font-size;
        line-height: normal;
+       -webkit-touch-callout: none;
+       -webkit-user-select: none;
        -khtml-user-select: none;
        -moz-user-select: none;
-       -ie-user-select: none;
+       -ms-user-select: none;
        user-select: none;
        -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;

diff --git a/client/src/com/vaadin/client/ui/VButton.java b/client/src/com/vaadin/client/ui/VButton.java
index c67a9f874763b54c5827beb304c1ed7d6f4c1aa1..e67fa6eceb4b7aee62a7fb99fbea8e4d34d0acfd 100644 (file)
--- a/client/src/com/vaadin/client/ui/VButton.java
+++ b/client/src/com/vaadin/client/ui/VButton.java
@@ -190,7 +190,7 @@ public class VButton extends FocusWidget implements ClickHandler {
                 DOM.setCapture(getElement());
                 isCapturing = true;
                 // Prevent dragging (on some browsers);
-                // DOM.eventPreventDefault(event);
+                event.preventDefault();
                 if (BrowserInfo.get().isIE() || BrowserInfo.get().isOpera()) {
                     addStyleName(CLASSNAME_PRESSED);
                 }