1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-09 07:06:36 +02:00

Fix detection of nativeEvents + trigger events with arguments

This commit is contained in:
Johann-S
2017-08-26 12:34:24 +02:00
committed by XhmikosR
parent 3e8bc9d9ec
commit 79144adb12

View File

@@ -74,17 +74,18 @@ function getEvent(element) {
return eventRegistry[uid] = eventRegistry[uid] || {} return eventRegistry[uid] = eventRegistry[uid] || {}
} }
const nativeEvents = const nativeEvents = [
`click,dblclick,mouseup,mousedown,contextmenu, 'click', 'dblclick', 'mouseup', 'mousedown', 'contextmenu',
'mousewheel,DOMMouseScroll, 'mousewheel', 'DOMMouseScroll',
'mouseover,mouseout,mousemove,selectstart,selectend, 'mouseover', 'mouseout', 'mousemove', 'selectstart', 'selectend',
'keydown,keypress,keyup, 'keydown', 'keypress', 'keyup',
'orientationchange, 'orientationchange',
'touchstart,touchmove,touchend,touchcancel, 'touchstart', 'touchmove', 'touchend', 'touchcancel',
'gesturestart,gesturechange,gestureend, 'gesturestart', 'gesturechange', 'gestureend',
'focus,blur,change,reset,select,submit, 'focus', 'blur', 'change', 'reset', 'select', 'submit',
'load,unload,beforeunload,resize,move,DOMContentLoaded,readystatechange, 'load', 'unload', 'beforeunload', 'resize', 'move', 'DOMContentLoaded', 'readystatechange',
'error,abort,scroll`.split(',') 'error', 'abort', 'scroll'
]
function bootstrapHandler(element, fn) { function bootstrapHandler(element, fn) {
return function (event) { return function (event) {
@@ -165,9 +166,9 @@ const EventHandler = {
delete events[typeEvent][uidEvent] delete events[typeEvent][uidEvent]
}, },
trigger(element, event) { trigger(element, event, args) {
if (typeof event !== 'string' || if (typeof event !== 'string' ||
(typeof element === 'undefined' || element === null)) { (typeof element === 'undefined' || element === null)) {
return null return null
} }
const typeEvent = event.replace(stripNameRegex, '') const typeEvent = event.replace(stripNameRegex, '')
@@ -175,13 +176,14 @@ const EventHandler = {
let returnedEvent = null let returnedEvent = null
if (isNative) { if (isNative) {
const evt = document.createEvent('HTMLEvents') const evt = document.createEvent('HTMLEvents')
evt.initEvent(typeEvent, true, true) evt.initEvent(typeEvent, true, true, typeof args !== 'undefined' ? args : {})
element.dispatchEvent(evt) element.dispatchEvent(evt)
returnedEvent = evt returnedEvent = evt
} else { } else {
const eventToDispatch = new CustomEvent(event, { const eventToDispatch = new CustomEvent(event, {
bubbles: true, bubbles: true,
cancelable: true cancelable: true,
detail: typeof args !== 'undefined' ? args : {}
}) })
element.dispatchEvent(eventToDispatch) element.dispatchEvent(eventToDispatch)
returnedEvent = eventToDispatch returnedEvent = eventToDispatch