ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Code Issues Releases Wiki Activity

use mergeOptionsList on all react components

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-06-04 15:33:59 +02:00
parent 1230ae7192
commit 8a3ff445ef
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/components/edition_container.js
View File

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