diff --git a/javascript-practice/src/js/views/commonView.js b/javascript-practice/src/js/views/commonView.js index 02ceef2..f329ae3 100644 --- a/javascript-practice/src/js/views/commonView.js +++ b/javascript-practice/src/js/views/commonView.js @@ -34,10 +34,10 @@ export default class CommonView { initElementToast() { this.toastDialog = document.querySelector('.dialog'); this.toast = document.querySelector('.toast'); - this.toastIcon = document.querySelector('.mark'); - this.toastBtn = document.querySelector('.toast__redirect-btn'); - this.toastTitle = document.querySelector('.toast__title'); - this.toastContent = document.querySelector('.toast__message'); + this.toastIcon = this.toast.querySelector('.mark'); + this.toastBtn = this.toast.querySelector('.toast__redirect-btn'); + this.toastTitle = this.toast.querySelector('.toast__title'); + this.toastContent = this.toast.querySelector('.toast__message'); } /** @@ -56,18 +56,14 @@ export default class CommonView { */ initToastContent(typeToast, title, content, btnContent) { // Remove old typeToast class if haved - this.toast.classList.forEach((classItem) => - classItem === TYPE_TOAST.success || classItem === TYPE_TOAST.error - ? this.toast.classList.remove(classItem) - : '', - ); + Object.keys(TYPE_TOAST).forEach((value) => { + CommonView.removeClassElement(value, this.toast); + }); // Remove old icon toast if haved - this.toastIcon.classList.forEach((classItem) => - classItem === MARK_ICON.success || classItem === MARK_ICON.error - ? this.toastIcon.classList.remove(classItem) - : '', - ); + Object.keys(MARK_ICON).forEach((value) => { + CommonView.removeClassElement(value, this.toastIcon); + }); // Init content toast this.toast.classList.add( @@ -81,6 +77,12 @@ export default class CommonView { this.toastBtn.textContent = btnContent; } + static removeClassElement(classEl, el) { + if (el.classList.contains(classEl)) { + el.classList.remove(classEl); + } + } + /** * Add event listener for toast */ diff --git a/javascript-practice/src/js/views/homeView.js b/javascript-practice/src/js/views/homeView.js index 971085e..e55b283 100644 --- a/javascript-practice/src/js/views/homeView.js +++ b/javascript-practice/src/js/views/homeView.js @@ -13,7 +13,6 @@ export default class HomeView extends CommonView { this.addBudgetBtn = document.getElementById('addBudget'); this.saveBtn = document.querySelectorAll('.form__save-btn'); this.dialogs = document.querySelectorAll('.dialog'); - this.cancelBtn = document.querySelectorAll('.form__cancel-btn'); this.categoryField = document.getElementById('selectCategory'); this.closeIcon = document.querySelector('.close-icon'); @@ -130,13 +129,14 @@ export default class HomeView extends CommonView { */ handlerTabsTransfer() { this.tabs.forEach((tab, index) => { - tab.addEventListener('click', (e) => { + tab.addEventListener('click', () => { this.removeActiveTab(); tab.classList.add('active'); const line = document.querySelector('.app__line'); - line.style.width = `${e.target.offsetWidth}px`; - line.style.left = `${e.target.offsetLeft}px`; + + line.classList.toggle('right', line.classList.contains('left')); + line.classList.toggle('left', !line.classList.contains('right')); this.allContent.forEach((content) => { content.classList.remove('active'); diff --git a/javascript-practice/src/pages/index.html b/javascript-practice/src/pages/index.html index cd35aa0..ceadbfa 100644 --- a/javascript-practice/src/pages/index.html +++ b/javascript-practice/src/pages/index.html @@ -306,7 +306,7 @@