simplify v-link onClick, fix v-link on non-anchor

Author: yyx990803

src/directives/link.js

@@ -7,7 +7,6 @@ const queryStringRE = /\?.*$/
 // HTML5 history mode
 export default function (Vue) {
 
-  const urlParser = document.createElement('a')
   const {
     bind,
     isObject,
@@ -69,42 +68,29 @@ export default function (Vue) {
 
     onClick (e) {
       // don't redirect with control keys
+      /* istanbul ignore if */
       if (e.metaKey || e.ctrlKey || e.shiftKey) return
       // don't redirect when preventDefault called
+      /* istanbul ignore if */
       if (e.defaultPrevented) return
       // don't redirect on right click
+      /* istanbul ignore if */
       if (e.button !== 0) return
 
       const target = this.target
-      const go = (target) => {
+      if (target) {
+        // v-link with expression, just go
         e.preventDefault()
-        if (target != null) {
-          this.router.go(target)
-        }
-      }
-
-      if (this.el.tagName === 'A' || e.target === this.el) {
-        // v-link on <a v-link="'path'">
-        if (sameOrigin(this.el, target)) {
-          go(target)
-        } else if (typeof target === 'string') {
-          window.location.href = target
-        }
+        this.router.go(target)
       } else {
-        // v-link delegate on <div v-link>
+        // no expression, delegate for an <a> inside
         var el = e.target
-        while (el && el.tagName !== 'A' && el !== this.el) {
+        while (el.tagName !== 'A' && el !== this.el) {
           el = el.parentNode
         }
-        if (!el) return
-        if (!sameOrigin(el, target) && typeof target === 'string') {
-          window.location.href = target
-        }
-        if (el.tagName !== 'A' || !el.href) {
-          // allow not anchor
-          go(target)
-        } else if (sameOrigin(el, target)) {
-          go({
+        if (el.tagName === 'A' && sameOrigin(el)) {
+          e.preventDefault()
+          this.router.go({
             path: el.pathname,
             replace: target && target.replace,
             append: target && target.append
@@ -196,12 +182,7 @@ export default function (Vue) {
     }
   })
 
-  function sameOrigin (link, target) {
-    target = target || {}
-    if (link.tagName !== 'A' && typeof target === 'string') {
-      link = urlParser
-      link.href = target
-    }
+  function sameOrigin (link) {
     return link.protocol === location.protocol &&
       link.hostname === location.hostname &&
       link.port === location.port

test/unit/specs/core.js

@@ -8,9 +8,17 @@ describe('Core', function () {
 
   beforeEach(function () {
     el = document.createElement('div')
+    document.body.appendChild(el)
     spyOn(window, 'scrollTo')
   })
 
+  afterEach(function () {
+    var el = router && router.app.$el
+    if (el && document.body.contains(el)) {
+      document.body.removeChild(el)
+    }
+  })
+
   it('call Vue constructor with no arguments', function () {
     /* eslint-disable no-new */
     expect(function () {
@@ -322,6 +330,29 @@ describe('Core', function () {
     })
   })
 
+  it('v-link delegation', function (done) {
+    router = new Router({ abstract: true })
+    router.map({
+      '/a': {
+        component: {
+          template: 'hello'
+        }
+      }
+    })
+    router.start({
+      replace: false,
+      template:
+        '<div v-link><a id="link" href="/a"></a></div>' +
+        '<router-view></router-view>'
+    }, el)
+    var link = el.querySelector('#link')
+    click(link)
+    nextTick(function () {
+      expect(el.textContent).toBe('hello')
+      done()
+    })
+  })
+
   it('v-link active classes', function (done) {
     router = new Router({
       abstract: true,