From c1701ae2a837d7e6a59fc98d800a4c67fc4adaa8 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Fri, 21 Sep 2018 07:17:44 +0200 Subject: [PATCH] =?UTF-8?q?[Glitch]=20Fix=20=E2=80=9CToots=E2=80=9D=20tab?= =?UTF-8?q?=20highlighting=20for=20replies=20and=20media=20timelines?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Port front-end changes from f8b54d229f70cb726511bcd35e1440618e487672 --- .../glitch/features/account/components/action_bar.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/features/account/components/action_bar.js b/app/javascript/flavours/glitch/features/account/components/action_bar.js index e60b2585568..3d6eeb06aab 100644 --- a/app/javascript/flavours/glitch/features/account/components/action_bar.js +++ b/app/javascript/flavours/glitch/features/account/components/action_bar.js @@ -52,6 +52,13 @@ export default class ActionBar extends React.PureComponent { }); } + isStatusesPageActive = (match, location) => { + if (!match) { + return false; + } + return !location.pathname.match(/\/(followers|following)\/?$/); + } + render () { const { account, intl } = this.props; @@ -136,7 +143,7 @@ export default class ActionBar extends React.PureComponent {
- +