fix active class for urls with query (fix #209)

vuejs · Nov 16, 2015 · 6496b33 · 6496b33
1 parent 362138d
commit 6496b33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/directives/link.js b/src/directives/link.js
@@ -79,7 +79,11 @@ export default function (Vue) {
       }
       path = this.path = router._stringifyPath(path)
       this.activeRE = path && !this.exact
-        ? new RegExp('^' + path.replace(/\/$/, '').replace(regexEscapeRE, '\\$&') + '(\\/|$)')
+        ? new RegExp(
+            '^' +
+            path.replace(/\/$/, '').replace(regexEscapeRE, '\\$&') +
+            '(\\/|$)'
+          )
         : null
       this.updateClasses(this.vm.$route.path)
       let isAbsolute = path.charAt(0) === '/'
@@ -105,6 +109,8 @@ export default function (Vue) {
       if (this.prevActiveClass !== activeClass) {
         _.removeClass(el, this.prevActiveClass)
       }
+      // remove query string before matching
+      path = path.replace(/\?.*$/, '')
       // add new class
       if (this.exact) {
         if (

diff --git a/test/unit/specs/core.js b/test/unit/specs/core.js
@@ -338,7 +338,7 @@ describe('Core', function () {
     expect(linkA.className).toBe('')
     expect(linkB.className).toBe('')
     expect(linkC.className).toBe('active')
-    router.go('/a')
+    router.go('/a?a=123')
     nextTick(function () {
       expect(linkA.className).toBe('active')
       expect(linkB.className).toBe('')