summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/vaadin/terminal/gwt/client/BrowserInfo.java8
-rw-r--r--src/com/vaadin/terminal/gwt/client/Util.java2
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)) {