Framework: Prevent reinitializing redux store per route change

josemalcher · Nov 24, 2015 · 8e28055 · 8e28055
1 parent 50586ea
commit 8e28055
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/client/boot/index.js b/client/boot/index.js
@@ -37,7 +37,7 @@ var config = require( 'config' ),
  touchDetect = require( 'lib/touch-detect' ),
  accessibleFocus = require( 'lib/accessible-focus' ),
  TitleStore = require( 'lib/screen-title/store' ),
- reduxStore = require( 'lib/redux-store' ),
+ createReduxStore = require( 'lib/create-redux-store' ),
  // The following mixins require i18n content, so must be required after i18n is initialized
  Layout,
  LoggedOutLayout;
@@ -79,13 +79,15 @@ function init() {
 }
 
 function setUpContext( layout ) {
+ var reduxStore = createReduxStore();
+
  // Pass the layout so that it is available to all page handlers
  // and add query and hash objects onto context object
  page( '*', function( context, next ) {
  var parsed = url.parse( location.href, true );
 
  context.layout = layout;
- context.reduxStore = reduxStore();
+ context.reduxStore = reduxStore;
 
  // Break routing and do full page load for logout link in /me
  if ( context.pathname === '/wp-login.php' ) {

diff --git a/shared/lib/redux-store/index.js → shared/lib/create-redux-store/index.js b/shared/lib/redux-store/index.js → shared/lib/create-redux-store/index.js
diff --git a/shared/lib/redux-store/reducers.js → shared/lib/create-redux-store/reducers.js b/shared/lib/redux-store/reducers.js → shared/lib/create-redux-store/reducers.js