From a03ed54eff2a1cbaafdafcbc1ce620cb6d6370c1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 21 Nov 2020 07:23:46 +0200 Subject: [PATCH] Rename Data objects --- js/src/alert.js | 8 ++++---- js/src/button.js | 10 +++++----- js/src/carousel.js | 12 ++++++------ js/src/collapse.js | 14 +++++++------- js/src/dom/data.js | 12 +++--------- js/src/dropdown.js | 10 +++++----- js/src/modal.js | 10 +++++----- js/src/popover.js | 6 +++--- js/src/scrollspy.js | 8 ++++---- js/src/tab.js | 10 +++++----- js/src/toast.js | 8 ++++---- js/src/tooltip.js | 22 +++++++++++----------- js/tests/unit/dom/data.spec.js | 16 ++++++++-------- 13 files changed, 70 insertions(+), 76 deletions(-) diff --git a/js/src/alert.js b/js/src/alert.js index 1e025717b60e..9422f042c724 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -49,7 +49,7 @@ class Alert { this._element = element if (this._element) { - Data.setData(element, this) + Data.set(element, this) } } @@ -73,7 +73,7 @@ class Alert { } dispose() { - Data.removeData(this._element) + Data.remove(this._element) this._element = null } @@ -113,7 +113,7 @@ class Alert { static jQueryInterface(config) { return this.each(function () { - let data = Data.getData(this) + let data = Data.get(this) if (!data) { data = new Alert(this) @@ -136,7 +136,7 @@ class Alert { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } diff --git a/js/src/button.js b/js/src/button.js index 8cc307ec1b8b..e2831fc3509b 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -36,7 +36,7 @@ const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}` class Button { constructor(element) { this._element = element - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -53,7 +53,7 @@ class Button { } dispose() { - Data.removeData(this._element) + Data.remove(this._element) this._element = null } @@ -61,7 +61,7 @@ class Button { static jQueryInterface(config) { return this.each(function () { - let data = Data.getData(this) + let data = Data.get(this) if (!data) { data = new Button(this) @@ -74,7 +74,7 @@ class Button { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } @@ -89,7 +89,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, event => { const button = event.target.closest(SELECTOR_DATA_TOGGLE) - let data = Data.getData(button) + let data = Data.get(button) if (!data) { data = new Button(button) } diff --git a/js/src/carousel.js b/js/src/carousel.js index a35e6e509f1b..dca90267102f 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -122,7 +122,7 @@ class Carousel { this._pointerEvent = Boolean(window.PointerEvent) this._addEventListeners() - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -219,7 +219,7 @@ class Carousel { dispose() { EventHandler.off(this._element, EVENT_KEY) - Data.removeData(this._element) + Data.remove(this._element) this._items = null this._config = null @@ -526,7 +526,7 @@ class Carousel { // Static static carouselInterface(element, config) { - let data = Data.getData(element) + let data = Data.get(element) let _config = { ...Default, ...Manipulator.getDataAttributes(element) @@ -585,14 +585,14 @@ class Carousel { Carousel.carouselInterface(target, config) if (slideIndex) { - Data.getData(target).to(slideIndex) + Data.get(target).to(slideIndex) } event.preventDefault() } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } @@ -608,7 +608,7 @@ EventHandler.on(window, EVENT_LOAD_DATA_API, () => { const carousels = SelectorEngine.find(SELECTOR_DATA_RIDE) for (let i = 0, len = carousels.length; i < len; i++) { - Carousel.carouselInterface(carousels[i], Data.getData(carousels[i])) + Carousel.carouselInterface(carousels[i], Data.get(carousels[i])) } }) diff --git a/js/src/collapse.js b/js/src/collapse.js index 6fbd2f6e801d..2ee9ea9c39a4 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -101,7 +101,7 @@ class Collapse { this.toggle() } - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -151,7 +151,7 @@ class Collapse { const container = SelectorEngine.findOne(this._selector) if (actives) { const tempActiveData = actives.find(elem => container !== elem) - activesData = tempActiveData ? Data.getData(tempActiveData) : null + activesData = tempActiveData ? Data.get(tempActiveData) : null if (activesData && activesData._isTransitioning) { return @@ -170,7 +170,7 @@ class Collapse { } if (!activesData) { - Data.setData(elemActive, null) + Data.set(elemActive, null) } }) } @@ -266,7 +266,7 @@ class Collapse { } dispose() { - Data.removeData(this._element) + Data.remove(this._element) this._config = null this._parent = null @@ -339,7 +339,7 @@ class Collapse { // Static static collapseInterface(element, config) { - let data = Data.getData(element) + let data = Data.get(element) const _config = { ...Default, ...Manipulator.getDataAttributes(element), @@ -370,7 +370,7 @@ class Collapse { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } @@ -391,7 +391,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function ( const selectorElements = SelectorEngine.find(selector) selectorElements.forEach(element => { - const data = Data.getData(element) + const data = Data.get(element) let config if (data) { // update parent attribute diff --git a/js/src/dom/data.js b/js/src/dom/data.js index 535b783842b4..cea50e8fd661 100644 --- a/js/src/dom/data.js +++ b/js/src/dom/data.js @@ -5,22 +5,16 @@ * -------------------------------------------------------------------------- */ -/** - * ------------------------------------------------------------------------ - * Constants - * ------------------------------------------------------------------------ - */ - const mapData = new Map() export default { - setData(element, data) { + set(element, data) { mapData.set(element, data) }, - getData(element) { + get(element) { return mapData.get(element) || null }, - removeData(element) { + remove(element) { mapData.delete(element) } } diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 449d55b9041b..3e879ecea717 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -105,7 +105,7 @@ class Dropdown { this._inNavbar = this._detectNavbar() this._addEventListeners() - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -229,7 +229,7 @@ class Dropdown { } dispose() { - Data.removeData(this._element) + Data.remove(this._element) EventHandler.off(this._element, EVENT_KEY) this._element = null this._menu = null @@ -345,7 +345,7 @@ class Dropdown { // Static static dropdownInterface(element, config) { - let data = Data.getData(element) + let data = Data.get(element) const _config = typeof config === 'object' ? config : null if (!data) { @@ -377,7 +377,7 @@ class Dropdown { for (let i = 0, len = toggles.length; i < len; i++) { const parent = Dropdown.getParentFromElement(toggles[i]) - const context = Data.getData(toggles[i]) + const context = Data.get(toggles[i]) const relatedTarget = { relatedTarget: toggles[i] } @@ -491,7 +491,7 @@ class Dropdown { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } diff --git a/js/src/modal.js b/js/src/modal.js index 56f73f179f3b..a35b5acc8fd5 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -92,7 +92,7 @@ class Modal { this._ignoreBackdropClick = false this._isTransitioning = false this._scrollbarWidth = 0 - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -208,7 +208,7 @@ class Modal { */ EventHandler.off(document, EVENT_FOCUSIN) - Data.removeData(this._element) + Data.remove(this._element) this._config = null this._element = null @@ -541,7 +541,7 @@ class Modal { static jQueryInterface(config, relatedTarget) { return this.each(function () { - let data = Data.getData(this) + let data = Data.get(this) const _config = { ...Default, ...Manipulator.getDataAttributes(this), @@ -565,7 +565,7 @@ class Modal { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } @@ -595,7 +595,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function ( }) }) - let data = Data.getData(target) + let data = Data.get(target) if (!data) { const config = { ...Manipulator.getDataAttributes(target), diff --git a/js/src/popover.js b/js/src/popover.js index 3699ac9d1702..9de89ee6a159 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -140,7 +140,7 @@ class Popover extends Tooltip { static jQueryInterface(config) { return this.each(function () { - let data = Data.getData(this) + let data = Data.get(this) const _config = typeof config === 'object' ? config : null if (!data && /dispose|hide/.test(config)) { @@ -149,7 +149,7 @@ class Popover extends Tooltip { if (!data) { data = new Popover(this, _config) - Data.setData(this, data) + Data.set(this, data) } if (typeof config === 'string') { @@ -163,7 +163,7 @@ class Popover extends Tooltip { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 5d0aa0ff01b0..1116448a4de1 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -82,7 +82,7 @@ class ScrollSpy { this.refresh() this._process() - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -141,7 +141,7 @@ class ScrollSpy { } dispose() { - Data.removeData(this._element) + Data.remove(this._element) EventHandler.off(this._scrollElement, EVENT_KEY) this._element = null @@ -285,7 +285,7 @@ class ScrollSpy { static jQueryInterface(config) { return this.each(function () { - let data = Data.getData(this) + let data = Data.get(this) const _config = typeof config === 'object' && config if (!data) { @@ -303,7 +303,7 @@ class ScrollSpy { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } diff --git a/js/src/tab.js b/js/src/tab.js index 1933cad97c61..deceb9044865 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -60,7 +60,7 @@ class Tab { constructor(element) { this._element = element - Data.setData(this._element, this) + Data.set(this._element, this) } // Getters @@ -128,7 +128,7 @@ class Tab { } dispose() { - Data.removeData(this._element) + Data.remove(this._element) this._element = null } @@ -206,7 +206,7 @@ class Tab { static jQueryInterface(config) { return this.each(function () { - const data = Data.getData(this) || new Tab(this) + const data = Data.get(this) || new Tab(this) if (typeof config === 'string') { if (typeof data[config] === 'undefined') { @@ -219,7 +219,7 @@ class Tab { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } @@ -232,7 +232,7 @@ class Tab { EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) { event.preventDefault() - const data = Data.getData(this) || new Tab(this) + const data = Data.get(this) || new Tab(this) data.show() }) diff --git a/js/src/toast.js b/js/src/toast.js index d6ca0977e400..f00aa8158fde 100644 --- a/js/src/toast.js +++ b/js/src/toast.js @@ -66,7 +66,7 @@ class Toast { this._config = this._getConfig(config) this._timeout = null this._setListeners() - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -159,7 +159,7 @@ class Toast { } EventHandler.off(this._element, EVENT_CLICK_DISMISS) - Data.removeData(this._element) + Data.remove(this._element) this._element = null this._config = null @@ -192,7 +192,7 @@ class Toast { static jQueryInterface(config) { return this.each(function () { - let data = Data.getData(this) + let data = Data.get(this) const _config = typeof config === 'object' && config if (!data) { @@ -210,7 +210,7 @@ class Toast { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } diff --git a/js/src/tooltip.js b/js/src/tooltip.js index f332f38f19c2..16646b3ee452 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -141,7 +141,7 @@ class Tooltip { this.tip = null this._setListeners() - Data.setData(element, this) + Data.set(element, this) } // Getters @@ -194,14 +194,14 @@ class Tooltip { } if (event) { - let context = Data.getData(event.delegateTarget) + let context = Data.get(event.delegateTarget) if (!context) { context = new this.constructor( event.delegateTarget, this._getDelegateConfig() ) - Data.setData(event.delegateTarget, context) + Data.set(event.delegateTarget, context) } context._activeTrigger.click = !context._activeTrigger.click @@ -224,7 +224,7 @@ class Tooltip { dispose() { clearTimeout(this._timeout) - Data.removeData(this.element) + Data.remove(this.element) EventHandler.off(this.element, this.constructor.EVENT_KEY) EventHandler.off(this.element.closest(`.${CLASS_NAME_MODAL}`), 'hide.bs.modal', this._hideModalHandler) @@ -283,7 +283,7 @@ class Tooltip { this._addAttachmentClass(attachment) const container = this._getContainer() - Data.setData(tip, this) + Data.set(tip, this) if (!this.element.ownerDocument.documentElement.contains(this.tip)) { container.appendChild(tip) @@ -587,14 +587,14 @@ class Tooltip { } _enter(event, context) { - context = context || Data.getData(event.delegateTarget) + context = context || Data.get(event.delegateTarget) if (!context) { context = new this.constructor( event.delegateTarget, this._getDelegateConfig() ) - Data.setData(event.delegateTarget, context) + Data.set(event.delegateTarget, context) } if (event) { @@ -626,14 +626,14 @@ class Tooltip { } _leave(event, context) { - context = context || Data.getData(event.delegateTarget) + context = context || Data.get(event.delegateTarget) if (!context) { context = new this.constructor( event.delegateTarget, this._getDelegateConfig() ) - Data.setData(event.delegateTarget, context) + Data.set(event.delegateTarget, context) } if (event) { @@ -762,7 +762,7 @@ class Tooltip { static jQueryInterface(config) { return this.each(function () { - let data = Data.getData(this) + let data = Data.get(this) const _config = typeof config === 'object' && config if (!data && /dispose|hide/.test(config)) { @@ -784,7 +784,7 @@ class Tooltip { } static getInstance(element) { - return Data.getData(element) + return Data.get(element) } } diff --git a/js/tests/unit/dom/data.spec.js b/js/tests/unit/dom/data.spec.js index e471ede39716..e7713d5b1605 100644 --- a/js/tests/unit/dom/data.spec.js +++ b/js/tests/unit/dom/data.spec.js @@ -14,7 +14,7 @@ describe('Data', () => { clearFixture() }) - describe('getData', () => { + describe('get', () => { it('should return stored data', () => { fixtureEl.innerHTML = '
' @@ -23,13 +23,13 @@ describe('Data', () => { test: 'bsData' } - Data.setData(div, data) - expect(Data.getData(div)).toEqual(data) + Data.set(div, data) + expect(Data.get(div)).toEqual(data) }) it('should return null on undefined element', () => { - expect(Data.getData(null)).toEqual(null) - expect(Data.getData(undefined)).toEqual(null) + expect(Data.get(null)).toEqual(null) + expect(Data.get(undefined)).toEqual(null) }) it('should return null when an element have nothing stored', () => { @@ -37,17 +37,17 @@ describe('Data', () => { const div = fixtureEl.querySelector('div') - expect(Data.getData(div)).toEqual(null) + expect(Data.get(div)).toEqual(null) }) }) - describe('removeData', () => { + describe('remove', () => { it('should do nothing when an element have nothing stored', () => { fixtureEl.innerHTML = '
' const div = fixtureEl.querySelector('div') - Data.removeData(div) + Data.remove(div) expect().nothing() }) })