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

put RightPanel as sibling of .mx_RoomView_body instead of RoomView

Browse source
This commit is contained in:
Bruno Windels 2018-10-30 18:13:17 +01:00
parent 790299f2d2
commit a40f1933f2
5 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/LoggedInView.js
View file

@ -418,7 +418,6 @@ const LoggedInView = React.createClass({
render: function() {
const LeftPanel = sdk.getComponent('structures.LeftPanel');
const RightPanel = sdk.getComponent('structures.RightPanel');
const RoomView = sdk.getComponent('structures.RoomView');
const UserSettings = sdk.getComponent('structures.UserSettings');
const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
@ -449,9 +448,6 @@ const LoggedInView = React.createClass({
collapsedRhs={this.props.collapseRhs}
ConferenceHandler={this.props.ConferenceHandler}
/>;
if (!this.props.collapseRhs) {
right_panel = <RightPanel roomId={this.props.currentRoomId} disabled={this.props.rightDisabled} />;
}
break;
case PageTypes.UserSettings:
@ -562,7 +558,6 @@ const LoggedInView = React.createClass({
<main className='mx_MatrixChat_middlePanel'>
{ page_element }
</main>
<ResizeHandle reverse={true}/>
{ right_panel }
</div>
</DragDropContext>