From 02dbd87ffa94ff0d2f5bbc43a13f13033ce01f0b Mon Sep 17 00:00:00 2001 From: Kyle Tsang <6854874+kyletsang@users.noreply.github.com> Date: Thu, 11 Feb 2021 21:51:34 -0800 Subject: Fix event handler removal in dropdown/carousel dispose (#33000) * Fix event handler removal in carousel dispose * Fix event handler removal in dropdown dispose * Test event handlers in scrollspy dispose * Test event handlers in toast dispose * Test event handlers in tooltip dispose Co-authored-by: XhmikosR Co-authored-by: Rohit Sharma --- js/src/carousel.js | 3 ++- js/src/dropdown.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'js/src') diff --git a/js/src/carousel.js b/js/src/carousel.js index e4c13d593..17814d42d 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -216,7 +216,6 @@ class Carousel extends BaseComponent { } dispose() { - super.dispose() EventHandler.off(this._element, EVENT_KEY) this._items = null @@ -226,6 +225,8 @@ class Carousel extends BaseComponent { this._isSliding = null this._activeElement = null this._indicatorsElement = null + + super.dispose() } // Private diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 2516b945a..97c0f5052 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -232,7 +232,6 @@ class Dropdown extends BaseComponent { } dispose() { - super.dispose() EventHandler.off(this._element, EVENT_KEY) this._menu = null @@ -240,6 +239,8 @@ class Dropdown extends BaseComponent { this._popper.destroy() this._popper = null } + + super.dispose() } update() { -- cgit v1.2.3