matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge branch 'develop' into t3chguy/eslint

Browse Source
This commit is contained in:
Michael Telatynski
2021-07-20 11:08:13 +01:00
committed by GitHub
parent 9fe9534e01 53ae7817bc
commit d3934ff7da
19 changed files with 859 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/messages/MImageBody.tsx
View File

@@ -433,9 +433,9 @@ export default class MImageBody extends React.Component<IProps, IState> {
protected getPlaceholder(width: number, height: number): JSX.Element {
const blurhash = this.props.mxEvent.getContent().info[BLURHASH_FIELD];
if (blurhash) return <Blurhash hash={blurhash} width={width} height={height} />;
return <div className="mx_MImageBody_thumbnail_spinner">
return (
<InlineSpinner w={32} h={32} />
</div>;
);
}
// Overidden by MStickerBody