From c91bf05553528425a87a5fc5cf4a2418f00374cd Mon Sep 17 00:00:00 2001 From: Richard Harris Date: Sun, 11 Aug 2019 10:46:00 -0400 Subject: [PATCH] simplify self function, use this instead of el --- .../compile/render_dom/wrappers/shared/add_event_handlers.ts | 2 +- src/runtime/internal/dom.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/compiler/compile/render_dom/wrappers/shared/add_event_handlers.ts b/src/compiler/compile/render_dom/wrappers/shared/add_event_handlers.ts index 06c679d984..312b10013f 100644 --- a/src/compiler/compile/render_dom/wrappers/shared/add_event_handlers.ts +++ b/src/compiler/compile/render_dom/wrappers/shared/add_event_handlers.ts @@ -10,7 +10,7 @@ export default function add_event_handlers( let snippet = handler.render(block); if (handler.modifiers.has('preventDefault')) snippet = `@prevent_default(${snippet})`; if (handler.modifiers.has('stopPropagation')) snippet = `@stop_propagation(${snippet})`; - if (handler.modifiers.has('self')) snippet = `@self(${snippet}, ${target})`; + if (handler.modifiers.has('self')) snippet = `@self(${snippet})`; const opts = ['passive', 'once', 'capture'].filter(mod => handler.modifiers.has(mod)); diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts index f8c2e7bfcd..25c804ff34 100644 --- a/src/runtime/internal/dom.ts +++ b/src/runtime/internal/dom.ts @@ -73,11 +73,10 @@ export function stop_propagation(fn) { }; } -export function self(fn, el) { +export function self(fn) { return function(event) { - if(event.target !== el) return; // @ts-ignore - return fn.call(this, event); + if (event.target === this) fn.call(this, event); }; }