| commit | 9baea8eb9b32e7554a5c81af10eb5e354b6da1d8 | [log] |
|---|---|---|
| author | Aron Budea <aron.budea@collabora.com> | Wed Apr 29 04:08:55 2020 +0200 |
| committer | Aron Budea <aron.budea@collabora.com> | Fri May 01 14:10:15 2020 +0200 |
| tree | 80a9a882c94bc74bfc825efbf84eb3464e5f1c50 | |
| parent | cd041d0739cd928a21db4763b765a961205d7a19 [diff] |
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@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js index 700369d..b7c45e9 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 982cde6..3b2b3b7 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;