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

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Tue May 19 11:35:02 UTC 2020


 loleaflet/src/control/Control.MobileWizard.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3e3a5e01b1005bc0ea653147f75898bdfe1b36bf
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 11 13:17:07 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 19 13:34:44 2020 +0200

    jsdialog: fix inifinite regenetate JSON loop
    
    Change-Id: I52667e115a0cf70f09f570dc6ea1ec0bcac49460
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93463
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 958eeb985..b9623eab5 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -273,7 +273,8 @@ L.Control.MobileWizard = L.Control.extend({
 	},
 
 	_goToPath: function(path) {
-		if (this._tabs && path && path.length)
+		// when dialog has tabs, tab selection triggers the callback, causes infinite regenetate loop
+		if (this._tabs && path && path.length && !this.map.dialog.hasDialogInMobilePanelOpened())
 			this._selectTab(path[0]);
 
 		var _path = [];


More information about the Libreoffice-commits mailing list