From b00d822bc0782c07622068af8edc2672fce934e0 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 26 Jun 2020 01:18:02 +0100
Subject: [PATCH] Remove alt, use aria-label

---
 src/components/views/elements/InlineSpinner.js | 3 +--
 src/components/views/elements/Spinner.js       | 5 ++---
 src/components/views/messages/MAudioBody.js    | 2 +-
 src/components/views/messages/MImageBody.js    | 2 +-
 src/components/views/messages/MVideoBody.js    | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/views/elements/InlineSpinner.js b/src/components/views/elements/InlineSpinner.js
index dba2479d57..ad88868790 100644
--- a/src/components/views/elements/InlineSpinner.js
+++ b/src/components/views/elements/InlineSpinner.js
@@ -26,7 +26,6 @@ export default createReactClass({
         const w = this.props.w || 16;
         const h = this.props.h || 16;
         const imgClass = this.props.imgClassName || "";
-        const alt = this.props.alt || _t("Loading...");
 
         let divClass;
         let imageSource;
@@ -45,7 +44,7 @@ export default createReactClass({
                     width={w}
                     height={h}
                     className={imgClass}
-                    alt={alt}
+                    aria-label={_t("Loading...")}
                 />
             </div>
         );
diff --git a/src/components/views/elements/Spinner.js b/src/components/views/elements/Spinner.js
index c192f7d499..ee4351fed6 100644
--- a/src/components/views/elements/Spinner.js
+++ b/src/components/views/elements/Spinner.js
@@ -20,7 +20,7 @@ import PropTypes from "prop-types";
 import {_t} from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
 
-const Spinner = ({w = 32, h = 32, imgClassName, alt, message}) => {
+const Spinner = ({w = 32, h = 32, imgClassName, message}) => {
     let divClass;
     let imageSource;
     if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
@@ -39,7 +39,7 @@ const Spinner = ({w = 32, h = 32, imgClassName, alt, message}) => {
                     width={w}
                     height={h}
                     className={imgClassName}
-                    alt={alt || _t("Loading...")}
+                    aria-label={_t("Loading...")}
                 />
         </div>
     );
@@ -48,7 +48,6 @@ Spinner.propTypes = {
     w: PropTypes.number,
     h: PropTypes.number,
     imgClassName: PropTypes.string,
-    alt: PropTypes.string,
     message: PropTypes.node,
 };
 
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index 421ec8fc47..37f85a108f 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -95,7 +95,7 @@ export default class MAudioBody extends React.Component {
             // Not sure how tall the audio player is so not sure how tall it should actually be.
             return (
                 <span className="mx_MAudioBody">
-                    <InlineSpinner alt={content.body} />
+                    <InlineSpinner />
                 </span>
             );
         }
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 4d12dcf5d7..c92ae475bf 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -366,7 +366,7 @@ export default class MImageBody extends React.Component {
 
         // e2e image hasn't been decrypted yet
         if (content.file !== undefined && this.state.decryptedUrl === null) {
-            placeholder = <InlineSpinner alt={content.body} w={32} h={32} />;
+            placeholder = <InlineSpinner w={32} h={32} />;
         } else if (!this.state.imgLoaded) {
             // Deliberately, getSpinner is left unimplemented here, MStickerBody overides
             placeholder = this.getPlaceholder();
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 1fba9d2ead..fdc04deffc 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -148,7 +148,7 @@ export default createReactClass({
             return (
                 <span className="mx_MVideoBody">
                     <div className="mx_MImageBody_thumbnail mx_MImageBody_thumbnail_spinner">
-                        <InlineSpinner alt={content.body} />
+                        <InlineSpinner />
                     </div>
                 </span>
             );