[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-1' - loleaflet/src

[Ashod Nakashian (via logerrit)]

 loleaflet/src/map/Clipboard.js |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 69e8ff86bab99440fe43d957be41d168f5616072
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Apr 2 10:05:15 2020 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Apr 2 18:15:59 2020 +0200

    leaflet: support pasting in the search box
    
    When pasting into the document a special handler
    is used to manage the transfer of data. For the search
    box we need to let the default handler do the right thing
    and so we check that we aren't searching before we override
    the paste handler logic, which explicitly pastes into the doc.
    
    Change-Id: I570168d1aaf70c2a78403644e006ba9625ec68db
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91581
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit f96126fb69ff8feb3b5de6c55310f9926b89bf44)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91514
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 68e5e4b1c..160a0273d 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -657,6 +657,10 @@ L.Clipboard = L.Class.extend({
 		if (isAnyVexDialogActive() && !this._map.hasFocus())
 			return;
 
+		// If the focus is in the search box, paste there.
+		if (this._map.isSearching())
+			return;
+
 		if (this._map._activeDialog)
 			ev.usePasteKeyEvent = true;