From a85049c8de8b788519ac036409e74b71afb0f021 Mon Sep 17 00:00:00 2001 From: bir Date: Fri, 17 Jan 2025 10:40:05 +0100 Subject: [PATCH] voiceover in "Terms and Agreement" close #8292 --- src/common/misc/KeyManager.ts | 2 +- src/common/settings/PasswordForm.ts | 2 +- src/common/subscription/SignupForm.ts | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/common/misc/KeyManager.ts b/src/common/misc/KeyManager.ts index a228f5275287..3a9a54b6661e 100644 --- a/src/common/misc/KeyManager.ts +++ b/src/common/misc/KeyManager.ts @@ -5,7 +5,7 @@ import { assertMainOrNodeBoot, isAppleDevice } from "../api/common/Env" import m from "mithril" assertMainOrNodeBoot() -export const TABBABLE = "button, input, textarea, div[contenteditable='true'], [tabindex='0']" +export const TABBABLE = "button, input, textarea, div[contenteditable='true'], [tabindex='0'], a" export type KeyPress = { key: string diff --git a/src/common/settings/PasswordForm.ts b/src/common/settings/PasswordForm.ts index dca090c85169..0f8afa3cc928 100644 --- a/src/common/settings/PasswordForm.ts +++ b/src/common/settings/PasswordForm.ts @@ -274,7 +274,7 @@ export class PasswordForm implements Component { private renderPasswordGeneratorHelp(attrs: PasswordFormAttrs): Children { return m( - ".b.mr-xs.hover.click.darkest-hover.mt-xs", + "button.b.mr-xs.hover.click.darkest-hover.mt-xs", { style: { display: "inline-block", color: theme.navigation_button_selected }, onclick: async () => { diff --git a/src/common/subscription/SignupForm.ts b/src/common/subscription/SignupForm.ts index 9ad6a63c41e6..0bc5f231adcc 100644 --- a/src/common/subscription/SignupForm.ts +++ b/src/common/subscription/SignupForm.ts @@ -204,6 +204,8 @@ export class SignupForm implements Component { }) : null, m(Checkbox, confirmTermsCheckBoxAttrs), + m("div", renderTermsAndConditionsButton(TermsSection.Terms, CURRENT_TERMS_VERSION)), + m("div", renderTermsAndConditionsButton(TermsSection.Privacy, CURRENT_PRIVACY_VERSION)), m(Checkbox, confirmAgeCheckBoxAttrs), ], m( @@ -240,11 +242,7 @@ export class SignupForm implements Component { } function renderTermsLabel(): Children { - return [ - lang.get("termsAndConditions_label"), - m("div", renderTermsAndConditionsButton(TermsSection.Terms, CURRENT_TERMS_VERSION)), - m("div", renderTermsAndConditionsButton(TermsSection.Privacy, CURRENT_PRIVACY_VERSION)), - ] + return lang.get("termsAndConditions_label") } /**