Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "A11Y: Improve create account modal for screen readers (#14204)" (#14233) 

This reverts commit e0d2de73d8.
This commit is contained in:
Martin Brennan 2021-09-03 09:42:56 +10:00 committed by GitHub
parent e0d2de73d8
commit a0fbccf612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 69 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse-loader.js
View File

@ -163,9 +163,6 @@ var define, requirejs;
"@ember/object/internals": {
guidFor: Ember.guidFor,
},
"@ember/views/text-support": {
default: Ember.TextSupport,
},
I18n: {
// eslint-disable-next-line
default: I18n,

25
app/assets/javascripts/discourse/app/components/d-modal-body.js
View File

@ -8,10 +8,7 @@ export default Component.extend({
didInsertElement() {
this._super(...arguments);
this._modalAlertElement = document.getElementById("modal-alert");
if (this._modalAlertElement) {
this._modalAlertElement.innerHTML = "";
}
$("#modal-alert").hide();
let fixedParent = $(this.element).closest(".d-modal.fixed-modal");
if (fixedParent.length) {
@ -58,10 +55,10 @@ export default Component.extend({
},
_clearFlash() {
if (this._modalAlertElement) {
this._modalAlertElement.innerHTML = "";
this._modalAlertElement.classList.remove(
"alert",
const modalAlert = document.getElementById("modal-alert");
if (modalAlert) {
modalAlert.style.display = "none";
modalAlert.classList.remove(
"alert-error",
"alert-info",
"alert-success",
@ -72,14 +69,10 @@ export default Component.extend({
_flash(msg) {
this._clearFlash();
if (!this._modalAlertElement) {
return;
}
this._modalAlertElement.classList.add(
"alert",
`alert-${msg.messageClass || "success"}`
);
this._modalAlertElement.innerHTML = msg.text || "";
$("#modal-alert")
.addClass(`alert alert-${msg.messageClass || "success"}`)
.html(msg.text || "")
.fadeIn();
},
});

18
app/assets/javascripts/discourse/app/components/d-modal.js
View File

@ -1,7 +1,8 @@
import { computed } from "@ember/object";
import Component from "@ember/component";
import I18n from "I18n";
import { next, schedule } from "@ember/runloop";
import discourseComputed, { bind, on } from "discourse-common/utils/decorators";
import { bind, on } from "discourse-common/utils/decorators";
export default Component.extend({
classNameBindings: [
@ -20,7 +21,6 @@ export default Component.extend({
submitOnEnter: true,
dismissable: true,
title: null,
titleAriaElementId: null,
subtitle: null,
role: "dialog",
headerClass: null,
@ -41,17 +41,9 @@ export default Component.extend({
// Inform screenreaders of the modal
"aria-modal": "true",
@discourseComputed("title", "titleAriaElementId")
ariaLabelledby(title, titleAriaElementId) {
if (titleAriaElementId) {
return titleAriaElementId;
}
if (title) {
return "discourse-modal-title";
}
return;
},
ariaLabelledby: computed("title", function () {
return this.title ? "discourse-modal-title" : null;
}),
@on("didInsertElement")
setUp() {

30
app/assets/javascripts/discourse/app/controllers/create-account.js
View File

@ -140,19 +140,16 @@ export default Controller.extend(
"serverAccountEmail",
"serverEmailValidation",
"accountEmail",
"rejectedEmails.[]",
"forceValidationReason"
"rejectedEmails.[]"
)
emailValidation(
serverAccountEmail,
serverEmailValidation,
email,
rejectedEmails,
forceValidationReason
rejectedEmails
) {
const failedAttrs = {
failed: true,
ok: false,
element: document.querySelector("#new-account-email"),
};
@ -165,9 +162,6 @@ export default Controller.extend(
return EmberObject.create(
Object.assign(failedAttrs, {
message: I18n.t("user.email.required"),
reason: forceValidationReason
? I18n.t("user.email.required")
: null,
})
);
}
@ -432,7 +426,6 @@ export default Controller.extend(
createAccount() {
this.clearFlash();
this.set("forceValidationReason", true);
const validation = [
this.emailValidation,
this.usernameValidation,
@ -442,22 +435,23 @@ export default Controller.extend(
].find((v) => v.failed);
if (validation) {
if (validation.message) {
this.flash(validation.message, "error");
}
const element = validation.element;
if (element) {
if (element.tagName === "DIV") {
if (element.scrollIntoView) {
element.scrollIntoView();
}
element.click();
} else {
element.focus();
if (element.tagName === "DIV") {
if (element.scrollIntoView) {
element.scrollIntoView();
}
element.click();
} else {
element.focus();
}
return;
}
this.set("forceValidationReason", false);
this.performAccountCreation();
},
},

5
app/assets/javascripts/discourse/app/controllers/login.js
View File

@ -428,10 +428,7 @@ export default Controller.extend(ModalFunctionality, {
});
next(() => {
showModal("createAccount", {
modalClass: "create-account",
titleAriaElementId: "create-account-title",
});
showModal("createAccount", { modalClass: "create-account" });
});
},
});

11
app/assets/javascripts/discourse/app/initializers/ember-input-component-extension.js
View File

@ -1,11 +0,0 @@
import TextSupport from "@ember/views/text-support";
export default {
name: "ember-input-component-extensions",
initialize() {
TextSupport.reopen({
attributeBindings: ["aria-describedby", "aria-invalid"],
});
},
};

4
app/assets/javascripts/discourse/app/lib/show-modal.js
View File

@ -47,10 +47,6 @@ export default function (name, opts) {
modalController.set("title", null);
}
if (opts.titleAriaElementId) {
modalController.set("titleAriaElementId", opts.titleAriaElementId);
}
if (opts.panels) {
modalController.setProperties({
panels: opts.panels,

8
app/assets/javascripts/discourse/app/mixins/name-validation.js
View File

@ -15,14 +15,12 @@ export default Mixin.create({
},
// Validate the name.
@discourseComputed("accountName", "forceValidationReason")
nameValidation(accountName, forceValidationReason) {
if (this.siteSettings.full_name_required && isEmpty(accountName)) {
@discourseComputed("accountName")
nameValidation() {
if (this.siteSettings.full_name_required && isEmpty(this.accountName)) {
return EmberObject.create({
failed: true,
ok: false,
message: I18n.t("user.name.required"),
reason: forceValidationReason ? I18n.t("user.name.required") : null,
element: document.querySelector("#new-account-name"),
});
}

10
app/assets/javascripts/discourse/app/mixins/password-validation.js
View File

@ -33,8 +33,7 @@ export default Mixin.create({
"rejectedPasswords.[]",
"accountUsername",
"accountEmail",
"passwordMinLength",
"forceValidationReason"
"passwordMinLength"
)
passwordValidation(
password,
@ -42,12 +41,10 @@ export default Mixin.create({
rejectedPasswords,
accountUsername,
accountEmail,
passwordMinLength,
forceValidationReason
passwordMinLength
) {
const failedAttrs = {
failed: true,
ok: false,
element: document.querySelector("#new-account-password"),
};
@ -70,9 +67,6 @@ export default Mixin.create({
return EmberObject.create(
Object.assign(failedAttrs, {
message: I18n.t("user.password.required"),
reason: forceValidationReason
? I18n.t("user.password.required")
: null,
})
);
}

8
app/assets/javascripts/discourse/app/mixins/username-validation.js
View File

@ -11,7 +11,6 @@ function failedResult(attrs) {
let result = EmberObject.create({
shouldCheck: false,
failed: true,
ok: false,
element: document.querySelector("#new-account-username"),
});
result.setProperties(attrs);
@ -61,12 +60,7 @@ export default Mixin.create({
}
if (isEmpty(username)) {
return failedResult({
message: I18n.t("user.username.required"),
reason: this.forceValidationReason
? I18n.t("user.username.required")
: null,
});
return failedResult({ message: I18n.t("user.username.required") });
}
if (username.length < this.siteSettings.min_username_length) {

5
app/assets/javascripts/discourse/app/models/login-method.js
View File

@ -13,11 +13,6 @@ const LoginMethod = EmberObject.extend({
return this.title_override || I18n.t(`login.${this.name}.title`);
},
@discourseComputed
screenReaderTitle() {
return this.title_override || I18n.t(`login.${this.name}.sr_title`);
},
@discourseComputed
prettyName() {
return this.pretty_name_override || I18n.t(`login.${this.name}.name`);

13
app/assets/javascripts/discourse/app/routes/application.js
View File

@ -267,18 +267,11 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
const returnPath = encodeURIComponent(window.location.pathname);
window.location = getURL("/session/sso?return_path=" + returnPath);
} else {
this._autoLogin("createAccount", "create-account", {
signup: true,
titleAriaElementId: "create-account-title",
});
this._autoLogin("createAccount", "create-account", { signup: true });
}
},
_autoLogin(
modal,
modalClass,
{ notAuto = null, signup = false, titleAriaElementId = null } = {}
) {
_autoLogin(modal, modalClass, { notAuto = null, signup = false } = {}) {
const methods = findAll();
if (!this.siteSettings.enable_local_logins && methods.length === 1) {
@ -286,7 +279,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
signup: signup,
});
} else {
showModal(modal, { titleAriaElementId });
showModal(modal);
this.controllerFor("modal").set("modalClass", modalClass);
if (notAuto) {
notAuto();

2
app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
View File

@ -30,7 +30,7 @@
{{/if}}
</div>
<div id="modal-alert" role="alert"></div>
<div id="modal-alert"></div>
{{yield}}

2
app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
View File

@ -1,5 +1,5 @@
{{#each buttons as |b|}}
<button type="button" class="btn btn-social {{b.name}}" {{action externalLogin b}} aria-label={{b.screenReaderTitle}}>
<button type="button" class="btn btn-social {{b.name}}" {{action externalLogin b}}>
{{#if b.isGoogle}}
<svg class="fa d-icon d-icon-custom-google-oauth2 svg-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
{{else if b.icon}}

1
app/assets/javascripts/discourse/app/templates/modal.hbs
View File

@ -1,7 +1,6 @@
{{#d-modal
modalClass=modalClass
title=title
titleAriaElementId=titleAriaElementId
subtitle=subtitle
panels=panels
selectedPanel=selectedPanel

82
app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
View File

@ -1,12 +1,17 @@
{{#create-account email=accountEmail disabled=submitDisabled action=(action "createAccount")}}
{{#unless complete}}
{{plugin-outlet name="create-account-before-modal-body"}}
{{#d-modal-body class=modalBodyClasses preventModalAlertHiding=true}}
{{#d-modal-body class=modalBodyClasses}}
<div class="create-account-form">
<div class="login-welcome-header" id="create-account-title">
<div class="login-welcome-header">
<h1 class="login-title">{{i18n "create_account.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
<p class="login-subheader">{{i18n "create_account.subheader_title"}}</p>
</div>
{{#unless hasAuthOptions}}
<div class="create-account-login-buttons">
{{login-buttons externalLogin=(action "externalLogin")}}
</div>
{{/unless}}
{{#if showCreateForm}}
<div class="login-form">
@ -17,18 +22,7 @@
</div>
{{/if}}
<div class="input-group create-account-email">
{{input
type="email"
disabled=emailDisabled
value=accountEmail
id="new-account-email"
name="email"
class=(value-entered accountEmail)
autofocus="autofocus"
focusOut=(action "checkEmailAvailability")
aria-describedby="account-email-validation"
aria-invalid=emailValidation.failed
}}
{{input type="email" disabled=emailDisabled value=accountEmail id="new-account-email" name="email" class=(value-entered accountEmail) autofocus="autofocus" focusOut=(action "checkEmailAvailability")}}
<label class="alt-placeholder" for="new-account-email">
{{i18n "user.email.title"}}
{{~#if userFields~}}
@ -40,17 +34,8 @@
</div>
<div class="input-group">
{{input
value=accountUsername
disabled=usernameDisabled
class=(value-entered accountUsername)
id="new-account-username"
name="username"
maxlength=maxUsernameLength
aria-describedby="username-validation"
aria-invalid=usernameValidation.failed
autocomplete="discourse"
}}
{{input value=accountUsername disabled=usernameDisabled class=(value-entered accountUsername) id="new-account-username" name="username" maxlength=maxUsernameLength
autocomplete="discourse"}}
<label class="alt-placeholder" for="new-account-username">
{{i18n "user.username.title"}}
{{~#if userFields~}}
@ -64,14 +49,7 @@
<div class="input-group">
{{#if fullnameRequired}}
{{text-field
disabled=nameDisabled
value=accountName
id="new-account-name"
class=(value-entered accountName)
aria-describedby="fullname-validation"
aria-invalid=nameValidation.failed
}}
{{text-field disabled=nameDisabled value=accountName id="new-account-name" class=(value-entered accountName)}}
<label class="alt-placeholder" for="new-account-name">
{{i18n "user.name.title"}}
{{#if siteSettings.full_name_required}}
@ -81,35 +59,26 @@
{{/if}}
</label>
{{input-tip validation=nameValidation id="fullname-validation"}}
{{input-tip validation=nameValidation}}
<span class="more-info">{{nameInstructions}}</span>
{{/if}}
</div>
{{plugin-outlet
name="create-account-before-password"
noTags=true
args=(hash
accountName=accountName
accountUsername=accountUsername
accountPassword=accountPassword
userFields=userFields
authOptions=authOptions
)
name="create-account-before-password"
noTags=true
args=(hash
accountName=accountName
accountUsername=accountUsername
accountPassword=accountPassword
userFields=userFields
authOptions=authOptions
)
}}
<div class="input-group">
{{#if passwordRequired}}
{{password-field
value=accountPassword
class=(value-entered accountPassword)
type="password"
id="new-account-password"
autocomplete="current-password"
capsLockOn=capsLockOn
aria-describedby="password-validation"
aria-invalid=passwordValidation.failed
}}
{{password-field value=accountPassword class=(value-entered accountPassword) type="password" id="new-account-password" autocomplete="current-password" capsLockOn=capsLockOn}}
<label class="alt-placeholder" for="new-account-password">
{{i18n "user.password.title"}}
{{~#if userFields~}}
@ -117,7 +86,7 @@
{{/if}}
</label>
{{input-tip validation=passwordValidation id="password-validation"}}
{{input-tip validation=passwordValidation}}
<span class="more-info">{{passwordInstructions}}</span>
<div class="caps-lock-warning {{unless capsLockOn " hidden"}}">
{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
@ -187,11 +156,6 @@
{{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
{{/if}}
{{#unless hasAuthOptions}}
<div class="create-account-login-buttons">
{{login-buttons externalLogin=(action "externalLogin")}}
</div>
{{/unless}}
{{#if skipConfirmation}}
{{loading-spinner size="large"}}

8
app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
View File

@ -2,6 +2,7 @@ import {
acceptance,
exists,
query,
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
import { click, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
@ -38,8 +39,9 @@ acceptance("Create Account - User Fields", function (needs) {
assert.ok(exists(".user-field"), "it has at least one user field");
await click(".modal-footer .btn-primary");
assert.ok(exists("#modal-alert"), "it shows the required field alert");
assert.equal(
query("#account-email-validation").innerText.trim(),
queryAll("#modal-alert").text(),
"Please enter an email address"
);
@ -61,8 +63,12 @@ acceptance("Create Account - User Fields", function (needs) {
);
await click(".modal-footer .btn-primary");
assert.equal(query("#modal-alert").style.display, "");
await fillIn(".user-field input[type=text]:nth-of-type(1)", "Barky");
await click(".user-field input[type=checkbox]");
await click(".modal-footer .btn-primary");
assert.equal(query("#modal-alert").style.display, "none");
});
});

5
app/assets/stylesheets/common/base/login.scss
View File

@ -60,10 +60,7 @@
min-height: 35px;
}
#modal-alert:empty {
min-height: 0px;
padding: 0px;
overflow: hidden;
display: inline;
display: none;
}
.login-welcome-header {
z-index: z("modal", "content");

6
config/locales/client.en.yml
View File

@ -1897,27 +1897,21 @@ en:
google_oauth2:
name: "Google"
title: "with Google"
sr_title: "Login with Google"
twitter:
name: "Twitter"
title: "with Twitter"
sr_title: "Login with Twitter"
instagram:
name: "Instagram"
title: "with Instagram"
sr_title: "Login with Instagram"
facebook:
name: "Facebook"
title: "with Facebook"
sr_title: "Login with Facebook"
github:
name: "GitHub"
title: "with GitHub"
sr_title: "Login with GitHub"
discord:
name: "Discord"
title: "with Discord"
sr_title: "Login with Discord"
second_factor_toggle:
totp: "Use an authenticator app instead"
backup_code: "Use a backup code instead"