Skip to content

Commit

Permalink
Merge pull request RocketChat#225 from assistify/feature/RocketChat#222
Browse files Browse the repository at this point in the history
…-custom-roomtypes-icon

The function is already used to pick the icon in the side nav
  • Loading branch information
mrsimpson committed Feb 15, 2018
2 parents e477509 + 3e2cb4c commit 7ffc193
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/rocketchat-ui/client/components/header/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Template.header.helpers({
avatarBackground() {
const roomData = Session.get(`roomData${ this._id }`);
if (!roomData) { return ''; }
return RocketChat.roomTypes.getSecondaryRoomName(roomData.t, roomData) || RocketChat.roomTypes.getRoomName(roomData.t, roomData) ;
return RocketChat.roomTypes.getSecondaryRoomName(roomData.t, roomData) || RocketChat.roomTypes.getRoomName(roomData.t, roomData);
},
buttons() {
return RocketChat.TabBar.getButtons();
Expand All @@ -32,7 +32,7 @@ Template.header.helpers({
},

isDirect() {
return RocketChat.models.Rooms.findOne(this._id).t === 'd' ;
return RocketChat.models.Rooms.findOne(this._id).t === 'd';
},

roomName() {
Expand Down Expand Up @@ -66,8 +66,8 @@ Template.header.helpers({
return 'hashtag';
case 'l':
return 'livechat';
default :
return null;
default:
return RocketChat.roomTypes.getIcon(roomType);
}
},

Expand Down

0 comments on commit 7ffc193

Please sign in to comment.