[Link] Small fixes

bootstrap-vue · May 9, 2017 · 5656434 · 5656434
1 parent 4dc7fb1
commit 5656434
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/lib/components/link.vue b/lib/components/link.vue
@@ -6,7 +6,7 @@
        :exact-active-class="exactActiveClass"
        :disabled="disabled"
        :aria-disabled="disabled ? 'true' : 'false'"
-       :to="_to"
+       :to="to"
        :exact="exact"
        :append="append"
        :replace="replace"
@@ -33,7 +33,7 @@
     export default {
         computed: {
             isRouterLink() {
-                return this.$router && !this.to;
+                return this.$router && this.to && !this.disabled;
             },
             _href() {
                 if (this.disabled) {
@@ -49,15 +49,6 @@
                 if (this.to && typeof this.to === 'string') {
                     return this.to;
                 }
-            },
-            _to() {
-                if (this.disabled) {
-                    return null;
-                }
-
-                if (this.to) {
-                    return this.to;
-                }
             }
         },
         props: {