pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 05:30:15 +08:00
Code Issues 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
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': {
'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;
},

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

@ -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;
},