summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2022-09-07 15:47:04 +0200
committerGökay ŞATIR <gokaysatir@gmail.com>2022-09-19 17:37:01 +0300
commitac61a35e3464a472c104e8bfcd06e15d309d0c9a (patch)
tree4002cd01e696c140b85596256c48d5cd5f19303b
parentSave different sidebar states for Impress. (diff)
downloadonline-ac61a35e3464a472c104e8bfcd06e15d309d0c9a.tar.gz
online-ac61a35e3464a472c104e8bfcd06e15d309d0c9a.zip
sidebar: save state also in notebookbar
we need this state variable set in more generic place not only in menubar Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: I72e100ef91bbe32987ceb1e2bff5903f15c6134b
-rw-r--r--browser/src/control/Control.Menubar.js6
-rw-r--r--browser/src/control/Toolbar.js6
2 files changed, 6 insertions, 6 deletions
diff --git a/browser/src/control/Control.Menubar.js b/browser/src/control/Control.Menubar.js
index c94c8a3287..dd8bdaa136 100644
--- a/browser/src/control/Control.Menubar.js
+++ b/browser/src/control/Control.Menubar.js
@@ -1822,12 +1822,6 @@ L.Control.Menubar = L.Control.extend({
return;
}
- if (unoCommand.startsWith('.uno:Sidebar') || unoCommand.startsWith('.uno:SlideMasterPage') ||
- unoCommand.startsWith('.uno:ModifyPage') || unoCommand.startsWith('.uno:SlideChangeWindow') ||
- unoCommand.startsWith('.uno:CustomAnimation') || unoCommand.startsWith('.uno:MasterSlidesPanel')) {
- window.initSidebarState = true;
- }
-
this._map.sendUnoCommand(unoCommand);
},
diff --git a/browser/src/control/Toolbar.js b/browser/src/control/Toolbar.js
index e81311e38f..0bdda69844 100644
--- a/browser/src/control/Toolbar.js
+++ b/browser/src/control/Toolbar.js
@@ -322,6 +322,12 @@ L.Map.include({
},
sendUnoCommand: function (command, json) {
+ if (command.startsWith('.uno:Sidebar') || command.startsWith('.uno:SlideMasterPage') ||
+ command.startsWith('.uno:ModifyPage') || command.startsWith('.uno:SlideChangeWindow') ||
+ command.startsWith('.uno:CustomAnimation') || command.startsWith('.uno:MasterSlidesPanel')) {
+ window.initSidebarState = true;
+ }
+
// To exercise the Trace Event functionality, uncomment this
// app.socket.emitInstantTraceEvent('cool-unocommand:' + command);