imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put behind a labs flag

Browse source
This commit is contained in:
Andrew Morgan 2020-06-26 00:00:30 +01:00
parent 6ea5dc7b7c
commit 87f961df3f
5 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/views/elements/InlineSpinner.js
View file

@ -17,6 +17,7 @@ limitations under the License.
import React from "react";
import createReactClass from 'create-react-class';
import {_t} from "../../../languageHandler";
import SettingsStore from "../../../settings/SettingsStore";
export default createReactClass({
displayName: 'InlineSpinner',
@ -27,10 +28,20 @@ export default createReactClass({
const imgClass = this.props.imgClassName || "";
const alt = this.props.alt || _t("Loading...");
let divClass;
let imageSource;
if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
divClass = "mx_InlineSpinner mx_Spinner_spin";
imageSource = require("../../../../res/img/spinner.svg");
} else {
divClass = "mx_InlineSpinner";
imageSource = require("../../../../res/img/spinner.gif");
}
return (
<div className="mx_InlineSpinner">
<div className={divClass}>
<img
src={require("../../../../res/img/spinner.svg")}
src={imageSource}
width={w}
height={h}
className={imgClass}

27
src/components/views/elements/Spinner.js
View file

@ -18,18 +18,29 @@ limitations under the License.
import React from "react";
import PropTypes from "prop-types";
import {_t} from "../../../languageHandler";
import SettingsStore from "../../../settings/SettingsStore";
const Spinner = ({w = 32, h = 32, imgClassName, alt, message}) => {
let divClass;
let imageSource;
if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
divClass = "mx_Spinner mx_Spinner_spin";
imageSource = require("../../../../res/img/spinner.svg");
} else {
divClass = "mx_Spinner";
imageSource = require("../../../../res/img/spinner.gif");
}
return (
<div className="mx_Spinner">
<div className={divClass}>
{ message && <React.Fragment><div className="mx_Spinner_Msg">{ message}</div>&nbsp;</React.Fragment> }
<img
src={require("../../../../res/img/spinner.svg")}
width={w}
height={h}
className={imgClassName}
alt={alt || _t("Loading...")}
/>
<img
src={imageSource}
width={w}
height={h}
className={imgClassName}
alt={alt || _t("Loading...")}
/>
</div>
);
};