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

Cleaning up action names and compose drawer

Browse Source
This commit is contained in:
Eugen Rochko
2016-08-31 16:15:12 +02:00
parent 92afd29650
commit 72591cc6d5
29 changed files with 468 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/components/containers/root.jsx
View File

@@ -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 />