diff options
| author | Johann-S <[email protected]> | 2019-08-02 15:51:05 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2019-08-02 16:50:05 +0200 |
| commit | 8b2b490f9b58a02494fe8567d6ce5b9c11a9bf65 (patch) | |
| tree | fca5d7d55bb5f2932eda48f4594b4a839b0a8987 /js/src/scrollspy | |
| parent | 1ebb8e7d9b4bd52c7fc088aeaec12ab9bcb240c6 (diff) | |
| download | bootstrap-8b2b490f9b58a02494fe8567d6ce5b9c11a9bf65.tar.xz bootstrap-8b2b490f9b58a02494fe8567d6ce5b9c11a9bf65.zip | |
add a way to disable jQuery detection
Diffstat (limited to 'js/src/scrollspy')
| -rw-r--r-- | js/src/scrollspy/scrollspy.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/src/scrollspy/scrollspy.js b/js/src/scrollspy/scrollspy.js index b3b87a3b2..fa52a1289 100644 --- a/js/src/scrollspy/scrollspy.js +++ b/js/src/scrollspy/scrollspy.js @@ -6,7 +6,7 @@ */ import { - jQuery as $, + getjQuery, getSelectorFromElement, getUID, makeArray, @@ -336,13 +336,15 @@ EventHandler.on(window, Event.LOAD_DATA_API, () => { .forEach(spy => new ScrollSpy(spy, Manipulator.getDataAttributes(spy))) }) +const $ = getjQuery() + /** * ------------------------------------------------------------------------ * jQuery * ------------------------------------------------------------------------ */ /* istanbul ignore if */ -if (typeof $ !== 'undefined') { +if ($) { const JQUERY_NO_CONFLICT = $.fn[NAME] $.fn[NAME] = ScrollSpy.jQueryInterface $.fn[NAME].Constructor = ScrollSpy |