From 0c1651ee9dfb9d57655c974a73884d3b777ebafd Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 5 Oct 2020 18:07:49 +0300 Subject: Remove `Manipulator.toggleClass` (#31842) It's only used in one place so it makes more sense to remove it for the time being. --- js/src/dom/manipulator.js | 12 ------------ js/src/dropdown.js | 8 ++++---- js/tests/unit/dom/manipulator.spec.js | 26 -------------------------- 3 files changed, 4 insertions(+), 42 deletions(-) (limited to 'js') diff --git a/js/src/dom/manipulator.js b/js/src/dom/manipulator.js index a81354e785..750ee115e0 100644 --- a/js/src/dom/manipulator.js +++ b/js/src/dom/manipulator.js @@ -72,18 +72,6 @@ const Manipulator = { top: element.offsetTop, left: element.offsetLeft } - }, - - toggleClass(element, className) { - if (!element) { - return - } - - if (element.classList.contains(className)) { - element.classList.remove(className) - } else { - element.classList.add(className) - } } } diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 37bdd1f248..28d8b72992 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -197,8 +197,8 @@ class Dropdown { this._element.focus() this._element.setAttribute('aria-expanded', true) - Manipulator.toggleClass(this._menu, CLASS_NAME_SHOW) - Manipulator.toggleClass(this._element, CLASS_NAME_SHOW) + this._menu.classList.toggle(CLASS_NAME_SHOW) + this._element.classList.toggle(CLASS_NAME_SHOW) EventHandler.trigger(parent, EVENT_SHOWN, relatedTarget) } @@ -222,8 +222,8 @@ class Dropdown { this._popper.destroy() } - Manipulator.toggleClass(this._menu, CLASS_NAME_SHOW) - Manipulator.toggleClass(this._element, CLASS_NAME_SHOW) + this._menu.classList.toggle(CLASS_NAME_SHOW) + this._element.classList.toggle(CLASS_NAME_SHOW) EventHandler.trigger(parent, EVENT_HIDDEN, relatedTarget) } diff --git a/js/tests/unit/dom/manipulator.spec.js b/js/tests/unit/dom/manipulator.spec.js index eec3ced52b..16750fd741 100644 --- a/js/tests/unit/dom/manipulator.spec.js +++ b/js/tests/unit/dom/manipulator.spec.js @@ -129,30 +129,4 @@ describe('Manipulator', () => { expect(position.left).toEqual(jasmine.any(Number)) }) }) - - describe('toggleClass', () => { - it('should not error out if element is null or undefined', () => { - Manipulator.toggleClass(null, 'test') - Manipulator.toggleClass(undefined, 'test') - expect().nothing() - }) - - it('should add class if it is missing', () => { - fixtureEl.innerHTML = '
' - - const div = fixtureEl.querySelector('div') - - Manipulator.toggleClass(div, 'test') - expect(div.classList.contains('test')).toEqual(true) - }) - - it('should remove class if it is set', () => { - fixtureEl.innerHTML = '
' - - const div = fixtureEl.querySelector('div') - - Manipulator.toggleClass(div, 'test') - expect(div.classList.contains('test')).toEqual(false) - }) - }) }) -- cgit v1.2.3