OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

move room preview bar below timeline

pull/21833/head
Bruno Windels 2019-04-10 17:49:45 +02:00
parent 6c8b93049d
commit 4e8b3c34c0
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/components/structures/RoomView.js
View File

@ -1530,21 +1530,20 @@ module.exports = React.createClass({
e2eStatus={this.state.e2eStatus} e2eStatus={this.state.e2eStatus}
/> />
<div className="mx_RoomView_body"> <div className="mx_RoomView_body">
<div className="mx_RoomView_auxPanel"> <div className="mx_RoomView_auxPanel"></div>
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick}
onRejectClick={this.onRejectThreepidInviteButtonClicked}
canPreview={false} error={this.state.roomLoadError}
roomAlias={roomAlias}
spinner={this.state.joining}
spinnerState="joining"
inviterName={inviterName}
invitedEmail={invitedEmail}
room={this.state.room}
/>
</div>
</div> </div>
<div className="mx_RoomView_messagePanel"></div> <div className="mx_RoomView_messagePanel"></div>
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick}
onRejectClick={this.onRejectThreepidInviteButtonClicked}
canPreview={false} error={this.state.roomLoadError}
roomAlias={roomAlias}
spinner={this.state.joining}
spinnerState="joining"
inviterName={inviterName}
invitedEmail={invitedEmail}
room={this.state.room}
/>
</div> </div>
); );
} }
@ -1578,19 +1577,18 @@ module.exports = React.createClass({
e2eStatus={this.state.e2eStatus} e2eStatus={this.state.e2eStatus}
/> />
<div className="mx_RoomView_body"> <div className="mx_RoomView_body">
<div className="mx_RoomView_auxPanel"> <div className="mx_RoomView_auxPanel"></div>
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick}
onRejectClick={this.onRejectButtonClicked}
inviterName={inviterName}
canPreview={false}
spinner={this.state.joining}
spinnerState="joining"
room={this.state.room}
/>
</div>
</div> </div>
<div className="mx_RoomView_messagePanel"></div> <div className="mx_RoomView_messagePanel"></div>
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick}
onRejectClick={this.onRejectButtonClicked}
inviterName={inviterName}
canPreview={false}
spinner={this.state.joining}
spinnerState="joining"
room={this.state.room}
/>
</div> </div>
); );
} }
@ -1646,6 +1644,7 @@ module.exports = React.createClass({
const hiddenHighlightCount = this._getHiddenHighlightCount(); const hiddenHighlightCount = this._getHiddenHighlightCount();
let aux = null; let aux = null;
let previewBar;
let hideCancel = false; let hideCancel = false;
if (this.state.forwardingEvent !== null) { if (this.state.forwardingEvent !== null) {
aux = <ForwardMessage onCancelClick={this.onCancelClick} />; aux = <ForwardMessage onCancelClick={this.onCancelClick} />;
@ -1673,7 +1672,7 @@ module.exports = React.createClass({
invitedEmail = this.props.thirdPartyInvite.invitedEmail; invitedEmail = this.props.thirdPartyInvite.invitedEmail;
} }
hideCancel = true; hideCancel = true;
aux = ( previewBar = (
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked} <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick} onForgetClick={this.onForgetClick}
onRejectClick={this.onRejectThreepidInviteButtonClicked} onRejectClick={this.onRejectThreepidInviteButtonClicked}
@ -1895,6 +1894,7 @@ module.exports = React.createClass({
{ statusBar } { statusBar }
</div> </div>
</div> </div>
{ previewBar }
{ messageComposer } { messageComposer }
</div> </div>
</MainSplit> </MainSplit>