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

dont set initial phase, show panel when collapsed

pull/21833/head
Bruno Windels 2018-12-17 15:55:26 +01:00
parent f7b6e9c6fc
commit a734fb9d35
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/GroupView.js
View File

@ -1311,7 +1311,7 @@ export default React.createClass({
<div className="mx_GroupView_header_rightCol"> <div className="mx_GroupView_header_rightCol">
{ rightButtons } { rightButtons }
</div> </div>
<GroupHeaderButtons /> <GroupHeaderButtons collapsedRhs={this.props.collapsedRhs} />
</div> </div>
<MainSplit collapsedRhs={this.props.collapsedRhs} panel={rightPanel}> <MainSplit collapsedRhs={this.props.collapsedRhs} panel={rightPanel}>
<GeminiScrollbarWrapper className="mx_GroupView_body"> <GeminiScrollbarWrapper className="mx_GroupView_body">

4
src/components/views/right_panel/HeaderButtons.js
View File

@ -25,7 +25,7 @@ export default class HeaderButtons extends React.Component {
super(props); super(props);
this.state = { this.state = {
phase: initialPhase, phase: props.collapsedRhs ? null : initialPhase,
isUserPrivilegedInGroup: null, isUserPrivilegedInGroup: null,
}; };
this.onAction = this.onAction.bind(this); this.onAction = this.onAction.bind(this);
@ -58,7 +58,7 @@ export default class HeaderButtons extends React.Component {
phase: null, phase: null,
}); });
} else { } else {
if (!this.state.phase) { if (this.props.collapsedRhs) {
dis.dispatch({ dis.dispatch({
action: 'show_right_panel', action: 'show_right_panel',
}); });

2
src/components/views/rooms/RoomHeader.js
View File

@ -424,7 +424,7 @@ module.exports = React.createClass({
{ saveButton } { saveButton }
{ cancelButton } { cancelButton }
{ rightRow } { rightRow }
<RoomHeaderButtons /> <RoomHeaderButtons collapsedRhs={this.props.collapsedRhs} />
</div> </div>
</div> </div>
); );