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/alert.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/js/src/alert.js b/js/src/alert.js
index 1bdd9706a..9332aa891 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -114,8 +114,11 @@ class Alert {
   }
 
   _destroyElement(element) {
+    if (element.parentNode) {
+      element.parentNode.removeChild(element)
+    }
+
     EventHandler.trigger(element, Event.CLOSED)
-    element.parentNode.removeChild(element)
   }
 
   // Static
@@ -150,8 +153,8 @@ EventHandler.on(document, Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleD
  * add .alert 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]               = Alert._jQueryInterface
   $.fn[NAME].Constructor   = Alert
-- 
cgit v1.2.3