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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 151a2ac08d2cc82020328b83e039cb8608222738
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Apr 2 08:09:28 2020 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Apr 2 18:16:35 2020 +0200

    leaflet: maintain focus when searching
    
    When the focus is in the search box, we shouldn't
    lose it, or hide the keyboard.
    
    Change-Id: I05c4c3e384d840b2919106af1063978b6fe7fbfe
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91580
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 04b0a7b651bc2d7f98b843b08c402411641513a3)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91515
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index bfac945ab..f0b540de9 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2207,7 +2207,8 @@ L.TileLayer = L.GridLayer.extend({
 			}
 		} else {
 			this._map._textInput.hideCursor();
-			if (this._map.editorHasFocus()) // Allow input if a dialog has the focus.
+			// Maintain input if a dialog or search-box has the focus.
+			if (this._map.editorHasFocus() && !this._map.isSearching())
 				this._map.focus(false);
 		}
 	},