make .once modifier work for component v-on as well

yyx990803 · yyx990803 · commit 66bacb015c5e · 2016-11-30T12:31:56.000-05:00
diff --git a/src/core/instance/events.js b/src/core/instance/events.js
@@ -7,10 +7,12 @@ export function initEvents (vm: Component) {
   vm._events = Object.create(null)
   // init parent attached events
   const listeners = vm.$options._parentListeners
-  const on = bind(vm.$on, vm)
-  const off = bind(vm.$off, vm)
+  const add = (event, fn, once) => {
+    once ? vm.$once(event, fn) : vm.$on(event, fn)
+  }
+  const remove = bind(vm.$off, vm)
   vm._updateListeners = (listeners, oldListeners) => {
-    updateListeners(listeners, oldListeners || {}, on, off, vm)
+    updateListeners(listeners, oldListeners || {}, add, remove, vm)
   }
   if (listeners) {
     vm._updateListeners(listeners)
diff --git a/src/core/vdom/helpers/update-listeners.js b/src/core/vdom/helpers/update-listeners.js
@@ -24,15 +24,15 @@ export function updateListeners (
       capture = event.charAt(0) === '!'
       event = capture ? event.slice(1) : event
       if (Array.isArray(cur)) {
-        add(event, (cur.invoker = arrInvoker(cur)), capture, once)
+        add(event, (cur.invoker = arrInvoker(cur)), once, capture)
       } else {
         if (!cur.invoker) {
           fn = cur
           cur = on[name] = {}
           cur.fn = fn
           cur.invoker = fnInvoker(cur)
         }
-        add(event, cur.invoker, capture, once)
+        add(event, cur.invoker, once, capture)
       }
     } else if (cur !== old) {
       if (Array.isArray(old)) {
@@ -51,7 +51,7 @@ export function updateListeners (
       event = once ? name.slice(1) : name
       capture = event.charAt(0) === '!'
       event = capture ? event.slice(1) : event
-      remove(event, oldOn[name].invoker, capture) // Removal of a capturing listener does not affect a non-capturing version of the same listener, and vice versa.
+      remove(event, oldOn[name].invoker, capture)
     }
   }
 }
diff --git a/src/platforms/web/runtime/modules/events.js b/src/platforms/web/runtime/modules/events.js
@@ -9,20 +9,25 @@ function updateDOMListeners (oldVnode, vnode) {
   }
   const on = vnode.data.on || {}
   const oldOn = oldVnode.data.on || {}
-  const add = vnode.elm._v_add || (vnode.elm._v_add = (event, handler, capture, once) => {
-    if (once) {
-      const oldHandler = handler
-      handler = function (ev) {
-        remove(event, handler, capture)
-
-        arguments.length === 1 ? oldHandler(ev) : oldHandler.apply(null, arguments)
+  const add = vnode.elm._v_add || (
+    vnode.elm._v_add = (event, handler, once, capture) => {
+      if (once) {
+        const oldHandler = handler
+        handler = function (ev) {
+          remove(event, handler, capture)
+          arguments.length === 1
+            ? oldHandler(ev)
+            : oldHandler.apply(null, arguments)
+        }
       }
+      vnode.elm.addEventListener(event, handler, capture)
+    }
+  )
+  const remove = vnode.elm._v_remove || (
+    vnode.elm._v_remove = (event, handler, capture) => {
+      vnode.elm.removeEventListener(event, handler, capture)
     }
-    vnode.elm.addEventListener(event, handler, capture)
-  })
-  const remove = vnode.elm._v_remove || (vnode.elm._v_remove = (event, handler, capture) => {
-    vnode.elm.removeEventListener(event, handler, capture)
-  })
+  )
   updateListeners(on, oldOn, add, remove, vnode.context)
 }
 
diff --git a/test/unit/features/directives/on.spec.js b/test/unit/features/directives/on.spec.js
@@ -237,6 +237,21 @@ describe('Directive v-on', () => {
     expect(spy).toHaveBeenCalled()
   })
 
+  it('.once modifier should work with child components', () => {
+    Vue.component('bar', {
+      template: '<span>Hello</span>'
+    })
+    vm = new Vue({
+      el,
+      template: '<bar @custom.once="foo"></bar>',
+      methods: { foo: spy }
+    })
+    vm.$children[0].$emit('custom')
+    expect(spy.calls.count()).toBe(1)
+    vm.$children[0].$emit('custom')
+    expect(spy.calls.count()).toBe(1) // should not be called again
+  })
+
   it('remove listener', done => {
     const spy2 = jasmine.createSpy('remove listener')
     vm = new Vue({

Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,15 @@ export function updateListeners (`
`24`	`24`	`capture = event.charAt(0) === '!'`
`25`	`25`	`event = capture ? event.slice(1) : event`
`26`	`26`	`if (Array.isArray(cur)) {`
`27`		`- add(event, (cur.invoker = arrInvoker(cur)), capture, once)`
	`27`	`+ add(event, (cur.invoker = arrInvoker(cur)), once, capture)`
`28`	`28`	`} else {`
`29`	`29`	`if (!cur.invoker) {`
`30`	`30`	`fn = cur`
`31`	`31`	`cur = on[name] = {}`
`32`	`32`	`cur.fn = fn`
`33`	`33`	`cur.invoker = fnInvoker(cur)`
`34`	`34`	`}`
`35`		`- add(event, cur.invoker, capture, once)`
	`35`	`+ add(event, cur.invoker, once, capture)`
`36`	`36`	`}`
`37`	`37`	`} else if (cur !== old) {`
`38`	`38`	`if (Array.isArray(old)) {`
`@@ -51,7 +51,7 @@ export function updateListeners (`
`51`	`51`	`event = once ? name.slice(1) : name`
`52`	`52`	`capture = event.charAt(0) === '!'`
`53`	`53`	`event = capture ? event.slice(1) : event`
`54`		`- remove(event, oldOn[name].invoker, capture) // Removal of a capturing listener does not affect a non-capturing version of the same listener, and vice versa.`
	`54`	`+ remove(event, oldOn[name].invoker, capture)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`