1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00

use mergeOptionsList on all react components

This commit is contained in:
Tim Daubenschütz 2015-06-04 15:33:59 +02:00
parent 1230ae7192
commit 8a3ff445ef

View File

@ -1,5 +1,7 @@
import React from 'react';
import { mergeOptionList } from '../utils/general_utils';
import EditionActions from '../actions/edition_actions';
import EditionStore from '../stores/edition_store';
import UserActions from '../actions/user_actions';
@ -12,10 +14,7 @@ import Edition from './edition';
*/
let EditionContainer = React.createClass({
getInitialState() {
return {
'user': UserStore.getState(),
'edition': EditionStore.getState()
};
return mergeOptionList([UserStore.getState(), EditionStore.getState()]);
},
onChange(state) {