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

Merge branch 'feature/onmessage-referrer' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2018-04-16 14:41:41 +03:00
parent 52009d352f c6e333833f
commit b82753d1d8
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/main/lib/view/DocumentAccessDialog.js
View file

@ -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() {

2
apps/documenteditor/main/app/view/MailMergeEmailDlg.js
View file

@ -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
// }

2
apps/documenteditor/main/app/view/MailMergeRecepients.js
View file

@ -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() {

2
apps/documenteditor/main/app/view/MailMergeSaveDlg.js
View file

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