diff options
| author | Artur <artur@vaadin.com> | 2017-04-25 15:21:30 +0300 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-04-25 15:21:30 +0300 |
| commit | 7bf4f7ade8a022119b4c00c8d92e3474a3b2652b (patch) | |
| tree | c29d5f57fd0936790fb464e5a8669ccd8a4d16f5 /compatibility-client | |
| parent | 54e36557c3062d1d5b5fabef561e34847ecde9be (diff) | |
| download | vaadin-framework-7bf4f7ade8a022119b4c00c8d92e3474a3b2652b.tar.gz vaadin-framework-7bf4f7ade8a022119b4c00c8d92e3474a3b2652b.zip | |
Detect Chrome on iOS as Chrome + Webkit (#9138)
Diffstat (limited to 'compatibility-client')
| -rw-r--r-- | compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java | 7 | ||||
| -rw-r--r-- | compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java index 3affa940fc..3328d926e6 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java @@ -5598,7 +5598,7 @@ public class VScrollTable extends FlowPanel final Element cell = DOM.getChild(getElement(), cellIx); Style wrapperStyle = cell.getFirstChildElement().getStyle(); int wrapperWidth = width; - if (BrowserInfo.get().isWebkit() + if (BrowserInfo.get().isSafariOrIOS() || BrowserInfo.get().isOpera10()) { /* * Some versions of Webkit and Opera ignore the width @@ -7381,11 +7381,10 @@ public class VScrollTable extends FlowPanel rowRequestHandler.cancel(); - if (BrowserInfo.get().isSafari() && event != null && scrollTop == 0) { + if (BrowserInfo.get().isSafariOrIOS() && event != null && scrollTop == 0) { // due to the webkitoverflowworkaround, top may sometimes report 0 // for webkit, although it really is not. Expecting to have the - // correct - // value available soon. + // correct value available soon. Scheduler.get().scheduleDeferred(new Command() { @Override diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java index b42f04f9b9..cefd4f079e 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java @@ -227,7 +227,7 @@ public class VTextArea extends VTextField implements DragImageModifier { if (info.isFirefox()) { return true; } - if (info.isSafari()) { + if (info.isSafariOrIOS()) { return true; } // Vaadin 8 no longer supports IE10 |