-
Notifications
You must be signed in to change notification settings - Fork 177
createStoreWith accepts either a function or an object with reducers #76
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
wbuchwalter
merged 3 commits into
angular-redux:master
from
Carburetor:reducer-as-function-and-object
Apr 24, 2016
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,24 @@ | ||
import Connector from './connector'; | ||
import invariant from 'invariant'; | ||
import {createStore, applyMiddleware, compose} from 'redux'; | ||
import {createStore, applyMiddleware, compose, combineReducers} from 'redux'; | ||
import digestMiddleware from './digestMiddleware'; | ||
|
||
import assign from 'lodash.assign'; | ||
import isArray from 'lodash.isarray'; | ||
import isFunction from 'lodash.isfunction'; | ||
import isObejct from 'lodash.isobject'; | ||
|
||
export default function ngReduxProvider() { | ||
let _reducer = undefined; | ||
let _middlewares = undefined; | ||
let _storeEnhancers = undefined; | ||
let _initialState = undefined; | ||
let _reducerIsObejct = undefined; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You have the typo here too |
||
|
||
this.createStoreWith = (reducer, middlewares, storeEnhancers, initialState) => { | ||
invariant( | ||
isFunction(reducer), | ||
'The reducer parameter passed to createStoreWith must be a Function. Instead received %s.', | ||
isFunction(reducer) || isObejct(reducer), | ||
'The reducer parameter passed to createStoreWith must be a Function or an Object. Instead received %s.', | ||
typeof reducer | ||
); | ||
|
||
|
@@ -27,6 +29,7 @@ export default function ngReduxProvider() { | |
); | ||
|
||
_reducer = reducer; | ||
_reducerIsObejct = isObejct(reducer); | ||
_storeEnhancers = storeEnhancers | ||
_middlewares = middlewares || []; | ||
_initialState = initialState; | ||
|
@@ -43,6 +46,21 @@ export default function ngReduxProvider() { | |
} | ||
} | ||
|
||
if(_reducerIsObejct) { | ||
let reducersObj = {}; | ||
let reducKeys = Object.keys(_reducer); | ||
|
||
reducKeys.forEach((key) => { | ||
if(typeof _reducer[key] === 'string') { | ||
reducersObj[key] = $injector.get(_reducer[key]); | ||
} else { | ||
reducersObj[key] = _reducer[key]; | ||
} | ||
}); | ||
|
||
_reducer = combineReducers(reducersObj); | ||
} | ||
|
||
let finalCreateStore = _storeEnhancers ? compose(..._storeEnhancers)(createStore) : createStore; | ||
|
||
//digestMiddleware needs to be the last one. | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have a big typo here