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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.NotebookbarBuilder.js |    2 +-
 loleaflet/src/control/Control.UIManager.js          |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f6e7ec9ee137f5a3b5dc21d5e452ea3e78d11832
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Aug 25 12:26:51 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Aug 25 13:08:56 2020 +0200

    notebookbar: always extend on tab click
    
    Change-Id: Ic7b8166c636e61f79042092cabcce1e8c62286ac
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101316
    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.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 544a7a017..d0b507564 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -316,7 +316,7 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 
 			if (tabIsSelected && !notebookbarIsCollapsed) {
 				builder.wizard.collapse();
-			} else if (tabIsSelected && notebookbarIsCollapsed) {
+			} else if (notebookbarIsCollapsed) {
 				builder.wizard.extend();
 			}
 
diff --git a/loleaflet/src/control/Control.UIManager.js b/loleaflet/src/control/Control.UIManager.js
index 8b68b0ab8..3da1d6921 100644
--- a/loleaflet/src/control/Control.UIManager.js
+++ b/loleaflet/src/control/Control.UIManager.js
@@ -220,6 +220,9 @@ L.Control.UIManager = L.Control.extend({
 	},
 
 	collapseNotebookbar: function() {
+		if (this.isNotebookbarCollapsed())
+			return;
+
 		this.moveObjectVertically($('#spreadsheet-row-column-frame'), -85);
 		this.moveObjectVertically($('#document-container'), -85);
 		this.moveObjectVertically($('#presentation-controls-wrapper'), -85);
@@ -231,6 +234,9 @@ L.Control.UIManager = L.Control.extend({
 	},
 
 	extendNotebookbar: function() {
+		if (!this.isNotebookbarCollapsed())
+			return;
+
 		this.moveObjectVertically($('#spreadsheet-row-column-frame'), 85);
 		this.moveObjectVertically($('#document-container'), 85);
 		this.moveObjectVertically($('#presentation-controls-wrapper'), 85);