summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar.jsx
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/components/sidebar.jsx
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/components/sidebar.jsx')
-rw-r--r--web/react/components/sidebar.jsx14
1 files changed, 14 insertions, 0 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 3cf67e410..5b8d6c542 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -7,6 +7,7 @@ var AsyncClient = require('../utils/async_client.jsx');
var SocketStore = require('../stores/socket_store.jsx');
var UserStore = require('../stores/user_store.jsx');
var TeamStore = require('../stores/team_store.jsx');
+var BrowserStore = require('../stores/browser_store.jsx')
var utils = require('../utils/utils.jsx');
var SidebarHeader = require('./sidebar_header.jsx');
var SearchBox = require('./search_bar.jsx');
@@ -197,6 +198,19 @@ module.exports = React.createClass({
if (UserStore.getCurrentId() === msg.user_id) {
AsyncClient.getChannels(true);
}
+ } else if(msg.action === "user_removed") {
+ if(msg.user_id === UserStore.getCurrentId()) {
+ AsyncClient.getChannels(true);
+
+ if(msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) {
+ var sentState = {};
+ sentState.channelName = ChannelStore.getCurrent().display_name;
+ sentState.remover = UserStore.getProfile(msg.props.remover).username;
+
+ BrowserStore.setItem('channel-removed-state',sentState);
+ $('#removed_from_channel').modal('show');
+ }
+ }
}
},
updateTitle: function() {