treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix delete option missing from statuses in detailed view

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2016-10-06 17:27:07 +02:00
parent 15d01a5e08
commit 87ba52ad3f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,8 @@ function selectStatuses(state, ids) {
const mapStateToProps = (state, props) => ({ const mapStateToProps = (state, props) => ({
status: selectStatus(state, Number(props.params.statusId)), status: selectStatus(state, Number(props.params.statusId)),
ancestors: selectStatuses(state, state.getIn(['timelines', 'ancestors', Number(props.params.statusId)], Immutable.OrderedSet())), ancestors: selectStatuses(state, state.getIn(['timelines', 'ancestors', Number(props.params.statusId)], Immutable.OrderedSet())),
descendants: selectStatuses(state, state.getIn(['timelines', 'descendants', Number(props.params.statusId)], Immutable.OrderedSet())) descendants: selectStatuses(state, state.getIn(['timelines', 'descendants', Number(props.params.statusId)], Immutable.OrderedSet())),
me: state.getIn(['timelines', 'me'])
}); });
const Status = React.createClass({ const Status = React.createClass({
@ -55,11 +56,11 @@ const Status = React.createClass({
}, },
renderChildren (list) { renderChildren (list) {
return list.map(s => <EmbeddedStatus status={s} key={s.get('id')} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} />); return list.map(s => <EmbeddedStatus status={s} me={this.props.me} key={s.get('id')} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} />);
}, },
render () { render () {
const { status, ancestors, descendants } = this.props; const { status, ancestors, descendants, me } = this.props;
if (status === null) { if (status === null) {
return <div>Loading {this.props.params.statusId}...</div>; return <div>Loading {this.props.params.statusId}...</div>;
@ -71,7 +72,7 @@ const Status = React.createClass({
<div style={{ overflowY: 'scroll', flex: '1 1 auto' }} className='scrollable'> <div style={{ overflowY: 'scroll', flex: '1 1 auto' }} className='scrollable'>
<div>{this.renderChildren(ancestors)}</div> <div>{this.renderChildren(ancestors)}</div>
<DetailedStatus status={status} /> <DetailedStatus status={status} me={me} />
<ActionBar status={status} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} /> <ActionBar status={status} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} />
<div>{this.renderChildren(descendants)}</div> <div>{this.renderChildren(descendants)}</div>