pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Bug 73018' (#290) from fix/bug-73018 into develop

Browse Source
This commit is contained in:
Julia Radzhabova
2025-02-06 12:33:37 +00:00
parent d3612282e7 e98011eed5
commit 95b3018b97
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/common/main/lib/controller/Draw.js
View File

@ -100,9 +100,10 @@ define([
setMode: function(mode) {
this.appConfig = mode;
this.view = this.createView('Common.Views.Draw', {
mode: mode
});
if (mode.isEdit)
this.view = this.createView('Common.Views.Draw', {
mode: mode
});
return this;
},
@ -198,7 +199,7 @@ define([
},
createToolbarPanel: function(groups) {
return this.view.getPanel(groups);
return this.view ? this.view.getPanel(groups) : null;
},
getView: function(name) {

2
apps/presentationeditor/main/app/controller/Toolbar.js
View File

@ -2819,6 +2819,8 @@ define([
me.toolbar.addTab(tab, $panel, 6);
}
}
} else {
me.getApplication().getController('Common.Controllers.Draw').setApi(me.api).setMode(config);
}
tab = {caption: me.toolbar.textTabView, action: 'view', extcls: config.isEdit ? 'canedit' : '', layoutname: 'toolbar-view', dataHintTitle: 'W'};