ensure v-on prioerity is higher than v-link (fix #390)

yyx990803 · yyx990803 · commit df223ac9075e · 2016-04-04T18:14:11.000-04:00
diff --git a/src/directives/link.js b/src/directives/link.js
@@ -14,15 +14,17 @@ export default function (Vue) {
     removeClass
   } = Vue.util
 
+  const onPriority = Vue.directive('on').priority
+
   Vue.directive('link-active', {
-    priority: 1001,
+    priority: onPriority - 1,
     bind () {
       this.el.__v_link_active = true
     }
   })
 
   Vue.directive('link', {
-    priority: 1000,
+    priority: onPriority - 2,
 
     bind () {
       const vm = this.vm
diff --git a/test/unit/specs/core.js b/test/unit/specs/core.js
@@ -597,6 +597,36 @@ describe('Core', function () {
     })
   })
 
+  it('v-link with v-on', function (done) {
+    router = new Router({ abstract: true })
+    router.map({
+      '/a': {
+        component: {
+          template: '<div>foo</div>'
+        }
+      }
+    })
+    var spy = jasmine.createSpy('v-on:click')
+    var App = Vue.extend({
+      replace: false,
+      template:
+        '<a id="link-a" v-link="{ path: \'/a\' }" v-on:click="onClick"></a>' +
+        '<router-view></router-view>',
+      methods: {
+        onClick: spy
+      }
+    })
+    router.start(App, el)
+    el = router.app.$el
+    expect(el.textContent).toBe('')
+    click(el.querySelector('#link-a'))
+    nextTick(function () {
+      expect(spy).toHaveBeenCalled()
+      expect(el.textContent).toBe('foo')
+      done()
+    })
+  })
+
   it('alias', function (done) {
     router = new Router({ abstract: true })
     router.map({
