loleaflet/src/layer/tile/TileLayer.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 3b7c5624a74ac8962f7332c60675ed10f05a0edf
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Thu Jun 4 10:26:28 2020 +0530
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 10 12:34:55 2020 +0200
leaflet: Calc: Sheet rename dialog loses focus when waiting a bit
Change-Id: Ic1504868565323b135d88c966d2fbde7207c1cb5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95477
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index fc54013c1..7df2df248 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -6,7 +6,7 @@
// Implement String::startsWith which is non-portable (Firefox only, it seems)
// See
http://stackoverflow.com/questions/646628/how-to-check-if-a-string-startswith-another-string#4579228
-/* global vex $ L _ */
+/* global vex $ L _ isAnyVexDialogActive */
/*eslint no-extend-native:0*/
if (typeof String.prototype.startsWith !== 'function') {
String.prototype.startsWith = function (str) {
@@ -316,7 +316,8 @@ L.TileLayer = L.GridLayer.extend({
map.on('statusindicator',
function (e) {
if (e.statusType === 'alltilesloaded' &&
this._docType === 'spreadsheet') {
- this._onCellCursorShift(true);
+ if (!isAnyVexDialogActive())
+ this._onCellCursorShift(true);
}
if (e.statusType === 'alltilesloaded' &&
this._map.shouldWelcome()) {
this._map.showWelcomeDialog();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
