diff options
| author | John Ahlroos <john@vaadin.com> | 2013-06-06 15:21:11 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2013-06-06 15:21:11 +0300 |
| commit | 8f4add90a7b6c851d26114b946a5a36470004b2f (patch) | |
| tree | ef3e1f4fdd79258f2bf294575254baf4372da48f | |
| parent | 9b3807293d3393a66390bb5c97d464fe84aa48c1 (diff) | |
| download | vaadin-framework-8f4add90a7b6c851d26114b946a5a36470004b2f.tar.gz vaadin-framework-8f4add90a7b6c851d26114b946a5a36470004b2f.zip | |
Fixed button highlighting when dragging #10917
Change-Id: I69ff2c5a987e26d5d065f7c5a7ac45f9d6fa289a
| -rw-r--r-- | WebContent/VAADIN/themes/base/button/button.scss | 4 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/VButton.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss index 66c7c13ce8..694e49a359 100644 --- 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 c67a9f8747..e67fa6eceb 100644 --- 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); } |