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

Merge pull request #97 from ONLYOFFICE/feature/bugfix5.1.3

Browse source 
Revert onmessage-referrer feature
This commit is contained in:
Alexey Golubev 2018-04-20 18:10:31 +03:00 committed by GitHub
parent 39c3301439 0c7b1f346a
commit 29436779d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,7 +119,7 @@ define([
}, },
_onMessage: function(msg) { _onMessage: function(msg) {
if (msg && msg.Referer == "onlyoffice") { if (msg /*&& msg.Referer == "onlyoffice"*/) {
if (msg.needUpdate) if (msg.needUpdate)
this.trigger('accessrights', this, msg.sharingSettings); this.trigger('accessrights', this, msg.sharingSettings);
Common.NotificationCenter.trigger('window:close', this); Common.NotificationCenter.trigger('window:close', this);

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) { _onMessage: function(msg) {
if (msg && msg.Referer == "onlyoffice") { if (msg /*&& msg.Referer == "onlyoffice"*/) {
// if ( !_.isEmpty(msg.folder) ) { // if ( !_.isEmpty(msg.folder) ) {
// this.trigger('mailmergefolder', this, msg.folder); // save last folder url // 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) { _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); Common.NotificationCenter.trigger('window:close', this);
var me = this; var me = this;
setTimeout(function() { setTimeout(function() {

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

@ -120,7 +120,7 @@ define([
}, },
_onMessage: function(msg) { _onMessage: function(msg) {
if (msg && msg.Referer == "onlyoffice") { if (msg /*&& msg.Referer == "onlyoffice"*/) {
if ( !_.isEmpty(msg.error) ) { if ( !_.isEmpty(msg.error) ) {
this.trigger('mailmergeerror', this, msg.error); this.trigger('mailmergeerror', this, msg.error);
} }