loleaflet/src/map/Clipboard.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 45c1818bdf2711aca00d91e9935690251688b758
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Thu Jun 25 16:42:19 2020 +0530
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jul 29 10:14:36 2020 +0200
tdf#132125: leaflet: Pasting text into comments pastes into the document
instead
Change-Id: Ibfc3a4519da13dfbe12082a4cd98b7a0060d3838
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99531
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index ce8ccb195..8043a1a98 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -3,7 +3,7 @@
* L.Clipboard is used to abstract our storage and management of
* local & remote clipboard data.
*/
-/* global _ vex brandProductName isAnyVexDialogActive */
+/* global _ vex brandProductName isAnyVexDialogActive $ */
// Get all interesting clipboard related events here, and handle
// download logic in one place ...
@@ -681,6 +681,9 @@ L.Clipboard = L.Class.extend({
if (isAnyVexDialogActive() && !this._map.hasFocus())
return;
+ if ($('.annotation-active').length > 0 && !this._map.hasFocus())
+ return;
+
// If the focus is in the search box, paste there.
if (this._map.isSearching())
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
