[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/js loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/js/toolbar.js  |    1 +
 loleaflet/src/map/Map.js |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4ad26f8082e81e5d24455a99de5797a42711fbbe
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Oct 2 11:50:17 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 8 07:46:20 2019 +0200

    Enable sidebar also in Impress.
    
    Omitting Draw...
    
    Change-Id: I1b97757629bf93795e0fe4f4d5681f9e31354df6
    Reviewed-on: https://gerrit.libreoffice.org/80024
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index afb7b2987..2dd653d92 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1685,6 +1685,7 @@ function onDocLayerInit() {
 
 		break;
 	case 'presentation':
+		toolbarUp.show('breaksidebar', 'sidebar');
 		var presentationToolbar = w2ui['presentation-toolbar'];
 		if (!map['wopi'].HideExportOption) {
 			presentationToolbar.show('presentation', 'presentationbreak');
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 69d7afef0..774dab848 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -249,7 +249,7 @@ L.Map = L.Evented.extend({
 
 			// Show sidebar.
 			if (this._docLayer && !this._docLoadedOnce &&
-				(this._docLayer._docType === 'spreadsheet' || this._docLayer._docType === 'text')) {
+				(this._docLayer._docType === 'presentation' || this._docLayer._docType === 'spreadsheet' || this._docLayer._docType === 'text')) {
 				// Let the first page finish loading then load the sidebar.
 				var map = this;
 				setTimeout(function () {