]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Change `element.parentNode.removeChild(element)` to `element.remove()` (#34071)
authorGeoSot <geo.sotis@gmail.com>
Tue, 25 May 2021 15:30:38 +0000 (18:30 +0300)
committerGitHub <noreply@github.com>
Tue, 25 May 2021 15:30:38 +0000 (18:30 +0300)
js/src/alert.js
js/src/popover.js
js/src/tooltip.js
js/src/util/backdrop.js
js/src/util/sanitizer.js

index 87cc7e73112cea50066cb5b6bdf1c27cd779df63..679a90cdb475ecd7bfcfbf99c9b4cb47c3ed656e 100644 (file)
@@ -78,9 +78,7 @@ class Alert extends BaseComponent {
   }
 
   _destroyElement(element) {
-    if (element.parentNode) {
-      element.parentNode.removeChild(element)
-    }
+    element.remove()
 
     EventHandler.trigger(element, EVENT_CLOSED)
   }
index e8614156cd679a74e0f5812be9446ba2e4193c5f..929391392a50aa6e6c71c154ee76ac8ad11f03b3 100644 (file)
@@ -98,11 +98,11 @@ class Popover extends Tooltip {
     this.tip = super.getTipElement()
 
     if (!this.getTitle()) {
-      this.tip.removeChild(SelectorEngine.findOne(SELECTOR_TITLE, this.tip))
+      SelectorEngine.findOne(SELECTOR_TITLE, this.tip).remove()
     }
 
     if (!this._getContent()) {
-      this.tip.removeChild(SelectorEngine.findOne(SELECTOR_CONTENT, this.tip))
+      SelectorEngine.findOne(SELECTOR_CONTENT, this.tip).remove()
     }
 
     return this.tip
index 84379c88f283823af4ec74a9165c63e5d805d111..2eb91965b259b1412ec5e6998711f6fbb58839dc 100644 (file)
@@ -208,8 +208,8 @@ class Tooltip extends BaseComponent {
 
     EventHandler.off(this._element.closest(`.${CLASS_NAME_MODAL}`), 'hide.bs.modal', this._hideModalHandler)
 
-    if (this.tip && this.tip.parentNode) {
-      this.tip.parentNode.removeChild(this.tip)
+    if (this.tip) {
+      this.tip.remove()
     }
 
     if (this._popper) {
@@ -314,8 +314,8 @@ class Tooltip extends BaseComponent {
         return
       }
 
-      if (this._hoverState !== HOVER_STATE_SHOW && tip.parentNode) {
-        tip.parentNode.removeChild(tip)
+      if (this._hoverState !== HOVER_STATE_SHOW) {
+        tip.remove()
       }
 
       this._cleanTipClass()
index c05c221ddfe5cfd8e8ee5d96c126433982c197cb..f7990f701994b8f40ca84a606f55304111b9110b 100644 (file)
@@ -116,11 +116,7 @@ class Backdrop {
 
     EventHandler.off(this._element, EVENT_MOUSEDOWN)
 
-    const { parentNode } = this._getElement()
-    if (parentNode) {
-      parentNode.removeChild(this._element)
-    }
-
+    this._element.remove()
     this._isAppended = false
   }
 
index 5fc94275c8adef85412836361cbc3f2cf1d4b1c1..d1e55a2b1eace0c5bb385001487a2fab894ee9c7 100644 (file)
@@ -108,7 +108,7 @@ export function sanitizeHtml(unsafeHtml, allowList, sanitizeFn) {
     const elName = el.nodeName.toLowerCase()
 
     if (!allowlistKeys.includes(elName)) {
-      el.parentNode.removeChild(el)
+      el.remove()
 
       continue
     }