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

FIX: Return proper aria-labels (#237) 

- Add proper aria label to dropdown
- Make sure footer button aria-labels are returned

fixes : https://dev.discourse.org/t/quicker-assign-to-self-when-group-is-assigned/54647/24?u=isaacjanzen
This commit is contained in:
janzenisaac 2021-11-13 14:58:35 -06:00 committed by GitHub
parent 98103586b2
commit ec9405df5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6
View File

@ -105,7 +105,8 @@ function registerTopicFooterButtons(api) {
if (user) { if (user) {
return { return {
id: null, id: null,
name: htmlSafe( name: I18n.t("discourse_assign.reassign_modal.title"),
label: htmlSafe(
`${renderAvatar(user, { `${renderAvatar(user, {
imageSize: "tiny", imageSize: "tiny",
ignoreTitle: true, ignoreTitle: true,
@ -115,7 +116,8 @@ function registerTopicFooterButtons(api) {
} else if (group) { } else if (group) {
return { return {
id: null, id: null,
name: htmlSafe( name: I18n.t("discourse_assign.reassign_modal.title"),
label: htmlSafe(
`<span class="unassign-label">${groupLabel}</span> @${group.name}...` `<span class="unassign-label">${groupLabel}</span> @${group.name}...`
), ),
}; };
@ -160,10 +162,10 @@ function registerTopicFooterButtons(api) {
}, },
priority: 250, priority: 250,
translatedTitle() { translatedTitle() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedAriaLabel() { translatedAriaLabel() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedLabel() { translatedLabel() {
return I18n.t("discourse_assign.assign.title"); return I18n.t("discourse_assign.assign.title");
@ -204,10 +206,10 @@ function registerTopicFooterButtons(api) {
api.registerTopicFooterButton({ api.registerTopicFooterButton({
id: "unassign-mobile-header", id: "unassign-mobile-header",
translatedTitle() { translatedTitle() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedAriaLabel() { translatedAriaLabel() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedLabel() { translatedLabel() {
const user = this.get("topic.assigned_to_user"); const user = this.get("topic.assigned_to_user");
@ -246,10 +248,10 @@ function registerTopicFooterButtons(api) {
return "user-times"; return "user-times";
}, },
translatedTitle() { translatedTitle() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedAriaLabel() { translatedAriaLabel() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedLabel() { translatedLabel() {
const label = I18n.t("discourse_assign.unassign.title"); const label = I18n.t("discourse_assign.unassign.title");
@ -290,10 +292,10 @@ function registerTopicFooterButtons(api) {
return "user-plus"; return "user-plus";
}, },
translatedTitle() { translatedTitle() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedAriaLabel() { translatedAriaLabel() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedLabel() { translatedLabel() {
const label = I18n.t("discourse_assign.reassign.to_self"); const label = I18n.t("discourse_assign.reassign.to_self");
@ -339,10 +341,10 @@ function registerTopicFooterButtons(api) {
return "user-plus"; return "user-plus";
}, },
translatedTitle() { translatedTitle() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedAriaLabel() { translatedAriaLabel() {
defaultTitle(this); return defaultTitle(this);
}, },
translatedLabel() { translatedLabel() {
const label = I18n.t("discourse_assign.reassign.title_w_ellipsis"); const label = I18n.t("discourse_assign.reassign.title_w_ellipsis");