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

[Aron Budea (via logerrit)]

 loleaflet/src/map/Clipboard.js |    3 +++
 loleaflet/src/map/Map.js       |    4 ++++
 2 files changed, 7 insertions(+)

New commits:
commit 9baea8eb9b32e7554a5c81af10eb5e354b6da1d8
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Wed Apr 29 04:08:55 2020 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Fri May 1 14:10:15 2020 +0200

    tdf#132125: Pasting into comment pastes into document instead
    
    Ignore paste event when editing comments.
    Fix is similar to 5bc28a9d3047e47c5b7210522e9d5729524c1f0e
    
    Change-Id: I12644ca32a99557703eef63dc1b5670e68a22813
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93114
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 700369d29..b7c45e939 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -656,6 +656,9 @@ L.Clipboard = L.Class.extend({
 		if (isAnyVexDialogActive() && !this._map.hasFocus())
 			return;
 
+		if (this._map.isEditingAnnotation())
+			return;
+
 		// If the focus is in the search box, paste there.
 		if (this._map.isSearching())
 			return;
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 982cde654..3b2b3b719 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -966,6 +966,10 @@ L.Map = L.Evented.extend({
 		return this._isSearching;
 	},
 
+	isEditingAnnotation: function() {
+		return this._docLayer._annotations.isEdit();
+	},
+
 	_fireInitComplete: function (condition) {
 		if (this.initComplete) {
 			return;