Merge branch 'luke/room-directory-remove-rhs' into luke/room-directory-improve

This commit is contained in:
Luke Barnard 2017-04-27 17:57:19 +01:00
commit 791f7f7f6b

View File

@ -221,10 +221,8 @@ export default React.createClass({
case PageTypes.RoomDirectory: case PageTypes.RoomDirectory:
page_element = <RoomDirectory page_element = <RoomDirectory
ref="roomDirectory" ref="roomDirectory"
collapsedRhs={this.props.collapse_rhs}
config={this.props.config.roomDirectory} config={this.props.config.roomDirectory}
/>; />;
if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
break; break;
case PageTypes.HomePage: case PageTypes.HomePage: