diff options
Diffstat (limited to 'app/assets/javascripts/components/containers/root.jsx')
-rw-r--r-- | app/assets/javascripts/components/containers/root.jsx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/components/containers/root.jsx b/app/assets/javascripts/components/containers/root.jsx index 661ffb22c..e1fc31d55 100644 --- a/app/assets/javascripts/components/containers/root.jsx +++ b/app/assets/javascripts/components/containers/root.jsx @@ -1,9 +1,9 @@ -import { Provider } from 'react-redux'; -import configureStore from '../store/configureStore'; -import Frontend from '../components/frontend'; -import { setTimeline, addStatus } from '../actions/statuses'; -import { setAccessToken } from '../actions/meta'; -import PureRenderMixin from 'react-addons-pure-render-mixin'; +import { Provider } from 'react-redux'; +import configureStore from '../store/configureStore'; +import Frontend from '../components/frontend'; +import { setTimeline, updateTimeline } from '../actions/timelines'; +import { setAccessToken } from '../actions/meta'; +import PureRenderMixin from 'react-addons-pure-render-mixin'; const store = configureStore(); @@ -11,7 +11,7 @@ const Root = React.createClass({ propTypes: { token: React.PropTypes.string.isRequired, - timelines: React.PropTypes.array + timelines: React.PropTypes.object }, mixins: [PureRenderMixin], @@ -32,13 +32,13 @@ const Root = React.createClass({ disconnected: function() {}, received: function(data) { - return store.dispatch(addStatus(data.timeline, JSON.parse(data.message))); + return store.dispatch(updateTimeline(data.timeline, JSON.parse(data.message))); } }); } }, - render() { + render () { return ( <Provider store={store}> <Frontend /> |