diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2020-02-19 09:47:56 -0500 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-02-26 17:13:46 +0100 |
| commit | 1ac490e0ebad6327c09718502327f3bb80854a5e (patch) | |
| tree | 65efa321888cff9361346be4b8e66f94b2c5a204 | |
| parent | 60431983475c211cc4f875fa7bcbb30c3126e8c9 (diff) | |
leaflet: remove redundant checkCP-iOS-4.2.0
Map.editorHasFocus() implies map.getWinId === 0.
Change-Id: I522a377df095683453d2499a87485465437f9abb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89356
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit af58e1975028d1f35171b94b1a1393814607d023)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89510
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | loleaflet/src/layer/tile/TileLayer.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index b91f44350..c38e132d0 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -1135,7 +1135,7 @@ L.TileLayer = L.GridLayer.extend({ .openOn(this._map); } - if (!this._map.editorHasFocus() && (modifierViewId === this._viewId) && (this._map.getWinId === 0) && (this._map._permission === 'edit')) { + if (!this._map.editorHasFocus() && (modifierViewId === this._viewId) && (this._map._permission === 'edit')) { // Regain cursor if we had been out of focus and now have input. // (only if it is our own cursor and the input is actually not // going into a dialog) @@ -2108,8 +2108,7 @@ L.TileLayer = L.GridLayer.extend({ var updated = true; if (!this._cursorMarker) { this._cursorMarker = L.cursor(cursorPos, pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom())), {blink: true}); - } - else { + } else { var oldLatLng = this._cursorMarker.getLatLng(); this._cursorMarker.setLatLng(cursorPos, pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom()))); var newLatLng = this._cursorMarker.getLatLng(); |