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

Separate classes for the different buttons

Browse source 
Also rename RoleButton to ActionButton because it's not being
given a Role any more.

Conflicts:
	src/component-index.js

cherry-picking commit 4a5821e.
This commit is contained in:
David Baker 2017-05-05 14:25:18 +01:00 • committed by Luke Barnard
parent dc2274df54
commit 9337158a47
7 changed files with 204 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -517,22 +517,24 @@ module.exports = React.createClass({
return <RoomDropTarget label="" />;
}
const RoleButton = sdk.getComponent('elements.RoleButton');
const StartChatButton = sdk.getComponent('elements.StartChatButton');
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
if (this.state.totalRoomCount === 0) {
const TintableSvg = sdk.getComponent('elements.TintableSvg');
switch (section) {
case 'im.vector.fake.direct':
return <div className="mx_RoomList_emptySubListTip">
Press
<RoleButton role='start_chat' size="16" />
<StartChatButton size="16" />
to start a chat with someone
</div>;
case 'im.vector.fake.recent':
return <div className="mx_RoomList_emptySubListTip">
You're not in any rooms yet! Press
<RoleButton role='create_room' size="16" />
<CreateRoomButton size="16" />
to make a room or
<RoleButton role='room_directory' size="16" />
<RoomDirectoryButton size="16" />
to browse the directory
</div>;
}
@ -544,16 +546,18 @@ module.exports = React.createClass({
},
_getHeaderItems: function(section) {
const RoleButton = sdk.getComponent('elements.RoleButton');
const StartChatButton = sdk.getComponent('elements.StartChatButton');
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
switch (section) {
case 'im.vector.fake.direct':
return <span className="mx_RoomList_headerButtons">
<RoleButton role='start_chat' size="16" />
<StartChatButton role='start_chat' size="16" />
</span>;
case 'im.vector.fake.recent':
return <span className="mx_RoomList_headerButtons">
<RoleButton role='room_directory' size="16" />
<RoleButton role='create_room' size="16" />
<RoomDirectoryButton role='room_directory' size="16" />
<CreateRoomButton role='create_room' size="16" />
</span>;
}
},