From f21e7d6ac06556671c2663ce2879442c60230b32 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 30 Jan 2017 21:40:55 +0100
Subject: Make profile header scroll along with contents. AccountTimeline,
 Followers and Following are no longer nested inside a common parent
 (<Account>), instead they all embed <HeaderContainer />

---
 app/assets/javascripts/components/containers/mastodon.jsx        | 9 +++------
 .../javascripts/components/containers/status_container.jsx       | 5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'app/assets/javascripts/components/containers')

diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index 5f4b2cf79..839f7267e 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -18,7 +18,6 @@ import {
 } from 'react-router';
 import { useScroll } from 'react-router-scroll';
 import UI from '../features/ui';
-import Account from '../features/account';
 import Status from '../features/status';
 import GettingStarted from '../features/getting_started';
 import PublicTimeline from '../features/public_timeline';
@@ -121,11 +120,9 @@ const Mastodon = React.createClass({
               <Route path='statuses/:statusId/reblogs' component={Reblogs} />
               <Route path='statuses/:statusId/favourites' component={Favourites} />
 
-              <Route path='accounts/:accountId' component={Account}>
-                <IndexRoute component={AccountTimeline} />
-                <Route path='followers' component={Followers} />
-                <Route path='following' component={Following} />
-              </Route>
+              <Route path='accounts/:accountId' component={AccountTimeline} />
+              <Route path='accounts/:accountId/followers' component={Followers} />
+              <Route path='accounts/:accountId/following' component={Following} />
 
               <Route path='follow_requests' component={FollowRequests} />
               <Route path='*' component={GenericNotFound} />
diff --git a/app/assets/javascripts/components/containers/status_container.jsx b/app/assets/javascripts/components/containers/status_container.jsx
index ad2be03d1..1704a8cc2 100644
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@@ -88,10 +88,7 @@ const mapDispatchToProps = (dispatch) => ({
   },
 
   onMention (account, router) {
-    dispatch(mentionCompose(account));
-    if (isMobile(window.innerWidth)) {
-      router.push('/statuses/new');
-    }
+    dispatch(mentionCompose(account, router));
   },
 
   onOpenMedia (url) {
-- 
cgit