[link] fix click event

bootstrap-vue · May 9, 2017 · 45362fb · 45362fb
1 parent 0ac5356
commit 45362fb
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/mixins/link.js b/lib/mixins/link.js
@@ -4,7 +4,7 @@
 export default {
     computed: {
         isRouterLink() {
-            return this.$router && this.to && !this.disabled;
+            return Boolean(this.$router && this.to && !this.disabled);
         },
         _href() {
             if (this.disabled) {
@@ -74,13 +74,12 @@ export default {
     },
     methods: {
         linkClick(e) {
-            if (this.disabled || this._href === '#') {
+            this.$root.$emit('clicked::link', this);
+
+            if (this.disabled || (!this.isRouterLink && this._href === '#')) {
                 e.preventDefault();
                 e.stopPropagation();
-                return;
             }
-
-            this.$root.$emit('clicked::link', this);
         }
     }
 }