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

Refactoring diagramm editor

Browse source
This commit is contained in:
Julia Radzhabova 2022-06-22 20:35:09 +03:00
parent ac2b0546c9
commit a78dceb1a3
3 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/main/lib/controller/ExternalDiagramEditor.js
View file

@ -243,15 +243,6 @@ define([
} }
}, },
showExternalEditor: function () {
if ( externalEditor ) {
var value = Common.localStorage.getItem("ui-theme-id", "theme-light");
externalEditor.serviceCommand('theme:change', value);
}
this.diagramEditorView.show();
},
warningTitle: 'Warning', warningTitle: 'Warning',
warningText: 'The object is disabled because of editing by another user.', warningText: 'The object is disabled because of editing by another user.',
textClose: 'Close', textClose: 'Close',

9
apps/common/main/lib/controller/ExternalOleEditor.js
View file

@ -241,15 +241,6 @@ define([
} }
}, },
showExternalEditor: function () {
if ( externalEditor ) {
var value = Common.localStorage.getItem("ui-theme-id", "theme-light");
externalEditor.serviceCommand('theme:change', value);
}
this.oleEditorView.show();
},
warningTitle: 'Warning', warningTitle: 'Warning',
warningText: 'The object is disabled because of editing by another user.', warningText: 'The object is disabled because of editing by another user.',
textClose: 'Close', textClose: 'Close',

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

@ -2159,14 +2159,12 @@ define([
chart.changeType(type); chart.changeType(type);
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
} else { } else {
var controller = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor');
if (!this.diagramEditor) if (!this.diagramEditor)
this.diagramEditor = controller.getView('Common.Views.ExternalDiagramEditor'); this.diagramEditor = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
if (this.diagramEditor && me.api) { if (this.diagramEditor && me.api) {
this.diagramEditor.setEditMode(false); this.diagramEditor.setEditMode(false);
// this.diagramEditor.show(); this.diagramEditor.show();
controller.showExternalEditor();
chart = me.api.asc_getChartObject(type); chart = me.api.asc_getChartObject(type);
if (chart) { if (chart) {