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

Fix Bug 32938.

Browse source
This commit is contained in:
Julia Radzhabova 2016-08-18 11:34:00 +03:00
parent 1a02a40dec
commit 3dd444be6c
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -182,7 +182,6 @@ define([
if (this.diagramEditorView) { if (this.diagramEditorView) {
if (eventData.type == 'documentReady') { if (eventData.type == 'documentReady') {
this.diagramEditorView._isExternalDocReady = true; this.diagramEditorView._isExternalDocReady = true;
this.diagramEditorView.setControlsDisabled(false);
if (this.diagramEditorView._chartData) { if (this.diagramEditorView._chartData) {
externalEditor && externalEditor.serviceCommand('setChartData', this.diagramEditorView._chartData); externalEditor && externalEditor.serviceCommand('setChartData', this.diagramEditorView._chartData);
this.diagramEditorView._chartData = null; this.diagramEditorView._chartData = null;
@ -191,6 +190,10 @@ define([
this.onDiagrammEditingDisabled(); this.onDiagrammEditingDisabled();
} }
} else } else
if (eventData.type == 'chartDataReady') {
if (this.needDisableEditing===undefined)
this.diagramEditorView.setControlsDisabled(false);
} else
if (eventData.type == "shortcut") { if (eventData.type == "shortcut") {
if (eventData.data.key == 'escape') if (eventData.data.key == 'escape')
this.diagramEditorView.hide(); this.diagramEditorView.hide();

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

@ -369,6 +369,13 @@ define([
} }
}, },
onSelectionChanged: function(info){
if (!this._isChartDataReady){
this._isChartDataReady = true;
Common.Gateway.internalMessage('chartDataReady');
}
},
onLongActionBegin: function(type, id) { onLongActionBegin: function(type, id) {
var action = {id: id, type: type}; var action = {id: id, type: type};
this.stackLongActions.push(action); this.stackLongActions.push(action);
@ -908,6 +915,8 @@ define([
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
/** coauthoring end **/ /** coauthoring end **/
if (me.appOptions.isEditDiagram)
me.api.asc_registerCallback('asc_onSelectionChanged', _.bind(me.onSelectionChanged, me));
if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights);