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

Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips

Browse source 
Show People/Rooms emptySubListTip even when total rooms !== 0
This commit is contained in:
Luke Barnard 2017-06-02 11:10:48 +01:00 • committed by GitHub
commit be7c2612e8
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -510,26 +510,26 @@ module.exports = React.createClass({
const StartChatButton = sdk.getComponent('elements.StartChatButton'); const StartChatButton = sdk.getComponent('elements.StartChatButton');
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton'); const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton'); const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
if (this.state.totalRoomCount === 0) {
const TintableSvg = sdk.getComponent('elements.TintableSvg'); const TintableSvg = sdk.getComponent('elements.TintableSvg');
switch (section) { switch (section) {
case 'im.vector.fake.direct': case 'im.vector.fake.direct':
return <div className="mx_RoomList_emptySubListTip"> return <div className="mx_RoomList_emptySubListTip">
Press Press
<StartChatButton size="16" callout={true}/> <StartChatButton size="16" callout={true}/>
to start a chat with someone to start a chat with someone
</div>; </div>;
case 'im.vector.fake.recent': case 'im.vector.fake.recent':
return <div className="mx_RoomList_emptySubListTip"> return <div className="mx_RoomList_emptySubListTip">
You're not in any rooms yet! Press You're not in any rooms yet! Press
<CreateRoomButton size="16" callout={true}/> <CreateRoomButton size="16" callout={true}/>
to make a room or to make a room or
<RoomDirectoryButton size="16" callout={true}/> <RoomDirectoryButton size="16" callout={true}/>
to browse the directory to browse the directory
</div>; </div>;
}
} }
// We don't want to display drop targets if there are no room tiles to drag'n'drop
if (this.state.totalRoomCount === 0) { if (this.state.totalRoomCount === 0) {
return null; return null;
} }