diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-07 16:00:11 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-07 16:00:11 +0200 |
commit | 1f650d327d35bc48b897da99914c43750d8e5fd3 (patch) | |
tree | 6960b24e30c46c55ba9f3bf1af0a24b43cd9d248 /app/assets/javascripts/components/features/status | |
parent | 06016453bd91882a53e91c11fc80f2c75fd474bb (diff) |
Adding public timeline
Diffstat (limited to 'app/assets/javascripts/components/features/status')
-rw-r--r-- | app/assets/javascripts/components/features/status/index.jsx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/app/assets/javascripts/components/features/status/index.jsx b/app/assets/javascripts/components/features/status/index.jsx index c294ac1d686..b282956b142 100644 --- a/app/assets/javascripts/components/features/status/index.jsx +++ b/app/assets/javascripts/components/features/status/index.jsx @@ -7,6 +7,7 @@ import EmbeddedStatus from '../../components/status'; import LoadingIndicator from '../../components/loading_indicator'; import DetailedStatus from './components/detailed_status'; import ActionBar from './components/action_bar'; +import Column from '../ui/components/column'; import { favourite, reblog } from '../../actions/interactions'; import { replyCompose } from '../../actions/compose'; import { selectStatus } from '../../reducers/timelines'; @@ -64,20 +65,26 @@ const Status = React.createClass({ const { status, ancestors, descendants, me } = this.props; if (status === null) { - return <LoadingIndicator />; + return ( + <Column> + <LoadingIndicator /> + </Column> + ); } const account = status.get('account'); return ( - <div style={{ overflowY: 'scroll', flex: '1 1 auto' }} className='scrollable'> - <div>{this.renderChildren(ancestors)}</div> + <Column> + <div style={{ overflowY: 'scroll', flex: '1 1 auto' }} className='scrollable'> + <div>{this.renderChildren(ancestors)}</div> - <DetailedStatus status={status} me={me} /> - <ActionBar status={status} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} /> + <DetailedStatus status={status} me={me} /> + <ActionBar status={status} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} /> - <div>{this.renderChildren(descendants)}</div> - </div> + <div>{this.renderChildren(descendants)}</div> + </div> + </Column> ); } |