Clean up location check

reactjs · Dec 5, 2015 · ab7b481 · ab7b481
1 parent 4091b1e
commit ab7b481
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -112,8 +112,12 @@ function syncReduxAndRouter(history, store, selectRouterState = SELECT_STATE) {
       routing = firstRoute;
     }
 
-    if(lastRoute !== undefined && lastRoute.changeId === routing.changeId) {
-      if(locationsAreEqual(routing, lastRoute)) return;
+    // Only trigger history update is this is a new change or the location
+    // has changed.
+    if(lastRoute !== undefined &&
+      lastRoute.changeId === routing.changeId &&
+      locationsAreEqual(lastRoute, routing)) {
+      return;
     }
 
     lastRoute = routing;