diff --git a/apps/common/main/lib/view/DocumentAccessDialog.js b/apps/common/main/lib/view/DocumentAccessDialog.js index 30fc76d9c..55f5742f8 100644 --- a/apps/common/main/lib/view/DocumentAccessDialog.js +++ b/apps/common/main/lib/view/DocumentAccessDialog.js @@ -119,10 +119,11 @@ define([ }, _onMessage: function(msg) { - if (msg && msg.needUpdate) { - this.trigger('accessrights', this, msg.sharingSettings); + if (msg && msg.Referer == "onlyoffice") { + if (msg.needUpdate) + this.trigger('accessrights', this, msg.sharingSettings); + Common.NotificationCenter.trigger('window:close', this); } - Common.NotificationCenter.trigger('window:close', this); }, _onLoad: function() { diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js index 201c65e02..2d21d48af 100644 --- a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js +++ b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js @@ -169,7 +169,7 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template', }, _onMessage: function(msg) { - if (msg) { + if (msg && msg.Referer == "onlyoffice") { // if ( !_.isEmpty(msg.folder) ) { // this.trigger('mailmergefolder', this, msg.folder); // save last folder url // } diff --git a/apps/documenteditor/main/app/view/MailMergeRecepients.js b/apps/documenteditor/main/app/view/MailMergeRecepients.js index 9135a9886..41a91f639 100644 --- a/apps/documenteditor/main/app/view/MailMergeRecepients.js +++ b/apps/documenteditor/main/app/view/MailMergeRecepients.js @@ -116,7 +116,7 @@ define([ }, _onMessage: function(msg) { - if (msg && msg.file !== undefined) { + if (msg && msg.Referer == "onlyoffice" && msg.file !== undefined) { Common.NotificationCenter.trigger('window:close', this); var me = this; setTimeout(function() { diff --git a/apps/documenteditor/main/app/view/MailMergeSaveDlg.js b/apps/documenteditor/main/app/view/MailMergeSaveDlg.js index 3a76f35e6..c0c5a9ee1 100644 --- a/apps/documenteditor/main/app/view/MailMergeSaveDlg.js +++ b/apps/documenteditor/main/app/view/MailMergeSaveDlg.js @@ -120,7 +120,7 @@ define([ }, _onMessage: function(msg) { - if (msg) { + if (msg && msg.Referer == "onlyoffice") { if ( !_.isEmpty(msg.error) ) { this.trigger('mailmergeerror', this, msg.error); }