diff options
author | XhmikosR <xhmikosr@gmail.com> | 2019-08-27 16:03:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-27 16:03:21 +0300 |
commit | bf57274fb51fd59f8d680590ead92cb631cf8ea1 (patch) | |
tree | 63aec9b1415470f399e1cbab0ae0d404d1389923 /js/dist/dom/event-handler.js | |
parent | cad3d1098a2340299e88d05d7da190aac08ca319 (diff) |
Dist (#29263)
Diffstat (limited to 'js/dist/dom/event-handler.js')
-rw-r--r-- | js/dist/dom/event-handler.js | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/js/dist/dom/event-handler.js b/js/dist/dom/event-handler.js index b07de040e5..19d0de6d03 100644 --- a/js/dist/dom/event-handler.js +++ b/js/dist/dom/event-handler.js @@ -15,8 +15,17 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ - var _window = window, - jQuery = _window.jQuery; // Shoutout AngusCroll (https://goo.gl/pxwQGp) + + var getjQuery = function getjQuery() { + var _window = window, + jQuery = _window.jQuery; + + if (jQuery && !document.body.hasAttribute('data-no-jquery')) { + return jQuery; + } + + return null; + }; /** * -------------------------------------------------------------------------- @@ -30,6 +39,7 @@ * ------------------------------------------------------------------------ */ + var $ = getjQuery(); var namespaceRegex = /[^.]*(?=\..*)\.|.*/; var stripNameRegex = /\..*/; var keyEventRegex = /^key/; @@ -257,9 +267,9 @@ var defaultPrevented = false; var evt = null; - if (inNamespace && typeof jQuery !== 'undefined') { - jQueryEvent = jQuery.Event(event, args); - jQuery(element).trigger(jQueryEvent); + if (inNamespace && $) { + jQueryEvent = $.Event(event, args); + $(element).trigger(jQueryEvent); bubbles = !jQueryEvent.isPropagationStopped(); nativeDispatch = !jQueryEvent.isImmediatePropagationStopped(); defaultPrevented = jQueryEvent.isDefaultPrevented(); |