From 7eddee286eb76da4d057a59706e4c512206dab45 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Sun, 11 Mar 2018 16:18:56 +0100
Subject: remove old references to jquery and some fixes

---
 js/src/button.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/src/button.js')

diff --git a/js/src/button.js b/js/src/button.js
index acba736af..0e3b8a9df 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
-- 
cgit v1.2.3