Fix non-exact isActive

4Catalyzer · Nov 6, 2016 · df7c504 · df7c504
1 parent ab0fc65
commit df7c504
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Matcher.js b/src/Matcher.js
@@ -95,12 +95,21 @@ export default class Matcher {
   }
 
   isPathnameActive(matchPathname, pathname, exact) {
+    if (pathname === matchPathname) {
+      return true;
+    }
+
     if (exact) {
-      return pathname === matchPathname;
+      // The above condition is necessary for an exact match.
+      return false;
     }
 
+    // Require that a partial match is followed by a path separator.
+    const pathnameWithSeparator = pathname.slice(-1) !== '/' ?
+      `${pathname}/` : pathname;
+
     // Can't use startsWith, as that requires a polyfill.
-    return matchPathname.indexOf(pathname) === 0;
+    return matchPathname.indexOf(pathnameWithSeparator) === 0;
   }
 
   isQueryActive(matchQuery, query) {