From e818ddf253a129fc5f27c5ca6d3caeb6d97d484f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 1 Dec 2016 12:59:02 +0300 Subject: [PATCH] Fix Bug 33560, Fix Bug 33549 --- apps/common/main/lib/controller/ExternalDiagramEditor.js | 4 ++-- apps/common/main/lib/controller/ExternalMergeEditor.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/controller/ExternalDiagramEditor.js b/apps/common/main/lib/controller/ExternalDiagramEditor.js index 62810e19e9..8d8baf2ca2 100644 --- a/apps/common/main/lib/controller/ExternalDiagramEditor.js +++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js @@ -94,7 +94,7 @@ define([ 'Common.Views.ExternalDiagramEditor': { 'setchartdata': _.bind(this.setChartData, this), 'drag': _.bind(function(o, state){ - externalEditor.serviceCommand('window:drag', state == 'start'); + externalEditor && externalEditor.serviceCommand('window:drag', state == 'start'); },this), 'show': _.bind(function(cmp){ var h = this.diagramEditorView.getHeight(), @@ -138,7 +138,7 @@ define([ }, handler: function(result, value) { - externalEditor.serviceCommand('queryClose',{mr:result}); + externalEditor && externalEditor.serviceCommand('queryClose',{mr:result}); return true; }, diff --git a/apps/common/main/lib/controller/ExternalMergeEditor.js b/apps/common/main/lib/controller/ExternalMergeEditor.js index 9180da098c..1f523444b8 100644 --- a/apps/common/main/lib/controller/ExternalMergeEditor.js +++ b/apps/common/main/lib/controller/ExternalMergeEditor.js @@ -94,7 +94,7 @@ define([ 'Common.Views.ExternalMergeEditor': { 'setmergedata': _.bind(this.setMergeData, this), 'drag': _.bind(function(o, state){ - externalEditor.serviceCommand('window:drag', state == 'start'); + externalEditor && externalEditor.serviceCommand('window:drag', state == 'start'); },this), 'show': _.bind(function(cmp){ var h = this.mergeEditorView.getHeight(), @@ -138,7 +138,7 @@ define([ }, handler: function(result, value) { - externalEditor.serviceCommand('queryClose',{mr:result}); + externalEditor && externalEditor.serviceCommand('queryClose',{mr:result}); return true; },