dont set initial phase, show panel when collapsed
parent
f7b6e9c6fc
commit
a734fb9d35
|
@ -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">
|
||||||
|
|
|
@ -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',
|
||||||
});
|
});
|
||||||
|
|
|
@ -424,7 +424,7 @@ module.exports = React.createClass({
|
||||||
{ saveButton }
|
{ saveButton }
|
||||||
{ cancelButton }
|
{ cancelButton }
|
||||||
{ rightRow }
|
{ rightRow }
|
||||||
<RoomHeaderButtons />
|
<RoomHeaderButtons collapsedRhs={this.props.collapsedRhs} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue