diff options
| author | Johann-S <[email protected]> | 2019-07-28 15:24:46 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2019-07-29 11:34:12 +0200 |
| commit | dcba52677556bedb04a07825c2023e0beeea6f1e (patch) | |
| tree | ddf5bbf334408536c609f2ded245e119c1a9de17 /js/src/dropdown | |
| parent | 144220f0c5777e07fb1832324d52a590bec363e2 (diff) | |
| download | bootstrap-dcba52677556bedb04a07825c2023e0beeea6f1e.tar.xz bootstrap-dcba52677556bedb04a07825c2023e0beeea6f1e.zip | |
remove underscore for static methods
Diffstat (limited to 'js/src/dropdown')
| -rw-r--r-- | js/src/dropdown/dropdown.js | 44 | ||||
| -rw-r--r-- | js/src/dropdown/dropdown.spec.js | 18 |
2 files changed, 31 insertions, 31 deletions
diff --git a/js/src/dropdown/dropdown.js b/js/src/dropdown/dropdown.js index f30c3924b..7f5264d05 100644 --- a/js/src/dropdown/dropdown.js +++ b/js/src/dropdown/dropdown.js @@ -133,10 +133,10 @@ class Dropdown { return } - const parent = Dropdown._getParentFromElement(this._element) + const parent = Dropdown.getParentFromElement(this._element) const isActive = this._menu.classList.contains(ClassName.SHOW) - Dropdown._clearMenus() + Dropdown.clearMenus() if (isActive) { return @@ -207,7 +207,7 @@ class Dropdown { return } - const parent = Dropdown._getParentFromElement(this._element) + const parent = Dropdown.getParentFromElement(this._element) const relatedTarget = { relatedTarget: this._element } @@ -228,7 +228,7 @@ class Dropdown { return } - const parent = Dropdown._getParentFromElement(this._element) + const parent = Dropdown.getParentFromElement(this._element) const relatedTarget = { relatedTarget: this._element } @@ -289,7 +289,7 @@ class Dropdown { } _getMenuElement() { - const parent = Dropdown._getParentFromElement(this._element) + const parent = Dropdown.getParentFromElement(this._element) return SelectorEngine.findOne(Selector.MENU, parent) } @@ -364,7 +364,7 @@ class Dropdown { // Static - static _dropdownInterface(element, config) { + static dropdownInterface(element, config) { let data = Data.getData(element, DATA_KEY) const _config = typeof config === 'object' ? config : null @@ -381,13 +381,13 @@ class Dropdown { } } - static _jQueryInterface(config) { + static jQueryInterface(config) { return this.each(function () { - Dropdown._dropdownInterface(this, config) + Dropdown.dropdownInterface(this, config) }) } - static _clearMenus(event) { + static clearMenus(event) { if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH || event.type === 'keyup' && event.which !== TAB_KEYCODE)) { return @@ -395,7 +395,7 @@ class Dropdown { const toggles = makeArray(SelectorEngine.find(Selector.DATA_TOGGLE)) for (let i = 0, len = toggles.length; i < len; i++) { - const parent = Dropdown._getParentFromElement(toggles[i]) + const parent = Dropdown.getParentFromElement(toggles[i]) const context = Data.getData(toggles[i], DATA_KEY) const relatedTarget = { relatedTarget: toggles[i] @@ -441,11 +441,11 @@ class Dropdown { } } - static _getParentFromElement(element) { + static getParentFromElement(element) { return getElementFromSelector(element) || element.parentNode } - static _dataApiKeydownHandler(event) { + static dataApiKeydownHandler(event) { // If not input/textarea: // - And not a key in REGEXP_KEYDOWN => not a dropdown command // If input/textarea: @@ -468,7 +468,7 @@ class Dropdown { return } - const parent = Dropdown._getParentFromElement(this) + const parent = Dropdown.getParentFromElement(this) const isActive = parent.classList.contains(ClassName.SHOW) if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) { @@ -476,7 +476,7 @@ class Dropdown { SelectorEngine.findOne(Selector.DATA_TOGGLE, parent).focus() } - Dropdown._clearMenus() + Dropdown.clearMenus() return } @@ -503,7 +503,7 @@ class Dropdown { items[index].focus() } - static _getInstance(element) { + static getInstance(element) { return Data.getData(element, DATA_KEY) } } @@ -514,14 +514,14 @@ class Dropdown { * ------------------------------------------------------------------------ */ -EventHandler.on(document, Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler) -EventHandler.on(document, Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler) -EventHandler.on(document, Event.CLICK_DATA_API, Dropdown._clearMenus) -EventHandler.on(document, Event.KEYUP_DATA_API, Dropdown._clearMenus) +EventHandler.on(document, Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown.dataApiKeydownHandler) +EventHandler.on(document, Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown.dataApiKeydownHandler) +EventHandler.on(document, Event.CLICK_DATA_API, Dropdown.clearMenus) +EventHandler.on(document, Event.KEYUP_DATA_API, Dropdown.clearMenus) EventHandler.on(document, Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault() event.stopPropagation() - Dropdown._dropdownInterface(this, 'toggle') + Dropdown.dropdownInterface(this, 'toggle') }) EventHandler .on(document, Event.CLICK_DATA_API, Selector.FORM_CHILD, e => e.stopPropagation()) @@ -535,11 +535,11 @@ EventHandler /* istanbul ignore if */ if (typeof $ !== 'undefined') { const JQUERY_NO_CONFLICT = $.fn[NAME] - $.fn[NAME] = Dropdown._jQueryInterface + $.fn[NAME] = Dropdown.jQueryInterface $.fn[NAME].Constructor = Dropdown $.fn[NAME].noConflict = () => { $.fn[NAME] = JQUERY_NO_CONFLICT - return Dropdown._jQueryInterface + return Dropdown.jQueryInterface } } diff --git a/js/src/dropdown/dropdown.spec.js b/js/src/dropdown/dropdown.spec.js index 2d9719d5d..92d8fea03 100644 --- a/js/src/dropdown/dropdown.spec.js +++ b/js/src/dropdown/dropdown.spec.js @@ -1412,18 +1412,18 @@ describe('Dropdown', () => { }) }) - describe('_jQueryInterface', () => { + describe('jQueryInterface', () => { it('should create a dropdown', () => { fixtureEl.innerHTML = '<div></div>' const div = fixtureEl.querySelector('div') - jQueryMock.fn.dropdown = Dropdown._jQueryInterface + jQueryMock.fn.dropdown = Dropdown.jQueryInterface jQueryMock.elements = [div] jQueryMock.fn.dropdown.call(jQueryMock) - expect(Dropdown._getInstance(div)).toBeDefined() + expect(Dropdown.getInstance(div)).toBeDefined() }) it('should not re create a dropdown', () => { @@ -1432,12 +1432,12 @@ describe('Dropdown', () => { const div = fixtureEl.querySelector('div') const dropdown = new Dropdown(div) - jQueryMock.fn.dropdown = Dropdown._jQueryInterface + jQueryMock.fn.dropdown = Dropdown.jQueryInterface jQueryMock.elements = [div] jQueryMock.fn.dropdown.call(jQueryMock) - expect(Dropdown._getInstance(div)).toEqual(dropdown) + expect(Dropdown.getInstance(div)).toEqual(dropdown) }) it('should throw error on undefined method', () => { @@ -1446,7 +1446,7 @@ describe('Dropdown', () => { const div = fixtureEl.querySelector('div') const action = 'undefinedMethod' - jQueryMock.fn.dropdown = Dropdown._jQueryInterface + jQueryMock.fn.dropdown = Dropdown.jQueryInterface jQueryMock.elements = [div] try { @@ -1457,14 +1457,14 @@ describe('Dropdown', () => { }) }) - describe('_getInstance', () => { + describe('getInstance', () => { it('should return dropdown instance', () => { fixtureEl.innerHTML = '<div></div>' const div = fixtureEl.querySelector('div') const dropdown = new Dropdown(div) - expect(Dropdown._getInstance(div)).toEqual(dropdown) + expect(Dropdown.getInstance(div)).toEqual(dropdown) }) it('should return null when there is no dropdown instance', () => { @@ -1472,7 +1472,7 @@ describe('Dropdown', () => { const div = fixtureEl.querySelector('div') - expect(Dropdown._getInstance(div)).toEqual(null) + expect(Dropdown.getInstance(div)).toEqual(null) }) }) }) |
