From aa7ddfe86ebc076f0dc8c6b324a94f2271bc5427 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Jun 2017 15:47:40 +0100
Subject: [PATCH] Remove unused collapse_rhs
Remove all the places we pass collapse_rhs through to places it's
never used. Remove the commented RHS collapse button from
SimpleRoomHeader.
---
src/components/structures/LoggedInView.js | 2 --
src/components/structures/UserSettings.js | 4 ----
.../views/rooms/SimpleRoomHeader.js | 23 -------------------
3 files changed, 29 deletions(-)
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 8fa35e84d7..8b0bcaad68 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -239,7 +239,6 @@ export default React.createClass({
page_element = <UserSettings
onClose={this.props.onUserSettingsClose}
brand={this.props.config.brand}
- collapsedRhs={this.props.collapse_rhs}
enableLabs={this.props.config.enableLabs}
referralBaseUrl={this.props.config.referralBaseUrl}
teamToken={this.props.teamToken}
@@ -270,7 +269,6 @@ export default React.createClass({
this.props.config.teamServerConfig.teamServerURL : null;
page_element = <HomePage
- collapsedRhs={this.props.collapse_rhs}
teamServerUrl={teamServerUrl}
teamToken={this.props.teamToken}
homePageUrl={this.props.config.welcomePageUrl}
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 5ac2e77256..fc13f0bdcf 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -169,9 +169,6 @@ module.exports = React.createClass({
// The base URL to use in the referral link. Defaults to window.location.origin.
referralBaseUrl: React.PropTypes.string,
- // true if RightPanel is collapsed
- collapsedRhs: React.PropTypes.bool,
-
// Team token for the referral link. If falsy, the referral section will
// not appear
teamToken: React.PropTypes.string,
@@ -1164,7 +1161,6 @@ module.exports = React.createClass({
<div className="mx_UserSettings">
<SimpleRoomHeader
title={ _t("Settings") }
- collapsedRhs={ this.props.collapsedRhs }
onCancelClick={ this.props.onClose }
/>
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index 44ec7c29aa..8c06d71b6f 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -14,10 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import React from 'react';
-import dis from '../../../dispatcher';
import AccessibleButton from '../elements/AccessibleButton';
import sdk from '../../../index';
import { _t } from '../../../languageHandler';
@@ -45,17 +42,10 @@ export default React.createClass({
title: React.PropTypes.string,
onCancelClick: React.PropTypes.func,
- // is the RightPanel collapsed?
- collapsedRhs: React.PropTypes.bool,
-
// `src` to a TintableSvg. Optional.
icon: React.PropTypes.string,
},
- onShowRhsClick: function(ev) {
- dis.dispatch({ action: 'show_right_panel' });
- },
-
render: function() {
let cancelButton;
let icon;
@@ -70,25 +60,12 @@ export default React.createClass({
/>;
}
- let showRhsButton;
- /* // don't bother cluttering things up with this for now.
- const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
- if (this.props.collapsedRhs) {
- showRhsButton =
- <div className="mx_RoomHeader_button" style={{ float: 'right' }} onClick={this.onShowRhsClick} title=">">
- <TintableSvg src="img/minimise.svg" width="10" height="16"/>
- </div>
- }
- */
-
return (
<div className="mx_RoomHeader" >
<div className="mx_RoomHeader_wrapper">
<div className="mx_RoomHeader_simpleHeader">
{ icon }
{ this.props.title }
- { showRhsButton }
{ cancelButton }
</div>
</div>