From db8aafe330ea1151d4364a8cdee394f9b81ec30e Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 11 Apr 2017 16:01:16 +0200
Subject: [PATCH] Fix active class priority
Fix #1323
---
src/components/link.js | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/link.js b/src/components/link.js
index a0b1719c7..da12eec7f 100644
--- a/src/components/link.js
+++ b/src/components/link.js
@@ -21,10 +21,7 @@ export default {
exact: Boolean,
append: Boolean,
replace: Boolean,
- activeClass: {
- type: String,
- default: 'router-link-active'
- },
+ activeClass: String,
event: {
type: eventTypes,
default: 'click'
@@ -37,9 +34,13 @@ export default {
const classes = {}
const globalActiveClass = router.options.linkActiveClass
- const activeClass = globalActiveClass == null
- ? this.activeClass
- : globalActiveClass
+ // Support global empty active class
+ const activeClassFallback = globalActiveClass == null
+ ? 'router-link-active'
+ : globalActiveClass
+ const activeClass = this.activeClass == null
+ ? activeClassFallback
+ : this.activeClass
const compareTarget = location.path
? createRoute(null, location, null, router)
: route