fix: deactivation path, activation path and node listener for same ro…

…ute names with different params Fixes #27
router5 · Sep 15, 2015 · fa985d2 · fa985d2
1 parent 91e3163
commit fa985d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/modules/transition.js b/modules/transition.js
@@ -15,8 +15,11 @@ function transitionPath(toState, fromState) {
     let toStateIds = nameToIDs(toState.name)
     let maxI = Math.min(fromStateIds.length, toStateIds.length)
 
-    for (i = 0; i < maxI; i += 1) {
-        if (fromStateIds[i] !== toStateIds[i]) break
+    if (fromState && fromState.name === toState.name) i = Math.max(maxI - 1, 0)
+    else {
+        for (i = 0; i < maxI; i += 1) {
+            if (fromStateIds[i] !== toStateIds[i]) break
+        }
     }
 
     let toDeactivate = fromStateIds.slice(i).reverse()

diff --git a/tests/client.js b/tests/client.js
@@ -336,8 +336,12 @@ function testRouter(useHash) {
                 router.addNodeListener('users', listeners.node);
                 router.navigate('users.view', {id: 1}, {}, function () {
                     expect(listeners.node).toHaveBeenCalled();
-                    router.removeNodeListener('users', listeners.node);
-                    done();
+                    router.navigate('users.view', {id: 1}, {}, function() {
+                        router.navigate('users.view', {id: 2}, {}, function(err, state) {
+                            expect(listeners.node.calls.count()).toBe(2);
+                            done();
+                        })
+                    });
                 });
             });
         });