summaryrefslogtreecommitdiffstats
path: root/web/react/pages
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-07-28 08:49:29 -0400
committerChristopher Speller <crspeller@gmail.com>2015-07-28 08:49:29 -0400
commitde07cdaf299604abed78fcef1c0f9dcfa8835c63 (patch)
tree4684e39c807b2164719e379291d13d9ee8675bca /web/react/pages
parent432e96f52c3c29f2ffa5d4ad50fbbdda5322f0a9 (diff)
parentda6d3556e83b54472f1caa7777ce223988c0655c (diff)
downloadchat-de07cdaf299604abed78fcef1c0f9dcfa8835c63.tar.gz
chat-de07cdaf299604abed78fcef1c0f9dcfa8835c63.tar.bz2
chat-de07cdaf299604abed78fcef1c0f9dcfa8835c63.zip
Merge pull request #239 from nickago/MM-1295
MM-1295 Removal from a channel occurs in real time
Diffstat (limited to 'web/react/pages')
-rw-r--r--web/react/pages/channel.jsx6
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index cc78df120..90d90b29f 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -34,6 +34,7 @@ var MentionList = require('../components/mention_list.jsx');
var ChannelInfoModal = require('../components/channel_info_modal.jsx');
var AccessHistoryModal = require('../components/access_history_modal.jsx');
var ActivityLogModal = require('../components/activity_log_modal.jsx');
+var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx')
var Constants = require('../utils/constants.jsx');
@@ -217,4 +218,9 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
document.getElementById('activity_log_modal')
);
+ React.render(
+ <RemovedFromChannelModal />,
+ document.getElementById('removed_from_channel_modal')
+ );
+
};