aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoSot <[email protected]>2021-05-25 18:30:38 +0300
committerGitHub <[email protected]>2021-05-25 18:30:38 +0300
commit544d9ac3cf5b7a501524c1bab9570f4b46b8e7e4 (patch)
tree0a1f81f01296d844a0d732983e829b2931214682
parent69a9b8794506dca2417a79293b2f5d89caa0e4d2 (diff)
downloadbootstrap-544d9ac3cf5b7a501524c1bab9570f4b46b8e7e4.tar.xz
bootstrap-544d9ac3cf5b7a501524c1bab9570f4b46b8e7e4.zip
Change `element.parentNode.removeChild(element)` to `element.remove()` (#34071)
-rw-r--r--js/src/alert.js4
-rw-r--r--js/src/popover.js4
-rw-r--r--js/src/tooltip.js8
-rw-r--r--js/src/util/backdrop.js6
-rw-r--r--js/src/util/sanitizer.js2
5 files changed, 9 insertions, 15 deletions
diff --git a/js/src/alert.js b/js/src/alert.js
index 87cc7e731..679a90cdb 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -78,9 +78,7 @@ class Alert extends BaseComponent {
}
_destroyElement(element) {
- if (element.parentNode) {
- element.parentNode.removeChild(element)
- }
+ element.remove()
EventHandler.trigger(element, EVENT_CLOSED)
}
diff --git a/js/src/popover.js b/js/src/popover.js
index e8614156c..929391392 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -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
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 84379c88f..2eb91965b 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -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()
diff --git a/js/src/util/backdrop.js b/js/src/util/backdrop.js
index c05c221dd..f7990f701 100644
--- a/js/src/util/backdrop.js
+++ b/js/src/util/backdrop.js
@@ -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
}
diff --git a/js/src/util/sanitizer.js b/js/src/util/sanitizer.js
index 5fc94275c..d1e55a2b1 100644
--- a/js/src/util/sanitizer.js
+++ b/js/src/util/sanitizer.js
@@ -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
}