voiceover in "Terms and Agreement"

close #8292
tutao · Jan 20, 2025 · a85049c · a85049c
1 parent c12c3b1
commit a85049c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -274,7 +274,7 @@ export class PasswordForm implements Component<PasswordFormAttrs> {
 
 	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
@@ -204,6 +204,8 @@ export class SignupForm implements Component<SignupFormAttrs> {
 								  })
 								: 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<SignupFormAttrs> {
 }
 
 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")
 }
 
 /**