From 325651b581d9cd7573e0942e4c67f649d04b0349 Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Fri, 5 Feb 2016 13:12:58 +0100 Subject: [PATCH] Remove altUser since the UserStore is now always being passed as a prop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also don’t recycle altWhitelabel on logout as the whitelabel stores aren’t dependent on the user. --- js/actions/user_actions.js | 4 ++-- js/alt.js | 1 - js/stores/user_store.js | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/js/actions/user_actions.js b/js/actions/user_actions.js index a661b8de..9d59044f 100644 --- a/js/actions/user_actions.js +++ b/js/actions/user_actions.js @@ -1,6 +1,6 @@ 'use strict'; -import { altUser } from '../alt'; +import { alt } from '../alt'; class UserActions { @@ -15,4 +15,4 @@ class UserActions { } } -export default altUser.createActions(UserActions); +export default alt.createActions(UserActions); diff --git a/js/alt.js b/js/alt.js index 141248c1..3e1d3fae 100644 --- a/js/alt.js +++ b/js/alt.js @@ -4,5 +4,4 @@ import Alt from 'alt'; export let alt = new Alt(); export let altThirdParty = new Alt(); -export let altUser = new Alt(); export let altWhitelabel = new Alt(); diff --git a/js/stores/user_store.js b/js/stores/user_store.js index fe96eaa8..4c6725e3 100644 --- a/js/stores/user_store.js +++ b/js/stores/user_store.js @@ -1,6 +1,6 @@ 'use strict'; -import { alt, altWhitelabel, altUser, altThirdParty } from '../alt'; +import { alt, altThirdParty } from '../alt'; import EventActions from '../actions/event_actions'; @@ -56,9 +56,8 @@ class UserStore { EventActions.userDidLogout(); // Reset all stores back to their initial state + // Don't recycle the whitelabel stores since they're not dependent on login alt.recycle(); - altWhitelabel.recycle(); - altUser.recycle(); altThirdParty.recycle(); // Since we've just logged out, we can set this store's @@ -77,4 +76,4 @@ class UserStore { } } -export default altUser.createStore(UserStore, 'UserStore'); +export default alt.createStore(UserStore, 'UserStore');