Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann-S <johann.servoire@gmail.com>2018-03-11 18:18:56 +0300
committerXhmikosR <xhmikosr@gmail.com>2019-02-20 23:05:45 +0300
commit7eddee286eb76da4d057a59706e4c512206dab45 (patch)
tree5319cd291c015fcec49e2af0cb1c890d0d966927 /js/src/button.js
parent0263d1742ce8ad25f0f2de30beebae69b2f55f10 (diff)
remove old references to jquery and some fixes
Diffstat (limited to 'js/src/button.js')
-rw-r--r--js/src/button.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/button.js b/js/src/button.js
index acba736af4..0e3b8a9df5 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -9,6 +9,7 @@ import Data from './dom/data'
import EventHandler from './dom/eventHandler'
import Manipulator from './dom/manipulator'
import SelectorEngine from './dom/selectorEngine'
+import Util from './util'
/**
* ------------------------------------------------------------------------
@@ -175,8 +176,8 @@ EventHandler.on(document, Event.BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, (eve
* add .button to jQuery only if jQuery is present
*/
-if (typeof window.$ !== 'undefined' || typeof window.jQuery !== 'undefined') {
- const $ = window.$ || window.jQuery
+const $ = Util.jQuery
+if (typeof $ !== 'undefined') {
const JQUERY_NO_CONFLICT = $.fn[NAME]
$.fn[NAME] = Button._jQueryInterface
$.fn[NAME].Constructor = Button