summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-07-11 21:12:39 +0300
committerpatrik <patrik@vaadin.com>2015-08-04 15:54:05 +0300
commit637d0d01880ad73d3661fc07eead999d07c8cf44 (patch)
treea25b7b73e6855121fa3f2b668101def2a2e2598f /client
parenta6bf06b9ce8d13b4c9352e4d861a978ac126d219 (diff)
downloadvaadin-framework-637d0d01880ad73d3661fc07eead999d07c8cf44.tar.gz
vaadin-framework-637d0d01880ad73d3661fc07eead999d07c8cf44.zip
Restrict old IE fix to IE <= 10 (#17002)
Change-Id: I84b7d654f1a62aad623055033ee0666ad950b805
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VFilterSelect.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java
index 22eef57901..d756c88f79 100644
--- a/client/src/com/vaadin/client/ui/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/VFilterSelect.java
@@ -612,7 +612,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
menuFirstChild.getStyle().setWidth(100, Unit.PCT);
}
- if (BrowserInfo.get().isIE()) {
+ if (BrowserInfo.get().isIE()
+ && BrowserInfo.get().getBrowserMajorVersion() < 11) {
// Must take margin,border,padding manually into account for
// menu element as we measure the element child and set width to
// the element parent