From ef82822b422b2764c9fa045323a0349c042da839 Mon Sep 17 00:00:00 2001 From: alpadev Date: Wed, 31 Mar 2021 14:29:31 +0200 Subject: [PATCH] refactor: simplify custom events regex and move it to a variable requested by GeoSot - https://github.com/twbs/bootstrap/pull/33310#discussion_r601925640 --- js/src/dom/event-handler.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/src/dom/event-handler.js b/js/src/dom/event-handler.js index 834f5b2fe8bf..8ccb887fc3bf 100644 --- a/js/src/dom/event-handler.js +++ b/js/src/dom/event-handler.js @@ -22,6 +22,7 @@ const customEvents = { mouseenter: 'mouseover', mouseleave: 'mouseout' } +const customEventsRegex = /^(mouseenter|mouseleave)/i const nativeEvents = new Set([ 'click', 'dblclick', @@ -165,8 +166,8 @@ function addHandler(element, originalTypeEvent, handler, delegationFn, oneOff) { } // in case of mouseenter or mouseleave wrap the handler within a function that checks for its DOM position - // this prevents the handler getting triggered the same way as mouseover or mouseout does - if (/^mouse(enter|leave)/i.test(originalTypeEvent)) { + // this prevents the handler from being dispatched the same way as mouseover or mouseout does + if (customEventsRegex.test(originalTypeEvent)) { const wrapFn = fn => { return function (event) { if (!event.relatedTarget || (event.relatedTarget !== event.delegateTarget && event.relatedTarget.contains(event.delegateTarget))) {