aboutsummaryrefslogtreecommitdiff
path: root/js/src/alert.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/src/alert.js')
-rw-r--r--js/src/alert.js9
1 files changed, 6 insertions, 3 deletions
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