ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

rename mergeOptions

This commit is contained in:
Tim Daubenschütz 2015-06-04 15:38:15 +02:00
parent 8a3ff445ef
commit 6da18e9a85
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import { mergeOptionList } from '../../utils/general_utils';
import { mergeOptions } from '../../utils/general_utils';
import EditionListStore from '../../stores/edition_list_store';
import EditionListActions from '../../actions/edition_list_actions';
@ -17,7 +17,7 @@ let PieceListBulkModal = React.createClass({
},
getInitialState() {
return mergeOptionList([EditionListStore.getState(), UserStore.getState()]);
return mergeOptions(EditionListStore.getState(), UserStore.getState());
},
onChange(state) {

4
js/components/edition_container.js
View File

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

6
js/utils/general_utils.js
View File

@ -68,11 +68,11 @@ export function formatText() {
* @param {[type]} l [description]
* @return {[type]} [description]
*/
export function mergeOptionList(l) {
export function mergeOptions(...l) {
let newObj = {};
for(let i = 1; i < l.length; i++) {
newObj = mergeOptions(newObj, mergeOptions(l[i-1], l[i]));
newObj = _mergeOptions(newObj, _mergeOptions(l[i-1], l[i]));
}
return newObj;
@ -85,7 +85,7 @@ export function mergeOptionList(l) {
* @returns obj3 a new object based on obj1 and obj2
* Taken from: http://stackoverflow.com/a/171256/1263876
*/
function mergeOptions(obj1,obj2){
function _mergeOptions(obj1,obj2){
var obj3 = {};
for (var attrname in obj1) { obj3[attrname] = obj1[attrname]; }
for (var attrname in obj2) { obj3[attrname] = obj2[attrname]; }