Fix channel invite button on channel intro message and fix empty channel invite modal.

Этот коммит содержится в:
JoramWilander
2015-11-11 12:53:18 -05:00
родитель e32b92052e
Коммит 782709aa56
4 изменённых файлов: 23 добавлений и 18 удалений

Просмотреть файл

@@ -9,15 +9,15 @@ const ChannelStore = require('../stores/channel_store.jsx');
const Constants = require('../utils/constants.jsx');
const TeamStore = require('../stores/team_store.jsx');
export function createChannelIntroMessage(channel) {
export function createChannelIntroMessage(channel, showInviteModal) {
if (channel.type === 'D') {
return createDMIntroMessage(channel);
return createDMIntroMessage(channel, showInviteModal);
} else if (ChannelStore.isDefault(channel)) {
return createDefaultIntroMessage(channel);
} else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
return createOffTopicIntroMessage(channel);
return createOffTopicIntroMessage(channel, showInviteModal);
} else if (channel.type === 'O' || channel.type === 'P') {
return createStandardIntroMessage(channel);
return createStandardIntroMessage(channel, showInviteModal);
}
}
@@ -71,7 +71,7 @@ export function createDMIntroMessage(channel) {
);
}
export function createOffTopicIntroMessage(channel) {
export function createOffTopicIntroMessage(channel, showInviteModal) {
return (
<div className='channel-intro'>
<h4 className='channel-intro__title'>{'Beginning of ' + channel.display_name}</h4>
@@ -91,10 +91,9 @@ export function createOffTopicIntroMessage(channel) {
<i className='fa fa-pencil'></i>{'Set a header'}
</a>
<a
className='intro-links'
role='menuitem'
href='#'
data-toggle='modal'
data-target='#channel_invite'
onClick={showInviteModal}
>
<i className='fa fa-user-plus'></i>{'Invite others to this channel'}
</a>
@@ -155,7 +154,7 @@ export function createDefaultIntroMessage(channel) {
);
}
export function createStandardIntroMessage(channel) {
export function createStandardIntroMessage(channel, showInviteModal) {
var uiName = channel.display_name;
var creatorName = '';
@@ -206,14 +205,12 @@ export function createStandardIntroMessage(channel) {
<i className='fa fa-pencil'></i>{'Set a header'}
</a>
<a
className='intro-links'
role='menuitem'
href='#'
data-toggle='modal'
data-target='#channel_invite'
onClick={showInviteModal}
>
<i className='fa fa-user-plus'></i>{'Invite others to this ' + uiType}
</a>
</div>
);
}