From 9f2c36a22f006ec64980572a91fe5069fa93ad47 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Thu, 10 Mar 2011 14:45:21 +0000 Subject: [PATCH] Avoid webkit scrollbar workaround if scrollbar size is 0 as in mobile webkit (obsolete as there will never be scrollbars). Removed obsolete debug message. svn changeset:17711/svn branch:6.6 --- src/com/vaadin/terminal/gwt/client/Util.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index 90835d81b6..2cd999fe19 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -564,7 +564,6 @@ public class Util { - scroller.getPropertyInt("clientWidth"); RootPanel.getBodyElement().removeChild(scroller); - } return detectedScrollbarSize; } @@ -580,8 +579,8 @@ public class Util { public static void runWebkitOverflowAutoFix(final Element elem) { // 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().getOperaVersion() >= 11) { + if ((BrowserInfo.get().getWebkitVersion() > 0 || BrowserInfo.get() + .getOperaVersion() >= 11) && getNativeScrollbarSize() > 0) { final String originalOverflow = elem.getStyle().getProperty( "overflow"); if ("hidden".equals(originalOverflow)) { @@ -1182,7 +1181,6 @@ public class Util { target.dispatchEvent(createMouseUpEvent); target.dispatchEvent(createMouseClickEvent); } catch (Exception e) { - VConsole.log("Dough..."); } } -- 2.39.5