Skip to content
This repository has been archived by the owner on Oct 26, 2018. It is now read-only.

Commit

Permalink
Merge pull request #97 from kjbekkelund/remove-init-path
Browse files Browse the repository at this point in the history
Remove `INIT_PATH`
  • Loading branch information
jlongster committed Dec 18, 2015
2 parents 5ddaf3c + a985b5b commit bf35f05
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,9 @@ import deepEqual from 'deep-equal'

// Constants

const INIT_PATH = '@@router/INIT_PATH'
export const UPDATE_PATH = '@@router/UPDATE_PATH'
const SELECT_STATE = state => state.routing

// Action creators

function initPath(path, state) {
return {
type: INIT_PATH,
payload: {
path: path,
state: state,
replace: false,
avoidRouterUpdate: true
}
}
}

export function pushPath(path, state, { avoidRouterUpdate = false } = {}) {
return {
type: UPDATE_PATH,
Expand Down Expand Up @@ -54,7 +39,7 @@ let initialState = {
}

function update(state=initialState, { type, payload }) {
if(type === INIT_PATH || type === UPDATE_PATH) {
if(type === UPDATE_PATH) {
return Object.assign({}, state, {
path: payload.path,
changeId: state.changeId + (payload.avoidRouterUpdate ? 0 : 1),
Expand Down Expand Up @@ -128,7 +113,7 @@ export function syncReduxAndRouter(history, store, selectRouterState = SELECT_ST
// trigger an unnecessary `pushState` on load
lastRoute = initialState

store.dispatch(initPath(route.path, route.state))
store.dispatch(pushPath(route.path, route.state, { avoidRouterUpdate: true }));
} else if(!locationsAreEqual(getRouterState(), route)) {
// The above check avoids dispatching an action if the store is
// already up-to-date
Expand Down

0 comments on commit bf35f05

Please sign in to comment.