diff options
| author | Artur Signell <artur.signell@itmill.com> | 2011-01-04 12:03:10 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2011-01-04 12:03:10 +0000 |
| commit | 91bbeb0f450e0aaeb821776b906d7555138a1b2a (patch) | |
| tree | 79257a619e3410abf816853b4c3c26ad2664b33a /src/com | |
| parent | df49e356ffb6683419925f001558ba5ef3289db5 (diff) | |
| download | vaadin-framework-91bbeb0f450e0aaeb821776b906d7555138a1b2a.tar.gz vaadin-framework-91bbeb0f450e0aaeb821776b906d7555138a1b2a.zip | |
#6227 Extra scrollbars in Window and other places in Opera 11
Made fix compatible with future versions if Opera decides not to fix the issue for Opera 12
svn changeset:16786/svn branch:6.5
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/BrowserInfo.java | 8 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/Util.java | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java index 651b936c54..1ac060c29f 100644 --- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java +++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java @@ -249,6 +249,14 @@ public class BrowserInfo { return browserDetails.getBrowserMajorVersion(); } + public float getOperaVersion() { + if (!browserDetails.isOpera()) { + return -1; + } + + return browserDetails.getBrowserMajorVersion(); + } + public boolean isOpera() { return browserDetails.isOpera(); } diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index 486ce7c896..e21be19fac 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -585,7 +585,7 @@ public class Util { // Add max version if fix lands sometime to Webkit // Starting from Opera 11.00, also a problem in Opera if (BrowserInfo.get().getWebkitVersion() > 0 - || (BrowserInfo.get().isOpera11())) { + || BrowserInfo.get().getOperaVersion() >= 11) { final String originalOverflow = elem.getStyle().getProperty( "overflow"); if ("hidden".equals(originalOverflow)) { |