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

Fix Bug 33560, Fix Bug 33549

Browse source
This commit is contained in:
Julia Radzhabova 2016-12-01 12:59:02 +03:00
parent 12d6ef13ee
commit e818ddf253
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@ define([
'Common.Views.ExternalDiagramEditor': { 'Common.Views.ExternalDiagramEditor': {
'setchartdata': _.bind(this.setChartData, this), 'setchartdata': _.bind(this.setChartData, this),
'drag': _.bind(function(o, state){ 'drag': _.bind(function(o, state){
externalEditor.serviceCommand('window:drag', state == 'start'); externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
},this), },this),
'show': _.bind(function(cmp){ 'show': _.bind(function(cmp){
var h = this.diagramEditorView.getHeight(), var h = this.diagramEditorView.getHeight(),
@ -138,7 +138,7 @@ define([
}, },
handler: function(result, value) { handler: function(result, value) {
externalEditor.serviceCommand('queryClose',{mr:result}); externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
return true; return true;
}, },

4
apps/common/main/lib/controller/ExternalMergeEditor.js
View file

@ -94,7 +94,7 @@ define([
'Common.Views.ExternalMergeEditor': { 'Common.Views.ExternalMergeEditor': {
'setmergedata': _.bind(this.setMergeData, this), 'setmergedata': _.bind(this.setMergeData, this),
'drag': _.bind(function(o, state){ 'drag': _.bind(function(o, state){
externalEditor.serviceCommand('window:drag', state == 'start'); externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
},this), },this),
'show': _.bind(function(cmp){ 'show': _.bind(function(cmp){
var h = this.mergeEditorView.getHeight(), var h = this.mergeEditorView.getHeight(),
@ -138,7 +138,7 @@ define([
}, },
handler: function(result, value) { handler: function(result, value) {
externalEditor.serviceCommand('queryClose',{mr:result}); externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
return true; return true;
}, },