From d09ace15f24c396fb60809185047adee6db1ab08 Mon Sep 17 00:00:00 2001
From: hmhealey
Date: Thu, 3 Dec 2015 10:31:05 -0500
Subject: Switched ChannelInviteModal to use a ToggleModalButton wherever
possible
---
web/react/utils/channel_intro_mssages.jsx | 38 +++++++++++++++----------------
1 file changed, 19 insertions(+), 19 deletions(-)
(limited to 'web/react/utils')
diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 6f83778c9..312e0d5d6 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -2,6 +2,7 @@
// See License.txt for license information.
import * as Utils from './utils.jsx';
+import ChannelInviteModal from '../components/channel_invite_modal.jsx';
import EditChannelHeaderModal from '../components/edit_channel_header_modal.jsx';
import ToggleModalButton from '../components/toggle_modal_button.jsx';
import UserProfile from '../components/user_profile.jsx';
@@ -10,15 +11,15 @@ import Constants from '../utils/constants.jsx';
import TeamStore from '../stores/team_store.jsx';
import * as EventHelpers from '../dispatcher/event_helpers.jsx';
-export function createChannelIntroMessage(channel, showInviteModal) {
+export function createChannelIntroMessage(channel) {
if (channel.type === 'D') {
return createDMIntroMessage(channel);
} else if (ChannelStore.isDefault(channel)) {
return createDefaultIntroMessage(channel);
} else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
- return createOffTopicIntroMessage(channel, showInviteModal);
+ return createOffTopicIntroMessage(channel);
} else if (channel.type === 'O' || channel.type === 'P') {
- return createStandardIntroMessage(channel, showInviteModal);
+ return createStandardIntroMessage(channel);
}
}
@@ -62,7 +63,7 @@ export function createDMIntroMessage(channel) {
);
}
-export function createOffTopicIntroMessage(channel, showInviteModal) {
+export function createOffTopicIntroMessage(channel) {
return (
{'Beginning of ' + channel.display_name}
@@ -71,13 +72,7 @@ export function createOffTopicIntroMessage(channel, showInviteModal) {
{createSetHeaderButton(channel)}
-
- {'Invite others to this channel'}
-
+ {createInviteChannelMemberButton(channel, 'channel')}
);
}
@@ -122,7 +117,7 @@ export function createDefaultIntroMessage(channel) {
);
}
-export function createStandardIntroMessage(channel, showInviteModal) {
+export function createStandardIntroMessage(channel) {
var uiName = channel.display_name;
var creatorName = '';
@@ -162,17 +157,22 @@ export function createStandardIntroMessage(channel, showInviteModal) {
{createSetHeaderButton(channel)}
-
- {'Invite others to this ' + uiType}
-
+ {createInviteChannelMemberButton(channel, uiType)}
);
}
+function createInviteChannelMemberButton(channel, uiType) {
+ return (
+
+ {'Invite others to this ' + uiType}
+
+ );
+}
+
function createSetHeaderButton(channel) {
return (