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

Fix Bug 36885.

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-08 18:22:32 +03:00
parent 682c912e4a
commit 22237f9634
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,6 @@ define([
if (this.isHandlerCalled) return;
this.isHandlerCalled = true;
externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
return true;
},
setChartData: function() {
@ -210,6 +209,7 @@ define([
}
this.diagramEditorView.hide();
}
this.isHandlerCalled = false;
} else
if (eventData.type == "processMouse") {
if (eventData.data.event == 'mouse:up') {

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

@ -111,15 +111,18 @@ define([
},
onDlgBtnClick: function(event) {
var state = event.currentTarget.attributes['result'].value;
if ( this.handler && this.handler.call(this, state) )
if ( this.handler ) {
this.handler.call(this, event.currentTarget.attributes['result'].value);
return;
}
this.hide();
},
onToolClose: function() {
if ( this.handler && this.handler.call(this, 'cancel') )
if ( this.handler ) {
this.handler.call(this, 'cancel');
return;
}
this.hide();
},

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

@ -1734,7 +1734,8 @@ define([
this.api.asc_closeCellEditor();
Common.UI.Menu.Manager.hideAll();
Common.Gateway.internalMessage('canClose', {mr:data.data.mr, answer: true});
}
} else
Common.Gateway.internalMessage('canClose', {answer: false});
break;
case 'window:drag':
this.isDiagramDrag = data.data;