sunoru/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #100 - Add "back" button to certain views

Browse source 
Also fix reloading of timelines after merge-type events
This commit is contained in:
Eugen Rochko 2016-10-19 18:20:19 +02:00
parent 8698cd3281
commit 04bbc57690
10 changed files with 80 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/features/account/index.jsx
View file

@ -18,6 +18,7 @@ import {
import LoadingIndicator from '../../components/loading_indicator';
import ActionBar from './components/action_bar';
import Column from '../ui/components/column';
import ColumnBackButton from '../../components/column_back_button';
const mapStateToProps = (state, props) => ({
account: getAccount(state, Number(props.params.accountId)),
@ -74,6 +75,7 @@ const Account = React.createClass({
return (
<Column>
<ColumnBackButton />
<Header account={account} me={me} />
<ActionBar account={account} me={me} onFollow={this.handleFollow} onBlock={this.handleBlock} />