Implementing Permalinks and jumping to post from search. Performance

improvements.

2 files changed, 9 insertions, 12 deletions

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 126942e65..5cc1be741 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -1,7 +1,6 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 import ChannelView from '../components/channel_view.jsx';
 import ChannelLoader from '../components/channel_loader.jsx';
 import ErrorBar from '../components/error_bar.jsx';
@@ -23,15 +22,14 @@ import ImportThemeModal from '../components/user_settings/import_theme_modal.jsx
 import InviteMemberModal from '../components/invite_member_modal.jsx';
 
 import * as AsyncClient from '../utils/async_client.jsx';
-import Constants from '../utils/constants.jsx';
-var ActionTypes = Constants.ActionTypes;
-
-function setupChannelPage(props) {
-    AppDispatcher.handleViewAction({
-        type: ActionTypes.CLICK_CHANNEL,
-        name: props.ChannelName,
-        id: props.ChannelId
-    });
+import * as EventHelpers from '../dispatcher/event_helpers.jsx';
+
+function setupChannelPage(props, team, channel) {
+    if (props.PostId === '') {
+        EventHelpers.emitChannelClickEvent(channel);
+    } else {
+        EventHelpers.emitPostFocusEvent(props.PostId);
+    }
 
     AsyncClient.getAllPreferences();
 
diff --git a/web/react/pages/home.jsx b/web/react/pages/home.jsx
index 2c1edaa3a..ff81c4994 100644
--- a/web/react/pages/home.jsx
+++ b/web/react/pages/home.jsx
@@ -1,12 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import ChannelStore from '../stores/channel_store.jsx';
 import TeamStore from '../stores/team_store.jsx';
 import Constants from '../utils/constants.jsx';
 
 function setupHomePage() {
-    var last = ChannelStore.getLastVisitedName();
+    var last = null;
     if (last == null || last.length === 0) {
         window.location = TeamStore.getCurrentTeamUrl() + '/channels/' + Constants.DEFAULT_CHANNEL;
     } else {