Allow use of `dispose/hide` methods on Tooltip & Popover from jQueryInterface, when...

diff --git a/js/src/popover.js b/js/src/popover.js
index 6ab31d6e49aafce5726e16d23cf93c8c185a096e..e8614156cd679a74e0f5812be9446ba2e4193c5f 100644 (file)
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -149,10 +149,6 @@ class Popover extends Tooltip {
       let data = Data.get(this, DATA_KEY)
       const _config = typeof config === 'object' ? config : null
 
-      if (!data && /dispose|hide/.test(config)) {
-        return
-      }
-
       if (!data) {
         data = new Popover(this, _config)
         Data.set(this, DATA_KEY, data)

diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index d164da2b389847fa1447dbdbe9e8419e407d93a0..84379c88f283823af4ec74a9165c63e5d805d111 100644 (file)
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -725,10 +725,6 @@ class Tooltip extends BaseComponent {
       let data = Data.get(this, DATA_KEY)
       const _config = typeof config === 'object' && config
 
-      if (!data && /dispose|hide/.test(config)) {
-        return
-      }
-
       if (!data) {
         data = new Tooltip(this, _config)
       }

diff --git a/js/tests/unit/popover.spec.js b/js/tests/unit/popover.spec.js
index 7c741fe470085faf834464ee2671bdc8234069d3..def0f5f040ac506cd0124ba5242370aac743ffea 100644 (file)
--- a/js/tests/unit/popover.spec.js
+++ b/js/tests/unit/popover.spec.js
@@ -266,21 +266,6 @@ describe('Popover', () => {
 
       expect(popover.show).toHaveBeenCalled()
     })
-
-    it('should do nothing if dipose is called when a popover do not exist', () => {
-      fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
-
-      const popoverEl = fixtureEl.querySelector('a')
-
-      jQueryMock.fn.popover = Popover.jQueryInterface
-      jQueryMock.elements = [popoverEl]
-
-      spyOn(Popover.prototype, 'dispose')
-
-      jQueryMock.fn.popover.call(jQueryMock, 'dispose')
-
-      expect(Popover.prototype.dispose).not.toHaveBeenCalled()
-    })
   })
 
   describe('getInstance', () => {

diff --git a/js/tests/unit/tooltip.spec.js b/js/tests/unit/tooltip.spec.js
index 80fb6a8a127ffd794d8f2047cec26951ecb5d2ba..27c7a350bc06bf350e67ca4bdf39b35575b4cc60 100644 (file)
--- a/js/tests/unit/tooltip.spec.js
+++ b/js/tests/unit/tooltip.spec.js
@@ -1351,21 +1351,6 @@ describe('Tooltip', () => {
       expect(tooltip.show).toHaveBeenCalled()
     })
 
-    it('should do nothing when we call dispose or hide if there is no tooltip created', () => {
-      fixtureEl.innerHTML = '<div></div>'
-
-      const div = fixtureEl.querySelector('div')
-
-      spyOn(Tooltip.prototype, 'dispose')
-
-      jQueryMock.fn.tooltip = Tooltip.jQueryInterface
-      jQueryMock.elements = [div]
-
-      jQueryMock.fn.tooltip.call(jQueryMock, 'dispose')
-
-      expect(Tooltip.prototype.dispose).not.toHaveBeenCalled()
-    })
-
     it('should throw error on undefined method', () => {
       fixtureEl.innerHTML = '<div></div>'