From d08137da83ebb9f9fc1411e6a073f821552f0ab9 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Mon, 19 Feb 2018 12:34:15 +0300
Subject: [PATCH] Fix Bug 36953.

---
 apps/documenteditor/main/app/controller/Main.js       | 6 +++---
 apps/documenteditor/main/app/controller/Navigation.js | 2 +-
 apps/presentationeditor/main/app/controller/Main.js   | 2 +-
 apps/spreadsheeteditor/main/app/controller/Main.js    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 4f73b0c70..a3b569d33 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -900,6 +900,8 @@ define([
                 leftmenuController.getView('LeftMenu').getMenu('file').loadDocument({doc:me.document});
                 leftmenuController.setMode(me.appOptions).createDelayedElements().setApi(me.api);
 
+                navigationController.setApi(me.api);
+
                 chatController.setApi(this.api).setMode(this.appOptions);
                 application.getController('Common.Controllers.ExternalDiagramEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization});
                 application.getController('Common.Controllers.ExternalMergeEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization});
@@ -909,8 +911,6 @@ define([
                 me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
                 me.api.asc_registerCallback('asc_onPluginsReset', _.bind(me.resetPluginsList, me));
 
-                navigationController.setApi(me.api);
-
                 documentHolderController.setApi(me.api);
                 documentHolderController.createDelayedElements();
                 statusbarController.createDelayedElements();
@@ -2091,10 +2091,10 @@ define([
                 } else if (!uiCustomize){
                     this.appOptions.canPlugins = false;
                 }
+                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
                 if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
                 }
-                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
             },
 
             resetPluginsList: function() {
diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js
index d1b098645..efc2a6ab3 100644
--- a/apps/documenteditor/main/app/controller/Navigation.js
+++ b/apps/documenteditor/main/app/controller/Navigation.js
@@ -62,7 +62,7 @@ define([
                         me.updateNavigation();
                     },
                     'hide': function() {
-                        me.api.asc_HideDocumentOutline();
+                        me.api && me.api.asc_HideDocumentOutline();
                     }
                 }
             });
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index c5023da50..6b5f7d1ea 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1842,10 +1842,10 @@ define([
                 } else if (!uiCustomize){
                     this.appOptions.canPlugins = false;
                 }
+                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
                 if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
                 }
-                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
             },
 
             resetPluginsList: function() {
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index e47ccc0c5..2288f30e1 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -2033,10 +2033,10 @@ define([
                 } else if (!uiCustomize){
                     this.appOptions.canPlugins = false;
                 }
+                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
                 if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
                 }
-                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
             },
 
             resetPluginsList: function() {