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

[Aron Budea (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 40f9341d4416838ada58eff9f2579d8f29a7ef5b
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Sun Feb 16 23:52:53 2020 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Mon Feb 17 05:06:14 2020 +0100

    loleaflet: Remove generic sidebar toolbar button in Impress
    
    It was introduced as a partial fix to sidebar deck toolbar buttons
    not showing pressed state in bcd7af96579181969f1d6c1c977731e030fe3c6e
    but causes issues.
    
    Hiding/unhiding by mixing the generic and specific sidebar buttons
    can permanently hide the sidebar.
    
    Change-Id: I436d296698dde2aed7f0a3aab268e561767013b7
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88830
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index c60962057..3fa2f6c33 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1691,7 +1691,7 @@ function onDocLayerInit() {
 		break;
 	case 'presentation':
 		if (toolbarUp) {
-			toolbarUp.show('breaksidebar', 'sidebar', 'modifypage');
+			toolbarUp.show('breaksidebar', 'modifypage');
 		}
 
 		var presentationToolbar = w2ui['presentation-toolbar'];
@@ -1718,7 +1718,7 @@ function onDocLayerInit() {
 		if (toolbarUp)
 			toolbarUp.show('leftpara', 'centerpara', 'rightpara', 'justifypara', 'breakpara', 'linespacing',
 			'breakspacing', 'defaultbullet', 'defaultnumbering', 'breakbullet', 'inserttextbox', 'inserttable', 'backcolor',
-			'breaksidebar', 'sidebar', 'modifypage', 'slidechangewindow', 'customanimation', 'masterslidespanel');
+			'breaksidebar', 'modifypage', 'slidechangewindow', 'customanimation', 'masterslidespanel');
 		if (statusbar)
 			statusbar.show('prev', 'next');