From 6387604eeee12b0aadb4d9b1c1b122b1d197b018 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 27 Apr 2018 11:02:29 +0300
Subject: [PATCH] Revert "Revert onmessage-referrer feature"

This reverts commit 0c7b1f346acae7d4fb2abfca56ba3e8227c424da.
---
 apps/common/main/lib/view/DocumentAccessDialog.js        | 2 +-
 apps/documenteditor/main/app/view/MailMergeEmailDlg.js   | 2 +-
 apps/documenteditor/main/app/view/MailMergeRecepients.js | 2 +-
 apps/documenteditor/main/app/view/MailMergeSaveDlg.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/common/main/lib/view/DocumentAccessDialog.js b/apps/common/main/lib/view/DocumentAccessDialog.js
index 80c4f2db0..0826a0824 100644
--- a/apps/common/main/lib/view/DocumentAccessDialog.js
+++ b/apps/common/main/lib/view/DocumentAccessDialog.js
@@ -119,7 +119,7 @@ define([
         },
 
         _onMessage: function(msg) {
-            if (msg /*&& msg.Referer == "onlyoffice"*/) {
+            if (msg && msg.Referer == "onlyoffice") {
                 if (msg.needUpdate)
                     this.trigger('accessrights', this, msg.sharingSettings);
                 Common.NotificationCenter.trigger('window:close', this);
diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
index 09269b130..0fe526355 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 /*&& msg.Referer == "onlyoffice"*/) {
+            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 ebe85304d..38f4d6ef7 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.Referer == "onlyoffice"*/ && 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 a922f0459..832f1bc6b 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 /*&& msg.Referer == "onlyoffice"*/) {
+            if (msg && msg.Referer == "onlyoffice") {
                 if ( !_.isEmpty(msg.error) ) {
                     this.trigger('mailmergeerror', this, msg.error);
                 }