From e3342e36c0f15e2c267bfd9512b423ae66f2df03 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 25 May 2017 12:07:39 +0100
Subject: [PATCH] Fix RoomSubList (RoomSubListHeader was removed)
---
src/components/structures/RoomSubList.js | 31 ++----------------------
1 file changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index d3e68637..2adf6343 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -555,20 +555,7 @@ var RoomSubList = React.createClass({
return connectDropTarget(
<div>
- <RoomSubListHeader
- ref='header'
- label={ this.props.label }
- tagName={ this.props.tagName }
- roomCount={ roomCount }
- collapsed={ this.props.collapsed }
- hidden={ this.state.hidden }
- incomingCall={ this.props.incomingCall }
- isIncomingCallRoom={ isIncomingCallRoom }
- roomNotificationCount={ this.roomNotificationCount() }
- onClick={ this.onClick }
- onHeaderClick={ this.props.onHeaderClick }
- headerItems={this.props.headerItems}
- />
+ { this._getHeaderJsx() }
{ subList }
</div>
);
@@ -577,21 +564,7 @@ var RoomSubList = React.createClass({
var Loader = sdk.getComponent("elements.Spinner");
return (
<div className="mx_RoomSubList">
- { this.props.alwaysShowHeader ?
- <RoomSubListHeader
- ref='header'
- label={ this.props.label }
- tagName={ this.props.tagName }
- roomCount={ roomCount }
- collapsed={ this.props.collapsed }
- hidden={ this.state.hidden }
- isIncomingCallRoom={ isIncomingCallRoom }
- roomNotificationCount={ this.roomNotificationCount() }
- onClick={ this.onClick }
- onHeaderClick={ this.props.onHeaderClick }
- headerItems={this.props.headerItems}
- />
- : undefined }
+ { this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined }
{ (this.props.showSpinner && !this.state.hidden) ? <Loader /> : undefined }
</div>
);