[Libreoffice-commits] online.git: loleaflet/src
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jan 7 09:22:12 UTC 2020
loleaflet/src/control/Control.LokDialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e416caa1e061bb79eb6238f348af1f8917d3e102
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Jan 6 10:11:31 2020 -0500
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 7 10:21:54 2020 +0100
wsd: prevent sidebar from stealing focus on painting
Change-Id: I3738b95ea230faa46c122e12b7932599f0113a8f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86322
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 836151b34..2abdc0246 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1022,9 +1022,9 @@ L.Control.LokDialog = L.Control.extend({
// if dialog is hidden, show it
if (container)
$(container).parent().show();
+
if (parentId in that._dialogs) {
// We might have closed the dialog by the time we render.
- that.focus(parentId);
that._dialogs[parentId].isPainting = false;
}
};
More information about the Libreoffice-commits
mailing list