From 6097f93704862215791ce8855c31471e40ef0af1 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Fri, 20 Jan 2017 15:45:22 +0100 Subject: Move instances of Client.leaveChannel() in components to an action (#5131) * Move instances of Client.leaveChannel() in components to an action * create isFavoriteChannelId --- webapp/components/navbar.jsx | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'webapp/components/navbar.jsx') diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index 338d4edd1..b54b8701e 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -22,8 +22,6 @@ import PreferenceStore from 'stores/preference_store.jsx'; import ChannelSwitchModal from './channel_switch_modal.jsx'; -import Client from 'client/web_client.jsx'; -import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; import * as ChannelUtils from 'utils/channel_utils.jsx'; import * as ChannelActions from 'actions/channel_actions.jsx'; @@ -37,7 +35,7 @@ import {FormattedMessage} from 'react-intl'; import {Popover, OverlayTrigger} from 'react-bootstrap'; -import {Link, browserHistory} from 'react-router/es6'; +import {Link} from 'react-router/es6'; import React from 'react'; @@ -111,23 +109,7 @@ export default class Navbar extends React.Component { } handleLeave() { - var channelId = this.state.channel.id; - - Client.leaveChannel(channelId, - () => { - ChannelActions.loadChannelsForCurrentUser(); - - if (this.state.isFavorite) { - ChannelActions.unmarkFavorite(channelId); - } - - const townsquare = ChannelStore.getByName('town-square'); - browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + townsquare.name); - }, - (err) => { - AsyncClient.dispatchError(err, 'handleLeave'); - } - ); + ChannelActions.leaveChannel(this.state.channel.id); } hideSidebars(e) { -- cgit v1.2.3-1-g7c22