[Resolves #58] Reuse router between instances when using only static …

…routes
YahooArchive · Nov 13, 2015 · 9e1d6cb · 9e1d6cb
1 parent df2f978
commit 9e1d6cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/RouteStore.js b/lib/RouteStore.js
@@ -127,6 +127,9 @@ var RouteStore = createStore({
     },
     rehydrate: function (state) {
         this._routes = state.routes;
+        if (this._routes) {
+            this._router = null;
+        }
         this._currentUrl = state.currentUrl;
         this._currentRoute = this._matchRoute(this._currentUrl, {
             method: state.currentNavigate && state.currentNavigate.method || 'GET'
@@ -138,8 +141,10 @@ var RouteStore = createStore({
 });
 
 RouteStore.withStaticRoutes = function (staticRoutes) {
+    var staticRouter = new Router(staticRoutes);
     function StaticRouteStore() {
         RouteStore.apply(this, arguments);
+        this._router = staticRouter;
     }
     inherits(StaticRouteStore, RouteStore);
     StaticRouteStore.storeName = RouteStore.storeName;

diff --git a/tests/unit/lib/RouteStore-test.js b/tests/unit/lib/RouteStore-test.js
@@ -50,6 +50,10 @@ describe('RouteStore', function () {
                 expect(newStore._routes).to.equal(null);
             });
         });
+        it('should reuse static router between instances', function () {
+            var newStore = new StaticRouteStore();
+            expect(newStore._router).to.equal(routeStore._router);
+        });
     });
 
     describe('withoutStaticRoutes', function () {