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

Pull in changes from develop

pull/21833/head
Richard Lewis 2018-02-23 17:30:42 +00:00
parent 891199b739 3552800d19
commit 332892fee6
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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