From 81b1c81b510c07418e896a7cf187737fc03a36f8 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 24 Jul 2015 17:58:55 -0700 Subject: [PATCH] use desctructing and assignment to rename instance --- common/app/routes/Hikes/flux/Actions.js | 8 ++++---- common/app/routes/Hikes/flux/Store.js | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/common/app/routes/Hikes/flux/Actions.js b/common/app/routes/Hikes/flux/Actions.js index ddc4100564..94f3403590 100644 --- a/common/app/routes/Hikes/flux/Actions.js +++ b/common/app/routes/Hikes/flux/Actions.js @@ -32,12 +32,12 @@ export default Actions({ setHikes: null }) .refs({ displayName: 'HikesActions' }) - .init(({ instance, args: [services] }) => { + .init(({ instance: hikeActions, args: [services] }) => { // set up hikes fetching - instance.fetchHikes.subscribe( + hikeActions.fetchHikes.subscribe( ({ isPrimed, dashedName }) => { if (isPrimed) { - return instance.setHikes({ + return hikeActions.setHikes({ transform: (oldState) => { const { hikes } = oldState; const currentHike = getCurrentHike( @@ -53,7 +53,7 @@ export default Actions({ if (err) { debug('an error occurred fetching hikes', err); } - instance.setHikes({ + hikeActions.setHikes({ set: { hikes: hikes, currentHike: getCurrentHike(hikes, dashedName) diff --git a/common/app/routes/Hikes/flux/Store.js b/common/app/routes/Hikes/flux/Store.js index 4893148326..4c7080b1c2 100644 --- a/common/app/routes/Hikes/flux/Store.js +++ b/common/app/routes/Hikes/flux/Store.js @@ -7,11 +7,10 @@ const initialValue = { export default Store(initialValue) .refs({ displayName: 'HikesStore'}) - .init(({ instance, args }) => { - const [cat] = args; + .init(({ instance: hikeStore, args: [cat] }) => { let { setHikes } = cat.getActions('hikesActions'); - instance.register(setHikes); + hikeStore.register(setHikes); - return instance; + return hikeStore; });