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

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 25 08:47:37 UTC 2020


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

New commits:
commit 78e3fd8716b85a7effe188a377f05325a541501b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Aug 24 16:12:53 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Aug 25 10:47:19 2020 +0200

    notebookbar: avoid doubled tab switch
    
    Don't send notification about switching to the custom tabs
    (negative ids).
    
    Change-Id: I6a67d2889087ff757a7a84a815bb484f1bc0fca5
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101281
    Tested-by: Jenkins
    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.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index d0bb67244..ca72b9be7 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -719,7 +719,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
 					var fn = function(id) {
 						return function() {
 							builder._createTabClick(builder, id, tabs, contentDivs, tabIds)();
-							builder.callback('tabcontrol', 'selecttab', tabsContainer, data.tabs[id].id - 1, builder);
+							if (data.tabs[id].id - 1 >= 0)
+								builder.callback('tabcontrol', 'selecttab', tabsContainer, data.tabs[id].id - 1, builder);
 						};
 					};
 					$(tabs[t]).click(fn(t));


More information about the Libreoffice-commits mailing list