summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-03-07 13:26:22 +0200
committerTor Lillqvist <tml@collabora.com>2019-03-07 13:26:22 +0200
commit3645a9ce314f5bfafa78f2182084aa43e5e4f34e (patch)
tree74ce8a64c649545ab823443a03e9db59a392b2de
parent8cb54ad2b1a863398147ce9d64b9b0fc29f99de0 (diff)
tdf#123874: Don't do the SVG preview thing in the iOS app as it crashes WebKit
Sure, this is just a stopgap solution, it would be good to figure out a way to have the functionality working.
-rw-r--r--loleaflet/src/layer/tile/TileLayer.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index b4ab51f21..6932cc4f2 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -657,7 +657,12 @@ L.TileLayer = L.GridLayer.extend({
this._twipsToLatLng(topLeftTwips, this._map.getZoom()),
this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
this._graphicSelectionAngle = (strTwips.length === 5) ? parseInt(strTwips[4]) : 0;
- this._map._socket.sendMessage('rendershapeselection mimetype=image/svg+xml');
+ // Workaround for tdf#123874. For some reason the handling of the
+ // shapeselectioncontent messages that we get back causes the WebKit process
+ // to crash on iOS.
+ if (!window.ThisIsTheiOSApp) {
+ this._map._socket.sendMessage('rendershapeselection mimetype=image/svg+xml');
+ }
}
this._onUpdateGraphicSelection();