1 files changed, 0 insertions, 99 deletions

diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx
index 93f800814..ee199fc03 100644
--- a/webapp/components/navbar.jsx
+++ b/webapp/components/navbar.jsx
@@ -17,7 +17,6 @@ import ToggleModalButton from './toggle_modal_button.jsx';
 import UserStore from 'stores/user_store.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import TeamStore from 'stores/team_store.jsx';
-import PreferenceStore from 'stores/preference_store.jsx';
 
 import Client from 'utils/web_client.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
@@ -35,8 +34,6 @@ import {Link, browserHistory} from 'react-router';
 
 import React from 'react';
 
-import * as ChannelActions from 'actions/channel_actions.jsx';
-
 export default class Navbar extends React.Component {
     constructor(props) {
         super(props);
@@ -53,11 +50,6 @@ export default class Navbar extends React.Component {
         this.createCollapseButtons = this.createCollapseButtons.bind(this);
         this.createDropdown = this.createDropdown.bind(this);
 
-        this.navigateChannelShortcut = this.navigateChannelShortcut.bind(this);
-        this.navigateUnreadChannelShortcut = this.navigateUnreadChannelShortcut.bind(this);
-        this.getDisplayedChannels = this.getDisplayedChannels.bind(this);
-        this.compareByDisplayName = this.compareByDisplayName.bind(this);
-
         const state = this.getStateFromStores();
         state.showEditChannelPurposeModal = false;
         state.showEditChannelHeaderModal = false;
@@ -80,14 +72,10 @@ export default class Navbar extends React.Component {
         ChannelStore.addChangeListener(this.onChange);
         ChannelStore.addExtraInfoChangeListener(this.onChange);
         $('.inner-wrap').click(this.hideSidebars);
-        document.addEventListener('keydown', this.navigateChannelShortcut);
-        document.addEventListener('keydown', this.navigateUnreadChannelShortcut);
     }
     componentWillUnmount() {
         ChannelStore.removeChangeListener(this.onChange);
         ChannelStore.removeExtraInfoChangeListener(this.onChange);
-        document.removeEventListener('keydown', this.navigateChannelShortcut);
-        document.removeEventListener('keydown', this.navigateUnreadChannelShortcut);
     }
     handleSubmit(e) {
         e.preventDefault();
@@ -162,93 +150,6 @@ export default class Navbar extends React.Component {
             showRenameChannelModal: false
         });
     }
-    navigateChannelShortcut(e) {
-        if (e.altKey && !e.shiftKey && (e.keyCode === Constants.KeyCodes.UP || e.keyCode === Constants.KeyCodes.DOWN)) {
-            e.preventDefault();
-            const allChannels = this.getDisplayedChannels();
-            const curChannel = this.state.channel;
-            let curIndex = -1;
-            for (let i = 0; i < allChannels.length; i++) {
-                if (allChannels[i].id === curChannel.id) {
-                    curIndex = i;
-                }
-            }
-            let nextChannel = curChannel;
-            let nextIndex = curIndex;
-            if (e.keyCode === Constants.KeyCodes.DOWN) {
-                nextIndex = curIndex + 1;
-            } else if (e.keyCode === Constants.KeyCodes.UP) {
-                nextIndex = curIndex - 1;
-            }
-            nextChannel = allChannels[Utils.mod(nextIndex, allChannels.length)];
-            ChannelActions.goToChannel(nextChannel);
-        }
-    }
-    navigateUnreadChannelShortcut(e) {
-        if (e.altKey && e.shiftKey && (e.keyCode === Constants.KeyCodes.UP || e.keyCode === Constants.KeyCodes.DOWN)) {
-            e.preventDefault();
-            const allChannels = this.getDisplayedChannels();
-            const curChannel = this.state.channel;
-            let curIndex = -1;
-            for (let i = 0; i < allChannels.length; i++) {
-                if (allChannels[i].id === curChannel.id) {
-                    curIndex = i;
-                }
-            }
-            let nextChannel = curChannel;
-            let nextIndex = curIndex;
-            let count = 0;
-            let increment = 0;
-            if (e.keyCode === Constants.KeyCodes.UP) {
-                increment = -1;
-            } else if (e.keyCode === Constants.KeyCodes.DOWN) {
-                increment = 1;
-            }
-            let unreadCounts = ChannelStore.getUnreadCount(allChannels[nextIndex].id);
-            while (count < allChannels.length && unreadCounts.msgs === 0 && unreadCounts.mentions === 0) {
-                nextIndex += increment;
-                count++;
-                nextIndex = Utils.mod(nextIndex, allChannels.length);
-                unreadCounts = ChannelStore.getUnreadCount(allChannels[nextIndex].id);
-            }
-            if (unreadCounts.msgs !== 0 || unreadCounts.mentions !== 0) {
-                nextChannel = allChannels[nextIndex];
-                ChannelActions.goToChannel(nextChannel);
-            }
-        }
-    }
-    getDisplayedChannels() {
-        const allChannels = ChannelStore.getChannels().sort(this.compareByDisplayName);
-        const publicChannels = allChannels.filter((channel) => channel.type === Constants.OPEN_CHANNEL);
-        const privateChannels = allChannels.filter((channel) => channel.type === Constants.PRIVATE_CHANNEL);
-
-        const preferences = PreferenceStore.getCategory(Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW);
-
-        const directChannels = [];
-        const directNonTeamChannels = [];
-        for (const [name, value] of preferences) {
-            if (value !== 'true') {
-                continue;
-            }
-
-            const directChannel = allChannels.find(Utils.isDirectChannelForUser.bind(null, name));
-            directChannel.display_name = Utils.displayUsername(name);
-
-            if (UserStore.hasTeamProfile(name)) {
-                directChannels.push(directChannel);
-            } else {
-                directNonTeamChannels.push(directChannel);
-            }
-        }
-
-        directChannels.sort(this.compareByDisplayName);
-        directNonTeamChannels.sort(this.compareByDisplayName);
-
-        return publicChannels.concat(privateChannels).concat(directChannels).concat(directNonTeamChannels);
-    }
-    compareByDisplayName(channelA, channelB) {
-        return channelA.display_name.localeCompare(channelB.display_name);
-    }
     createDropdown(channel, channelTitle, isAdmin, isDirect, popoverContent) {
         if (channel) {
             var viewInfoOption = (