diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-24 20:04:40 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-29 09:54:55 -0400 |
commit | 5ce1a4368bafbd2ed50b1953658fca285cfd349b (patch) | |
tree | 9609d2ee90371ee0393a95f5fe67d27b5621257c /webapp/utils | |
parent | bf636404d25e943d869a32d8fe145eaa57a64039 (diff) | |
download | chat-5ce1a4368bafbd2ed50b1953658fca285cfd349b.tar.gz chat-5ce1a4368bafbd2ed50b1953658fca285cfd349b.tar.bz2 chat-5ce1a4368bafbd2ed50b1953658fca285cfd349b.zip |
Refactoring center panel away. Moving tutorial to a route. Fixing a
bunch of bugs.
Diffstat (limited to 'webapp/utils')
-rw-r--r-- | webapp/utils/utils.jsx | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index ac12edb82..dcf0cf740 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -169,7 +169,7 @@ export function notifyMe(title, body, channel) { notification.onclick = () => { window.focus(); if (channel) { - switchChannel(channel); + GlobalActions.emitChannelClickEvent(channel); } else { browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square'); } @@ -957,24 +957,6 @@ export function isValidUsername(name) { return error; } -export function updateAddressBar(channelName) { - const teamURL = TeamStore.getCurrentTeamUrl(); - history.replaceState('data', '', teamURL + '/channels/' + channelName); -} - -export function switchChannel(channel) { - GlobalActions.emitChannelClickEvent(channel); - - updateAddressBar(channel.name); - - $('.inner-wrap').removeClass('move--right'); - $('.sidebar--left').removeClass('move--right'); - - client.trackPage(); - - return false; -} - export function isMobile() { return screen.width <= 768; } @@ -1253,7 +1235,7 @@ export function importSlack(file, success, error) { } export function getTeamURLFromAddressBar() { - return window.location.href.split('/channels')[0]; + return window.location.origin + '/' + window.location.pathname.split('/')[1]; } export function getShortenedTeamURL() { |