From c5a563eceb64f1978155ca729a19221aa9f5e6aa Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Fri, 5 Dec 2025 22:52:07 +0300 Subject: [PATCH] [PDF] Fix focus in the window (when close Hyperlink dialog after hiding) --- .../forms/app/controller/ApplicationController.js | 2 +- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/pdfeditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- apps/visioeditor/main/app/controller/Main.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 00b01f393b..9833e18ccd 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -165,7 +165,7 @@ define([ me.api.asc_enableKeyEvents(false); }, 'modal:close': function(dlg) { - Common.Utils.ModalWindow.close(); + dlg && dlg.isVisible() && Common.Utils.ModalWindow.close(); // close can be called after hiding if (!Common.Utils.ModalWindow.isVisible()) me.api.asc_enableKeyEvents(true); }, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 958df260bd..922280b48f 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -352,7 +352,7 @@ define([ me.api.asc_enableKeyEvents(false); }, 'modal:close': function(dlg) { - Common.Utils.ModalWindow.close(); + dlg && dlg.isVisible() && Common.Utils.ModalWindow.close(); // close can be called after hiding if (!Common.Utils.ModalWindow.isVisible()) me.api.asc_enableKeyEvents(true); }, diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js index 7bcdbb3d26..e06c8d0225 100644 --- a/apps/pdfeditor/main/app/controller/Main.js +++ b/apps/pdfeditor/main/app/controller/Main.js @@ -300,7 +300,7 @@ define([ me.api.asc_enableKeyEvents(false); }, 'modal:close': function(dlg) { - Common.Utils.ModalWindow.close(); + dlg && dlg.isVisible() && Common.Utils.ModalWindow.close(); // close can be called after hiding if (!Common.Utils.ModalWindow.isVisible()) me.api.asc_enableKeyEvents(true); }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 83ea23fa36..5cdc58175e 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -326,7 +326,7 @@ define([ me.api.asc_enableKeyEvents(false); }, 'modal:close': function(dlg) { - Common.Utils.ModalWindow.close(); + dlg && dlg.isVisible() && Common.Utils.ModalWindow.close(); // close can be called after hiding if (!Common.Utils.ModalWindow.isVisible()) me.api.asc_enableKeyEvents(true); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 726b4178d6..605a0496df 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -355,7 +355,7 @@ define([ me.api.asc_enableKeyEvents(false); }, 'modal:close': function(dlg) { - Common.Utils.ModalWindow.close(); + dlg && dlg.isVisible() && Common.Utils.ModalWindow.close(); // close can be called after hiding if (!Common.Utils.ModalWindow.isVisible()) me.api.asc_enableKeyEvents(true); }, diff --git a/apps/visioeditor/main/app/controller/Main.js b/apps/visioeditor/main/app/controller/Main.js index 237c024314..a20e0af96a 100644 --- a/apps/visioeditor/main/app/controller/Main.js +++ b/apps/visioeditor/main/app/controller/Main.js @@ -263,7 +263,7 @@ define([ me.api.asc_enableKeyEvents(false); }, 'modal:close': function(dlg) { - Common.Utils.ModalWindow.close(); + dlg && dlg.isVisible() && Common.Utils.ModalWindow.close(); // close can be called after hiding if (!Common.Utils.ModalWindow.isVisible()) me.api.asc_enableKeyEvents(true); },