From 1af2ca6b36b32c2505a1ee429a134ac7c4145abf Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Jul 2019 10:12:26 +0200 Subject: [PATCH] constistent jsx bracket and indent styling --- .../dialogs/ConfirmAndWaitRedactDialog.js | 13 +++-- .../views/messages/EditHistoryMessage.js | 56 +++++++++++-------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js index 5fd5129550..db00f445a8 100644 --- a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js +++ b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js @@ -73,15 +73,18 @@ export default class ConfirmAndWaitRedactDialog extends React.PureComponent { } else { const BaseDialog = sdk.getComponent("dialogs.BaseDialog"); const Spinner = sdk.getComponent('elements.Spinner'); - return ( + return ( + + + ); } } else { const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog"); - return (); + return ; } } } diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js index c873ebbcb2..797e010aae 100644 --- a/src/components/views/messages/EditHistoryMessage.js +++ b/src/components/views/messages/EditHistoryMessage.js @@ -95,18 +95,24 @@ export default class EditHistoryMessage extends React.PureComponent { // hide the button when already redacted let redactButton; if (!this.props.mxEvent.isRedacted()) { - redactButton = ( - {_t("Remove")} - ); + redactButton = ( + + {_t("Remove")} + + ); } - const viewSourceButton = ( + const viewSourceButton = ( + {_t("View Source")} - ); + + ); // disabled remove button when not allowed - return (
- {redactButton} - {viewSourceButton} -
); + return ( +
+ {redactButton} + {viewSourceButton} +
+ ); } render() { @@ -117,15 +123,17 @@ export default class EditHistoryMessage extends React.PureComponent { let contentContainer; if (mxEvent.isRedacted()) { const UnknownBody = sdk.getComponent('messages.UnknownBody'); - contentContainer = (); + contentContainer = ; } else if (mxEvent.getContent().msgtype === "m.emote") { const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender(); - contentContainer = (
*  - { name } -  {contentElements} -
); + contentContainer = ( +
*  + { name } +  {contentElements} +
+ ); } else { - contentContainer = (
{contentElements}
); + contentContainer =
{contentElements}
; } const timestamp = formatTime(new Date(mxEvent.getTs()), this.props.isTwelveHour); const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.state.sendStatus) !== -1); @@ -135,14 +143,16 @@ export default class EditHistoryMessage extends React.PureComponent { "mx_EventTile_sending": isSending, "mx_EventTile_notSent": this.state.sendStatus === 'not_sent', }); - return
  • -
    -
    - {timestamp} - { contentContainer } - { this._renderActionBar() } + return ( +
  • +
    +
    + {timestamp} + { contentContainer } + { this._renderActionBar() } +
    - -
  • ; + + ); } }