diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 54ec0367ed..2c5f03a293 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -185,6 +185,10 @@ class Tooltip extends BaseComponent {
this.tip.remove()
}
+ if (this._config.originalTitle) {
+ this._element.setAttribute('title', this._config.originalTitle)
+ }
+
this._disposePopper()
super.dispose()
}
diff --git a/js/tests/unit/tooltip.spec.js b/js/tests/unit/tooltip.spec.js
index c8ab068187..4330571b47 100644
--- a/js/tests/unit/tooltip.spec.js
+++ b/js/tests/unit/tooltip.spec.js
@@ -419,6 +419,25 @@ describe('Tooltip', () => {
tooltip.show()
})
})
+
+ it('should destroy a tooltip and reset it\'s initial title', () => {
+ fixtureEl.innerHTML = [
+ '',
+ ''
+ ].join('')
+
+ const tooltipWithTitleEl = fixtureEl.querySelector('#tooltipWithTitle')
+ const tooltip = new Tooltip('#tooltipWithTitle')
+ expect(tooltipWithTitleEl.getAttribute('title')).toBeNull()
+ tooltip.dispose()
+ expect(tooltipWithTitleEl.getAttribute('title')).toBe('tooltipTitle')
+
+ const tooltipWithoutTitleEl = fixtureEl.querySelector('#tooltipWithoutTitle')
+ const tooltip2 = new Tooltip('#tooltipWithTitle')
+ expect(tooltipWithoutTitleEl.getAttribute('title')).toBeNull()
+ tooltip2.dispose()
+ expect(tooltipWithoutTitleEl.getAttribute('title')).toBeNull()
+ })
})
describe('show', () => {