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

name collapsedRhs consistently everywhere

pull/21833/head
Bruno Windels 2018-12-17 15:30:39 +01:00
parent 65f9bc9754
commit f7b6e9c6fc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/LoggedInView.js
View File

@ -438,7 +438,7 @@ const LoggedInView = React.createClass({
eventPixelOffset={this.props.initialEventPixelOffset} eventPixelOffset={this.props.initialEventPixelOffset}
key={this.props.currentRoomId || 'roomview'} key={this.props.currentRoomId || 'roomview'}
disabled={this.props.middleDisabled} disabled={this.props.middleDisabled}
collapsedRhs={this.props.collapseRhs} collapsedRhs={this.props.collapsedRhs}
ConferenceHandler={this.props.ConferenceHandler} ConferenceHandler={this.props.ConferenceHandler}
/>; />;
break; break;
@ -488,7 +488,7 @@ const LoggedInView = React.createClass({
page_element = <GroupView page_element = <GroupView
groupId={this.props.currentGroupId} groupId={this.props.currentGroupId}
isNew={this.props.currentGroupIsNew} isNew={this.props.currentGroupIsNew}
collapsedRhs={this.props.collapseRhs} collapsedRhs={this.props.collapsedRhs}
/>; />;
break; break;
} }

10
src/components/structures/MatrixChat.js
View File

@ -161,7 +161,7 @@ export default React.createClass({
viewUserId: null, viewUserId: null,
collapseLhs: false, collapseLhs: false,
collapseRhs: false, collapsedRhs: false,
leftDisabled: false, leftDisabled: false,
middleDisabled: false, middleDisabled: false,
rightDisabled: false, rightDisabled: false,
@ -555,7 +555,7 @@ export default React.createClass({
break; break;
case 'view_user': case 'view_user':
// FIXME: ugly hack to expand the RightPanel and then re-dispatch. // FIXME: ugly hack to expand the RightPanel and then re-dispatch.
if (this.state.collapseRhs) { if (this.state.collapsedRhs) {
setTimeout(()=>{ setTimeout(()=>{
dis.dispatch({ dis.dispatch({
action: 'show_right_panel', action: 'show_right_panel',
@ -657,12 +657,12 @@ export default React.createClass({
break; break;
case 'hide_right_panel': case 'hide_right_panel':
this.setState({ this.setState({
collapseRhs: true, collapsedRhs: true,
}); });
break; break;
case 'show_right_panel': case 'show_right_panel':
this.setState({ this.setState({
collapseRhs: false, collapsedRhs: false,
}); });
break; break;
case 'panel_disable': { case 'panel_disable': {
@ -1217,7 +1217,7 @@ export default React.createClass({
view: VIEWS.LOGIN, view: VIEWS.LOGIN,
ready: false, ready: false,
collapseLhs: false, collapseLhs: false,
collapseRhs: false, collapsedRhs: false,
currentRoomId: null, currentRoomId: null,
page_type: PageTypes.RoomDirectory, page_type: PageTypes.RoomDirectory,
}); });