[Libreoffice-commits] online.git: loleaflet/src

Ashod Nakashian (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 29 17:40:45 UTC 2020


 loleaflet/src/layer/tile/WriterTileLayer.js |    2 +-
 loleaflet/src/map/handler/Map.Keyboard.js   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3268a03f4f6633391382d60583b2a9597bfff784
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Jan 29 11:54:54 2020 -0500
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Wed Jan 29 18:40:25 2020 +0100

    leaflet: fix inserting comments
    
    regression from 18b3bfeabcde69e3e1736b6c6dc7c8b4fed27dec
    
    Change-Id: I2bf9c080ed2f1a9b4c0401ab23e75caf4affad62
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87700
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js b/loleaflet/src/layer/tile/WriterTileLayer.js
index 8b4ec90ed..526e7a0af 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -7,7 +7,7 @@
 L.WriterTileLayer = L.TileLayer.extend({
 
 	newAnnotation: function (comment) {
-		if (!comment.anchorPos && this._isCursorVisible) {
+		if (!comment.anchorPos && this._map._isCursorVisible) {
 			comment.anchorPos = L.bounds(this._latLngToTwips(this._visibleCursor.getSouthWest()),
 				this._latLngToTwips(this._visibleCursor.getNorthEast()));
 			comment.anchorPix = this._twipsToPixels(comment.anchorPos.min);
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js
index 8b5a5fad8..6ba2dc165 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -317,7 +317,7 @@ L.Map.Keyboard = L.Handler.extend({
 
 		if (this.modifier) {
 			unoKeyCode |= this.modifier;
-			if (ev.type !== 'keyup' && (this.modifier !== shift || (keyCode === 32 && !docLayer._isCursorVisible))) {
+			if (ev.type !== 'keyup' && (this.modifier !== shift || (keyCode === 32 && !this._map._isCursorVisible))) {
 				keyEventFn('input', charCode, unoKeyCode);
 				ev.preventDefault();
 				return;


More information about the Libreoffice-commits mailing list