imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #872 from matrix-org/dbkr/fix_left_panel

Browse source 
Fix this/self fail in LeftPanel
This commit is contained in:
David Baker 2017-05-08 16:40:17 +01:00 • committed by GitHub
commit c01e8e85ac
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/rooms/RoomList.js
View file

@ -652,7 +652,7 @@ module.exports = React.createClass({
<RoomSubList list={ self.state.lists['m.favourite'] } <RoomSubList list={ self.state.lists['m.favourite'] }
label="Favourites" label="Favourites"
tagName="m.favourite" tagName="m.favourite"
emptyContent={this._getEmptyContent('m.favourite')} emptyContent={self._getEmptyContent('m.favourite')}
editable={ true } editable={ true }
order="manual" order="manual"
incomingCall={ self.state.incomingCall } incomingCall={ self.state.incomingCall }
@ -665,8 +665,8 @@ module.exports = React.createClass({
<RoomSubList list={ self.state.lists['im.vector.fake.direct'] } <RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
label="People" label="People"
tagName="im.vector.fake.direct" tagName="im.vector.fake.direct"
emptyContent={this._getEmptyContent('im.vector.fake.direct')} emptyContent={self._getEmptyContent('im.vector.fake.direct')}
headerItems={this._getHeaderItems('im.vector.fake.direct')} headerItems={self._getHeaderItems('im.vector.fake.direct')}
editable={ true } editable={ true }
order="recent" order="recent"
incomingCall={ self.state.incomingCall } incomingCall={ self.state.incomingCall }
@ -681,8 +681,8 @@ module.exports = React.createClass({
label="Rooms" label="Rooms"
tagName="im.vector.fake.recent" tagName="im.vector.fake.recent"
editable={ true } editable={ true }
emptyContent={this._getEmptyContent('im.vector.fake.recent')} emptyContent={self._getEmptyContent('im.vector.fake.recent')}
headerItems={this._getHeaderItems('im.vector.fake.recent')} headerItems={self._getHeaderItems('im.vector.fake.recent')}
order="recent" order="recent"
incomingCall={ self.state.incomingCall } incomingCall={ self.state.incomingCall }
collapsed={ self.props.collapsed } collapsed={ self.props.collapsed }
@ -697,7 +697,7 @@ module.exports = React.createClass({
key={ tagName } key={ tagName }
label={ tagName } label={ tagName }
tagName={ tagName } tagName={ tagName }
emptyContent={this._getEmptyContent(tagName)} emptyContent={self._getEmptyContent(tagName)}
editable={ true } editable={ true }
order="manual" order="manual"
incomingCall={ self.state.incomingCall } incomingCall={ self.state.incomingCall }
@ -713,7 +713,7 @@ module.exports = React.createClass({
<RoomSubList list={ self.state.lists['m.lowpriority'] } <RoomSubList list={ self.state.lists['m.lowpriority'] }
label="Low priority" label="Low priority"
tagName="m.lowpriority" tagName="m.lowpriority"
emptyContent={this._getEmptyContent('m.lowpriority')} emptyContent={self._getEmptyContent('m.lowpriority')}
editable={ true } editable={ true }
order="recent" order="recent"
incomingCall={ self.state.incomingCall } incomingCall={ self.state.incomingCall }