From fffb8379d8e2c4c9abefb242624ffd045a25672e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 08:37:11 +0100 Subject: [PATCH] delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MImageBody.js | 25 +++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 1b6bdeb588..e2ff697e55 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -1,6 +1,7 @@ /* Copyright 2015, 2016 OpenMarket Ltd Copyright 2018 New Vector Ltd +Copyright 2018 Michael Telatynski <7t3chguy@gmail.com> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,8 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; - import React from 'react'; import PropTypes from 'prop-types'; import { MatrixClient } from 'matrix-js-sdk'; @@ -29,9 +28,7 @@ import Promise from 'bluebird'; import { _t } from '../../../languageHandler'; import SettingsStore from "../../../settings/SettingsStore"; -export default class extends React.Component { - displayName: 'MImageBody' - +export default class MImageBody extends React.Component { static propTypes = { /* the MatrixEvent to show */ mxEvent: PropTypes.object.isRequired, @@ -41,11 +38,11 @@ export default class extends React.Component { /* the maximum image height to use */ maxImageHeight: PropTypes.number, - } + }; static contextTypes = { matrixClient: PropTypes.instanceOf(MatrixClient), - } + }; constructor(props) { super(props); @@ -90,7 +87,7 @@ export default class extends React.Component { } onClick(ev) { - if (ev.button == 0 && !ev.metaKey) { + if (ev.button === 0 && !ev.metaKey) { ev.preventDefault(); const content = this.props.mxEvent.getContent(); const httpUrl = this._getContentUrl(); @@ -177,9 +174,7 @@ export default class extends React.Component { return this.state.decryptedThumbnailUrl; } return this.state.decryptedUrl; - } else if (content.info && - content.info.mimetype == "image/svg+xml" && - content.info.thumbnail_url) { + } else if (content.info && content.info.mimetype === "image/svg+xml" && content.info.thumbnail_url) { // special case to return client-generated thumbnails for SVGs, if any, // given we deliberately don't thumbnail them serverside to prevent // billion lol attacks and similar @@ -299,7 +294,7 @@ export default class extends React.Component { // which has the same width as the timeline // mx_MImageBody_thumbnail resizes img to exactly container size img = {content.body} +
{ /* Calculate aspect ratio, using %padding will size _container correctly */ } -
+
{ showPlaceholder &&
{ placeholder }