loleaflet/src/layer/tile/TileLayer.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 1ac490e0ebad6327c09718502327f3bb80854a5e Author: Ashod Nakashian <[email protected]> AuthorDate: Wed Feb 19 09:47:56 2020 -0500 Commit: Andras Timar <[email protected]> CommitDate: Wed Feb 26 17:13:46 2020 +0100 leaflet: remove redundant check Map.editorHasFocus() implies map.getWinId === 0. Change-Id: I522a377df095683453d2499a87485465437f9abb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89356 Tested-by: Ashod Nakashian <[email protected]> Reviewed-by: Ashod Nakashian <[email protected]> (cherry picked from commit af58e1975028d1f35171b94b1a1393814607d023) Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89510 Tested-by: Andras Timar <[email protected]> Reviewed-by: Andras Timar <[email protected]> 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(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
