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

Merge pull request #2541 from matrix-org/bwindels/allowlhsexpandwithnarrowviewport 

Allow expanding the left panel manually when in narrow mode
pull/21833/head
Bruno Windels 2019-01-31 12:01:58 +00:00 committed by GitHub
parent 60f28266ae 0450f43267
commit 73b16dd526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,9 +164,11 @@ const LoggedInView = React.createClass({
const collapseConfig = { const collapseConfig = {
toggleSize: 260 - 50, toggleSize: 260 - 50,
onCollapsed: (collapsed) => { onCollapsed: (collapsed) => {
this.setState({collapseLhs: collapsed});
if (collapsed) { if (collapsed) {
dis.dispatch({action: "hide_left_panel"}, true);
window.localStorage.setItem("mx_lhs_size", '0'); window.localStorage.setItem("mx_lhs_size", '0');
} else {
dis.dispatch({action: "show_left_panel"}, true);
} }
}, },
onResized: (size) => { onResized: (size) => {
@ -540,7 +542,7 @@ const LoggedInView = React.createClass({
<div ref={this._setResizeContainerRef} className={bodyClasses}> <div ref={this._setResizeContainerRef} className={bodyClasses}>
<LeftPanel <LeftPanel
toolbarShown={!!topBar} toolbarShown={!!topBar}
collapsed={this.props.collapseLhs || this.state.collapseLhs || false} collapsed={this.props.collapseLhs || false}
disabled={this.props.leftDisabled} disabled={this.props.leftDisabled}
/> />
<ResizeHandle /> <ResizeHandle />

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

@ -161,7 +161,7 @@ export default React.createClass({
// If we're trying to just view a user ID (i.e. /user URL), this is it // If we're trying to just view a user ID (i.e. /user URL), this is it
viewUserId: null, viewUserId: null,
// this is persisted as mx_lhs_size, loaded in LoggedInView
collapseLhs: false, collapseLhs: false,
collapsedRhs: window.localStorage.getItem("mx_rhs_collapsed") === "true", collapsedRhs: window.localStorage.getItem("mx_rhs_collapsed") === "true",
leftDisabled: false, leftDisabled: false,