diff options
| author | Artur Signell <artur@vaadin.com> | 2012-03-23 08:29:38 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-03-23 08:29:38 +0200 |
| commit | 5679f52b4cd580cc39452580682c9c30eff5e649 (patch) | |
| tree | 94b007de320cf1d0769522be5aab1f47bf7df362 | |
| parent | d1def980ccae465bdfdd0ec6b9b518209cea0d93 (diff) | |
| parent | 0b46687ab0cedb3523321854b52d988dae18452a (diff) | |
| download | vaadin-framework-5679f52b4cd580cc39452580682c9c30eff5e649.tar.gz vaadin-framework-5679f52b4cd580cc39452580682c9c30eff5e649.zip | |
Merge commit '0b46687ab0cedb3523321854b52d988dae18452a' from origin/6.8
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/panel/panel.css | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VButton.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.css b/WebContent/VAADIN/themes/reindeer/panel/panel.css index e7611b6ba2..23575799ab 100644 --- a/WebContent/VAADIN/themes/reindeer/panel/panel.css +++ b/WebContent/VAADIN/themes/reindeer/panel/panel.css @@ -44,7 +44,7 @@ background: #e2e2e2; overflow: hidden; } -.v-wekit .v-panel-deco, +.v-webkit .v-panel-deco, .v-gecko .v-panel-deco, .v-ie9 .v-panel-deco { border-top-color: rgba(0,0,0,.1); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java index 9564d1b300..eb7eec03ad 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java @@ -191,6 +191,12 @@ public class VButton extends FocusWidget implements ClickHandler, FocusHandler, if (BrowserInfo.get().isIE() || BrowserInfo.get().isOpera()) { removeStyleName(CLASSNAME_PRESSED); } + // Explicitly prevent IE 6 to 8 from propagating mouseup events + // upward (fixes #6753) + if (BrowserInfo.get().isIE() + && BrowserInfo.get().getIEVersion() < 9) { + event.stopPropagation(); + } } break; case Event.ONMOUSEMOVE: |