From 7dced037a33cbee6a18df618c9f9bea653a134ce Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 31 Oct 2018 12:16:44 +0300 Subject: [PATCH] [DE SSE PE] extended request to close editor --- apps/common/main/lib/controller/Desktop.js | 5 +++++ apps/documenteditor/main/app/controller/Main.js | 4 +++- apps/presentationeditor/main/app/controller/Main.js | 4 +++- apps/spreadsheeteditor/main/app/controller/Main.js | 4 +++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index fd5ae4b4c..ff690bbb4 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -70,6 +70,11 @@ define([ } return false; + }, + requestClose: function () { + if ( config.isDesktopApp && !!app ) { + app.execCommand('editor:request', 'close'); + } } }; }; diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index aa6caf0b3..f5065a3bb 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1924,8 +1924,10 @@ define([ me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value)); me.loadMask && me.loadMask.show(); } - } else + } else { Common.Gateway.requestClose(); + Common.Controllers.Desktop.requestClose(); + } me._state.openDlg = null; } }); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 53f7c1cc6..f4bcac2b8 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1767,8 +1767,10 @@ define([ me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value)); me.loadMask && me.loadMask.show(); } - } else + } else { Common.Gateway.requestClose(); + Common.Controllers.Desktop.requestClose(); + } me._state.openDlg = null; } }); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index f8f73f8e6..397d8347b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1590,8 +1590,10 @@ define([ me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value)); me.loadMask && me.loadMask.show(); } - } else + } else { Common.Gateway.requestClose(); + Common.Controllers.Desktop.requestClose(); + } me._state.openDlg = null; } });