From 04bbc576906ff70feed7d42fef0e6db17fdd9ed3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 19 Oct 2016 18:20:19 +0200 Subject: Fix #100 - Add "back" button to certain views Also fix reloading of timelines after merge-type events --- app/assets/javascripts/components/containers/mastodon.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 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 4eb9f83c8..8e1becbda 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -54,9 +54,9 @@ const Mastodon = React.createClass({ return store.dispatch(deleteFromTimelines(data.id)); case 'merge': case 'unmerge': - return store.dispatch(refreshTimeline('home')); + return store.dispatch(refreshTimeline('home', true)); case 'block': - return store.dispatch(refreshTimeline('mentions')); + return store.dispatch(refreshTimeline('mentions', true)); } } -- cgit