From 01597adec0c47bf9a2570bebf4b3d19b1722fcb1 Mon Sep 17 00:00:00 2001 From: Alexey Koshelev Date: Mon, 6 Oct 2025 18:11:36 +0300 Subject: [PATCH] [DE PDFE PE SSE VE] Fix shortcuts for view mode --- apps/documenteditor/main/app/controller/Main.js | 3 ++- apps/pdfeditor/main/app/controller/Main.js | 3 ++- apps/presentationeditor/main/app/controller/Main.js | 3 ++- apps/spreadsheeteditor/main/app/controller/Main.js | 3 ++- apps/visioeditor/main/app/controller/Main.js | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index b26935ca6a..a6b1638c10 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1456,6 +1456,8 @@ define([ documentHolderController.getView().on('editcomplete', _.bind(me.onEditComplete, me)); + DE.getController('Common.Controllers.Shortcuts').setApi(me.api); + if (me.appOptions.isEdit) { if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true me.appOptions.forcesave = Common.localStorage.getBool("de-settings-forcesave", me.appOptions.canForcesave); @@ -1483,7 +1485,6 @@ define([ if (window.document_content_ready) { clearInterval(timer_sl); - DE.getController('Common.Controllers.Shortcuts').setApi(me.api); toolbarController.createDelayedElements(); documentHolderController.getView().createDelayedElements(); me.setLanguages(); diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js index c6d1e1234a..b34dc9cd63 100644 --- a/apps/pdfeditor/main/app/controller/Main.js +++ b/apps/pdfeditor/main/app/controller/Main.js @@ -1116,6 +1116,8 @@ define([ documentHolderController.getView().on('editcomplete', _.bind(me.onEditComplete, me)); + PDFE.getController('Common.Controllers.Shortcuts').setApi(me.api); + if (me.appOptions.isEdit || me.appOptions.isRestrictedEdit) { if (me.appOptions.isEdit && me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true me.appOptions.forcesave = Common.localStorage.getBool("pdfe-settings-forcesave", me.appOptions.canForcesave); @@ -1129,7 +1131,6 @@ define([ me.appOptions.isRestrictedEdit && me.api.asc_SetHighlightRequiredFields(true); var timer_sl = setTimeout(function(){ - PDFE.getController('Common.Controllers.Shortcuts').setApi(me.api); toolbarController.createDelayedElements(); toolbarController.activateControls(); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 97699e8698..9a08039d04 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1043,6 +1043,8 @@ define([ // if (me.isThumbnailsShow) me.getMainMenu().onThumbnailsShow(me.isThumbnailsShow); application.getController('Viewport').getView('DocumentPreview').setApi(me.api).setMode(me.appOptions).on('editcomplete', _.bind(me.onEditComplete, me)); + PE.getController('Common.Controllers.Shortcuts').setApi(me.api); + if (me.appOptions.isEdit) { if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true me.appOptions.forcesave = Common.localStorage.getBool("pe-settings-forcesave", me.appOptions.canForcesave); @@ -1063,7 +1065,6 @@ define([ if (window.styles_loaded) { clearInterval(timer_sl); - PE.getController('Common.Controllers.Shortcuts').setApi(me.api); toolbarController.createDelayedElements(); documentHolderController.getView().createDelayedElements(); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 6f2383c74a..0da936a339 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1072,6 +1072,8 @@ define([ this.formulaInput = celleditorController.getView('CellEditor').$el.find('textarea'); + SSE.getController('Common.Controllers.Shortcuts').setApi(me.api); + if (me.appOptions.isEdit) { Common.UI.FeaturesManager.canChange('spellcheck') && spellcheckController.setApi(me.api).setMode(me.appOptions); @@ -1101,7 +1103,6 @@ define([ if (window.styles_loaded || me.appOptions.isEditDiagram || me.appOptions.isEditMailMerge || me.appOptions.isEditOle) { clearInterval(timer_sl); - SSE.getController('Common.Controllers.Shortcuts').setApi(me.api); Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + me.api.asc_getActiveWorksheetId()]); documentHolderView.createDelayedElements(); diff --git a/apps/visioeditor/main/app/controller/Main.js b/apps/visioeditor/main/app/controller/Main.js index 907cd8f66f..439f87753b 100644 --- a/apps/visioeditor/main/app/controller/Main.js +++ b/apps/visioeditor/main/app/controller/Main.js @@ -951,12 +951,13 @@ define([ documentHolderController.getView().on('editcomplete', _.bind(me.onEditComplete, me)); + // VE.getController('Common.Controllers.Shortcuts').setApi(me.api); + if (me.appOptions.isEdit) { if (me.needToUpdateVersion) Common.NotificationCenter.trigger('api:disconnect'); var timer_sl = setTimeout(function(){ - PDFE.getController('Common.Controllers.Shortcuts').setApi(me.api); toolbarController.createDelayedElements(); toolbarController.activateControls();