commit
12df71d28c
|
@ -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',
|
||||
warningText: 'The object is disabled because of editing by another user.',
|
||||
textClose: 'Close',
|
||||
|
|
|
@ -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',
|
||||
warningText: 'The object is disabled because of editing by another user.',
|
||||
textClose: 'Close',
|
||||
|
|
|
@ -204,17 +204,7 @@ define([
|
|||
arr = [];
|
||||
storePlugins.each(function(item){
|
||||
var plugin = new Asc.CPlugin();
|
||||
plugin.deserialize(item.attributes);
|
||||
|
||||
var variations = item.get('variations'),
|
||||
variationsArr = [];
|
||||
variations.forEach(function(itemVar){
|
||||
var variation = new Asc.CPluginVariation();
|
||||
variation.deserialize(itemVar.attributes);
|
||||
variationsArr.push(variation);
|
||||
});
|
||||
|
||||
plugin.set_Variations(variationsArr);
|
||||
plugin.deserialize(item.get('original'));
|
||||
item.set('pluginObj', plugin);
|
||||
arr.push(plugin);
|
||||
});
|
||||
|
@ -562,7 +552,8 @@ define([
|
|||
visible: pluginVisible,
|
||||
groupName: (item.group) ? item.group.name : '',
|
||||
groupRank: (item.group) ? item.group.rank : 0,
|
||||
minVersion: item.minVersion
|
||||
minVersion: item.minVersion,
|
||||
original: item
|
||||
}));
|
||||
}
|
||||
});
|
||||
|
|
|
@ -133,17 +133,7 @@ define([
|
|||
arr = [];
|
||||
storePlugins.each(function(item){
|
||||
var plugin = new Asc.CPlugin();
|
||||
plugin.deserialize(item.attributes);
|
||||
|
||||
var variations = item.get('variations'),
|
||||
variationsArr = [];
|
||||
variations.forEach(function(itemVar){
|
||||
var variation = new Asc.CPluginVariation();
|
||||
variation.deserialize(itemVar.attributes);
|
||||
variationsArr.push(variation);
|
||||
});
|
||||
|
||||
plugin.set_Variations(variationsArr);
|
||||
plugin.deserialize(item.get('original'));
|
||||
item.set('pluginObj', plugin);
|
||||
arr.push(plugin);
|
||||
});
|
||||
|
@ -332,7 +322,8 @@ define([
|
|||
visible: pluginVisible,
|
||||
groupName: (item.group) ? item.group.name : '',
|
||||
groupRank: (item.group) ? item.group.rank : 0,
|
||||
minVersion: item.minVersion
|
||||
minVersion: item.minVersion,
|
||||
original: item
|
||||
}));
|
||||
}
|
||||
});
|
||||
|
|
|
@ -2159,14 +2159,12 @@ define([
|
|||
chart.changeType(type);
|
||||
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
|
||||
} else {
|
||||
var controller = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor');
|
||||
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) {
|
||||
this.diagramEditor.setEditMode(false);
|
||||
// this.diagramEditor.show();
|
||||
controller.showExternalEditor();
|
||||
this.diagramEditor.show();
|
||||
|
||||
chart = me.api.asc_getChartObject(type);
|
||||
if (chart) {
|
||||
|
|
Loading…
Reference in a new issue