From 79a9e40d38ea9d1a06efb20070249c878a9939ae Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Oct 2019 16:10:06 +0300 Subject: [PATCH] Fix Bug 43049 --- apps/common/main/lib/view/SaveAsDlg.js | 2 ++ apps/documenteditor/main/app/controller/Main.js | 1 + apps/presentationeditor/main/app/controller/Main.js | 1 + apps/spreadsheeteditor/main/app/controller/Main.js | 1 + 4 files changed, 5 insertions(+) diff --git a/apps/common/main/lib/view/SaveAsDlg.js b/apps/common/main/lib/view/SaveAsDlg.js index 43afd5d2a..04f1b3c57 100644 --- a/apps/common/main/lib/view/SaveAsDlg.js +++ b/apps/common/main/lib/view/SaveAsDlg.js @@ -122,6 +122,8 @@ define([ if (msg && msg.Referer == "onlyoffice") { if ( !_.isEmpty(msg.error) ) { this.trigger('saveaserror', this, msg.error); + } else if (!_.isEmpty(msg.message)) { + Common.NotificationCenter.trigger('showmessage', {msg: msg.message}); } // if ( !_.isEmpty(msg.folder) ) { // this.trigger('saveasfolder', this, msg.folder); // save last folder url diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 2167fc157..44de0321e 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -190,6 +190,7 @@ define([ Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('goback', _.bind(this.goBack, this)); Common.NotificationCenter.on('download:advanced', _.bind(this.onAdvancedOptions, this)); + Common.NotificationCenter.on('showmessage', _.bind(this.onExternalMessage, this)); this.isShowOpenDialog = false; diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 5c6bb412c..9e940ee48 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -178,6 +178,7 @@ define([ this.api.asc_registerCallback('asc_onSpellCheckInit', _.bind(this.loadLanguages, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('goback', _.bind(this.goBack, this)); + Common.NotificationCenter.on('showmessage', _.bind(this.onExternalMessage, this)); this.isShowOpenDialog = false; diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 5ce1f5dc3..cd91282d0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -176,6 +176,7 @@ define([ Common.NotificationCenter.on('namedrange:locked', _.bind(this.onNamedRangeLocked, this)); Common.NotificationCenter.on('download:cancel', _.bind(this.onDownloadCancel, this)); Common.NotificationCenter.on('download:advanced', _.bind(this.onAdvancedOptions, this)); + Common.NotificationCenter.on('showmessage', _.bind(this.onExternalMessage, this)); this.stackLongActions = new Common.IrregularStack({ strongCompare : this._compareActionStrong,