Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 36953.

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-19 12:34:15 +03:00
parent e42f6ea3c7
commit d08137da83
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Main.js
View file

@ -900,6 +900,8 @@ define([
leftmenuController.getView('LeftMenu').getMenu('file').loadDocument({doc:me.document}); leftmenuController.getView('LeftMenu').getMenu('file').loadDocument({doc:me.document});
leftmenuController.setMode(me.appOptions).createDelayedElements().setApi(me.api); leftmenuController.setMode(me.appOptions).createDelayedElements().setApi(me.api);
navigationController.setApi(me.api);
chatController.setApi(this.api).setMode(this.appOptions); 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.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}); 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_onPluginsInit', _.bind(me.updatePluginsList, me));
me.api.asc_registerCallback('asc_onPluginsReset', _.bind(me.resetPluginsList, me)); me.api.asc_registerCallback('asc_onPluginsReset', _.bind(me.resetPluginsList, me));
navigationController.setApi(me.api);
documentHolderController.setApi(me.api); documentHolderController.setApi(me.api);
documentHolderController.createDelayedElements(); documentHolderController.createDelayedElements();
statusbarController.createDelayedElements(); statusbarController.createDelayedElements();
@ -2091,10 +2091,10 @@ define([
} else if (!uiCustomize){ } else if (!uiCustomize){
this.appOptions.canPlugins = false; this.appOptions.canPlugins = false;
} }
if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
if (this.appOptions.canPlugins) { if (this.appOptions.canPlugins) {
this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart); this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
} }
if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
}, },
resetPluginsList: function() { resetPluginsList: function() {

2
apps/documenteditor/main/app/controller/Navigation.js
View file

@ -62,7 +62,7 @@ define([
me.updateNavigation(); me.updateNavigation();
}, },
'hide': function() { 'hide': function() {
me.api.asc_HideDocumentOutline(); me.api && me.api.asc_HideDocumentOutline();
} }
} }
}); });

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1842,10 +1842,10 @@ define([
} else if (!uiCustomize){ } else if (!uiCustomize){
this.appOptions.canPlugins = false; this.appOptions.canPlugins = false;
} }
if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
if (this.appOptions.canPlugins) { if (this.appOptions.canPlugins) {
this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart); this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
} }
if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
}, },
resetPluginsList: function() { resetPluginsList: function() {

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -2033,10 +2033,10 @@ define([
} else if (!uiCustomize){ } else if (!uiCustomize){
this.appOptions.canPlugins = false; this.appOptions.canPlugins = false;
} }
if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
if (this.appOptions.canPlugins) { if (this.appOptions.canPlugins) {
this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart); this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
} }
if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
}, },
resetPluginsList: function() { resetPluginsList: function() {