autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer

Browse Source 
nested inside a common parent (<Account>), instead they all embed <HeaderContainer />
This commit is contained in:
Eugen Rochko
2017-01-30 21:40:55 +01:00
parent a2a85e8549
commit f21e7d6ac0
14 changed files with 230 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/components/features/status/components/action_bar.jsx
View File

@ -14,6 +14,10 @@ const messages = defineMessages({
const ActionBar = React.createClass({
contextTypes: {
router: React.PropTypes.object
},
propTypes: {
status: ImmutablePropTypes.map.isRequired,
onReply: React.PropTypes.func.isRequired,
@ -43,7 +47,7 @@ const ActionBar = React.createClass({
},
handleMentionClick () {
this.props.onMention(this.props.status.get('account'));
this.props.onMention(this.props.status.get('account'), this.context.router);
},
render () {

8
app/assets/javascripts/components/features/status/index.jsx
View File

@ -80,12 +80,8 @@ const Status = React.createClass({
this.props.dispatch(deleteStatus(status.get('id')));
},
handleMentionClick (account) {
this.props.dispatch(mentionCompose(account));
if (isMobile(window.innerWidth)) {
this.context.router.push('/statuses/new');
}
handleMentionClick (account, router) {
this.props.dispatch(mentionCompose(account, router));
},
handleOpenMedia (url) {