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

Pranam Lashkari (via logerrit) logerrit at kemper.freedesktop.org
Tue Dec 10 17:04:23 UTC 2019


 loleaflet/src/map/Map.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c099715fecdc0d43b4175a28e6e6cd988d0a801c
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Tue Dec 10 05:06:17 2019 +0530
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Dec 10 18:04:05 2019 +0100

    Document focus stopped when renaming sheet
    
    while rename sheet popup is focused and same document is opened where else
    popup used to lose the focus and document is focused.
    So the name used to get typed in document instead of popup
    
    Change-Id: I18aa3ba9d5485fd9f5928635aa611d7db5771495
    Reviewed-on: https://gerrit.libreoffice.org/84794
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1a26c4b2e..a199716c9 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1186,7 +1186,7 @@ L.Map = L.Evented.extend({
 		}
 
 		this._startInactiveTimer();
-		if (!L.Browser.mobile) {
+		if (!L.Browser.mobile && !isAnyVexDialogActive()) {
 			this.focus();
 		}
 		return false;


More information about the Libreoffice-commits mailing list