diff options
| author | Johann-S <[email protected]> | 2018-03-11 16:18:56 +0100 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2019-02-20 22:05:45 +0200 |
| commit | 7eddee286eb76da4d057a59706e4c512206dab45 (patch) | |
| tree | 5319cd291c015fcec49e2af0cb1c890d0d966927 /js/src/alert.js | |
| parent | 0263d1742ce8ad25f0f2de30beebae69b2f55f10 (diff) | |
| download | bootstrap-7eddee286eb76da4d057a59706e4c512206dab45.tar.xz bootstrap-7eddee286eb76da4d057a59706e4c512206dab45.zip | |
remove old references to jquery and some fixes
Diffstat (limited to 'js/src/alert.js')
| -rw-r--r-- | js/src/alert.js | 9 |
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 |