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

constistent jsx bracket and indent styling

Browse source
This commit is contained in:
Bruno Windels 2019-07-08 10:12:26 +02:00
parent cf11a3758f
commit 1af2ca6b36
2 changed files with 41 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
View file

@ -73,15 +73,18 @@ export default class ConfirmAndWaitRedactDialog extends React.PureComponent {
} else { } else {
const BaseDialog = sdk.getComponent("dialogs.BaseDialog"); const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
const Spinner = sdk.getComponent('elements.Spinner'); const Spinner = sdk.getComponent('elements.Spinner');
return (<BaseDialog return (
onFinished={this.props.onFinished} <BaseDialog
hasCancel={false} onFinished={this.props.onFinished}
title={_t("Removing…")}><Spinner /></BaseDialog> hasCancel={false}
title={_t("Removing…")}>
<Spinner />
</BaseDialog>
); );
} }
} else { } else {
const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog"); const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
return (<ConfirmRedactDialog onFinished={this.onParentFinished} />); return <ConfirmRedactDialog onFinished={this.onParentFinished} />;
} }
} }
} }

56
src/components/views/messages/EditHistoryMessage.js
View file

@ -95,18 +95,24 @@ export default class EditHistoryMessage extends React.PureComponent {
// hide the button when already redacted // hide the button when already redacted
let redactButton; let redactButton;
if (!this.props.mxEvent.isRedacted()) { if (!this.props.mxEvent.isRedacted()) {
redactButton = (<AccessibleButton onClick={this._onRedactClick} disabled={!this.state.canRedact}> redactButton = (
{_t("Remove")} <AccessibleButton onClick={this._onRedactClick} disabled={!this.state.canRedact}>
</AccessibleButton>); {_t("Remove")}
</AccessibleButton>
);
} }
const viewSourceButton = (<AccessibleButton onClick={this._onViewSourceClick}> const viewSourceButton = (
<AccessibleButton onClick={this._onViewSourceClick}>
{_t("View Source")} {_t("View Source")}
</AccessibleButton>); </AccessibleButton>
);
// disabled remove button when not allowed // disabled remove button when not allowed
return (<div className="mx_MessageActionBar"> return (
{redactButton} <div className="mx_MessageActionBar">
{viewSourceButton} {redactButton}
</div>); {viewSourceButton}
</div>
);
} }
render() { render() {
@ -117,15 +123,17 @@ export default class EditHistoryMessage extends React.PureComponent {
let contentContainer; let contentContainer;
if (mxEvent.isRedacted()) { if (mxEvent.isRedacted()) {
const UnknownBody = sdk.getComponent('messages.UnknownBody'); const UnknownBody = sdk.getComponent('messages.UnknownBody');
contentContainer = (<UnknownBody mxEvent={this.props.mxEvent} />); contentContainer = <UnknownBody mxEvent={this.props.mxEvent} />;
} else if (mxEvent.getContent().msgtype === "m.emote") { } else if (mxEvent.getContent().msgtype === "m.emote") {
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender(); const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
contentContainer = (<div className="mx_EventTile_content" ref="content">*&nbsp; contentContainer = (
<span className="mx_MEmoteBody_sender">{ name }</span> <div className="mx_EventTile_content" ref="content">*&nbsp;
&nbsp;{contentElements} <span className="mx_MEmoteBody_sender">{ name }</span>
</div>); &nbsp;{contentElements}
</div>
);
} else { } else {
contentContainer = (<div className="mx_EventTile_content" ref="content">{contentElements}</div>); contentContainer = <div className="mx_EventTile_content" ref="content">{contentElements}</div>;
} }
const timestamp = formatTime(new Date(mxEvent.getTs()), this.props.isTwelveHour); const timestamp = formatTime(new Date(mxEvent.getTs()), this.props.isTwelveHour);
const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.state.sendStatus) !== -1); 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_sending": isSending,
"mx_EventTile_notSent": this.state.sendStatus === 'not_sent', "mx_EventTile_notSent": this.state.sendStatus === 'not_sent',
}); });
return <li> return (
<div className={classes}> <li>
<div className="mx_EventTile_line"> <div className={classes}>
<span className="mx_MessageTimestamp">{timestamp}</span> <div className="mx_EventTile_line">
{ contentContainer } <span className="mx_MessageTimestamp">{timestamp}</span>
{ this._renderActionBar() } { contentContainer }
{ this._renderActionBar() }
</div>
</div> </div>
</div> </li>
</li>; );
} }
} }