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

Merge pull request #1817 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-06-22 21:46:00 +03:00 committed by GitHub
parent ac2b0546c9 6bd9d991ee
commit 12df71d28c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 46 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',

15
apps/common/main/lib/controller/Plugins.js
View file

@ -204,17 +204,7 @@ define([
arr = []; arr = [];
storePlugins.each(function(item){ storePlugins.each(function(item){
var plugin = new Asc.CPlugin(); var plugin = new Asc.CPlugin();
plugin.deserialize(item.attributes); plugin.deserialize(item.get('original'));
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);
item.set('pluginObj', plugin); item.set('pluginObj', plugin);
arr.push(plugin); arr.push(plugin);
}); });
@ -562,7 +552,8 @@ define([
visible: pluginVisible, visible: pluginVisible,
groupName: (item.group) ? item.group.name : '', groupName: (item.group) ? item.group.name : '',
groupRank: (item.group) ? item.group.rank : 0, groupRank: (item.group) ? item.group.rank : 0,
minVersion: item.minVersion minVersion: item.minVersion,
original: item
})); }));
} }
}); });

15
apps/documenteditor/forms/app/controller/Plugins.js
View file

@ -133,17 +133,7 @@ define([
arr = []; arr = [];
storePlugins.each(function(item){ storePlugins.each(function(item){
var plugin = new Asc.CPlugin(); var plugin = new Asc.CPlugin();
plugin.deserialize(item.attributes); plugin.deserialize(item.get('original'));
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);
item.set('pluginObj', plugin); item.set('pluginObj', plugin);
arr.push(plugin); arr.push(plugin);
}); });
@ -332,7 +322,8 @@ define([
visible: pluginVisible, visible: pluginVisible,
groupName: (item.group) ? item.group.name : '', groupName: (item.group) ? item.group.name : '',
groupRank: (item.group) ? item.group.rank : 0, groupRank: (item.group) ? item.group.rank : 0,
minVersion: item.minVersion minVersion: item.minVersion,
original: item
})); }));
} }
}); });

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) {