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

Fix Bug 36870

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-28 18:04:11 +03:00
parent 590a2e6d0c
commit 68ae26ac5d
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,7 +141,12 @@ define([
handler: function(result, value) { handler: function(result, value) {
if (this.isHandlerCalled) return; if (this.isHandlerCalled) return;
this.isHandlerCalled = true; this.isHandlerCalled = true;
externalEditor && externalEditor.serviceCommand('queryClose',{mr:result}); if (this.diagramEditorView._isExternalDocReady)
externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
else {
this.diagramEditorView.hide();
this.isHandlerCalled = false;
}
}, },
setChartData: function() { setChartData: function() {

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

@ -82,11 +82,9 @@ define([
disabled: true disabled: true
}); });
this.btnCancel = new Common.UI.Button({ this.btnCancel = new Common.UI.Button({
el: $('#id-btn-diagram-editor-cancel'), el: $('#id-btn-diagram-editor-cancel')
disabled: true
}); });
this.$window.find('.tool.close').addClass('disabled');
this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this)); this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
}, },