tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-02-04 03:17:11 +00:00
parent c14f59c542 9da81a1639
commit 530fcc1c14
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/javascript/mastodon/components/column_back_button_slim.js
View File

@ -1,17 +1,8 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import PropTypes from 'prop-types';
import ColumnBackButton from './column_back_button';
export default class ColumnBackButtonSlim extends React.PureComponent {
static contextTypes = {
router: PropTypes.object,
};
handleClick = () => {
if (window.history && window.history.length === 1) this.context.router.history.push('/');
else this.context.router.history.goBack();
}
export default class ColumnBackButtonSlim extends ColumnBackButton {
render () {
return (