From 348a6efcdc538a940b6200b2f9e23e0c51d60ed6 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Thu, 30 Jun 2016 23:33:32 +0200 Subject: [PATCH 1/2] Fix potential infinite recursion in react-router-redux example --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f55b65f..1ba938c 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,7 @@ const initialState = Immutable.fromJS({ export default (state = initialState, action) => { if (action.type === LOCATION_CHANGE) { - return state.merge({ - locationBeforeTransitions: action.payload - }); + return state.set("locationBeforeTransitions", action.payload); } return state; @@ -74,7 +72,7 @@ import { const history = syncHistoryWithStore(browserHistory, store, { selectLocationState (state) { - return state.get('routing').toJS(); + return state.get('routing').toObject(); } }); ``` From c83325f99b5d0588d8317591467958f92c333786 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Fri, 1 Jul 2016 20:28:48 +0200 Subject: [PATCH 2/2] Replace double quotes with single quotes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ba938c..1f2326b 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ const initialState = Immutable.fromJS({ export default (state = initialState, action) => { if (action.type === LOCATION_CHANGE) { - return state.set("locationBeforeTransitions", action.payload); + return state.set('locationBeforeTransitions', action.payload); } return state;