From ac02885bfadd6f9e45c87654c6dc9ddac08e05dd Mon Sep 17 00:00:00 2001 From: Wolfgang Ginolas Date: Wed, 26 Jun 2024 09:36:42 +0200 Subject: [PATCH 1/2] Fix modal popups with no input elements https://github.com/cryptpad/cryptpad/issues/1532 https://github.com/cryptpad/cryptpad/issues/1533 --- www/common/common-interface.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 1705ce446..2c4d57799 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -580,6 +580,12 @@ define([ let addTabListener = frame => { // find focusable elements let modalElements = $(frame).find('a, button, input, [tabindex]:not([tabindex="-1"]), textarea').filter(':visible').filter(':not(:disabled)'); + + if (modalElements.length === 0) { + // there are no focusable elements -> nothing to do for us here + return; + } + // intialize with focus on first element modalElements[0].focus(); From 98d4820972741103f5ac41144f0e13e6f9957698 Mon Sep 17 00:00:00 2001 From: David Benque Date: Wed, 26 Jun 2024 18:11:54 +0100 Subject: [PATCH 2/2] REUSE compliance --- www/common/extensions.js | 4 ++++ www/install/onboarding.less | 6 ++++++ www/install/onboardscreen.js | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/www/common/extensions.js b/www/common/extensions.js index e8bfa654c..1a0a7d040 100644 --- a/www/common/extensions.js +++ b/www/common/extensions.js @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 XWiki CryptPad Team and contributors +// +// SPDX-License-Identifier: AGPL-3.0-or-later + define([ 'optional!/extensions.js' ], (Extensions) => { diff --git a/www/install/onboarding.less b/www/install/onboarding.less index d0f2c33ac..4820c6681 100644 --- a/www/install/onboarding.less +++ b/www/install/onboarding.less @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 XWiki CryptPad Team and contributors + * + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + @import (reference) "../../customize/src/less2/include/browser.less"; @import (reference) "../../customize/src/less2/include/framework.less"; @import (reference) "../../customize/src/less2/include/tools.less"; diff --git a/www/install/onboardscreen.js b/www/install/onboardscreen.js index 1f201b24b..ed718be4f 100644 --- a/www/install/onboardscreen.js +++ b/www/install/onboardscreen.js @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 XWiki CryptPad Team and contributors +// +// SPDX-License-Identifier: AGPL-3.0-or-later + define([ 'jquery', '/common/inner/sidebar-layout.js',