From cf796a1043ece71601dd4ec837ab78dfd0ae3ed1 Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Thu, 23 May 2019 19:20:38 -0600 Subject: [PATCH] Move hideAllModals() from hotkeys to utilities --- src/js/hotkeys.js | 12 ++---------- src/js/utilities.js | 8 ++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/js/hotkeys.js b/src/js/hotkeys.js index 7b92fa7..8e39441 100644 --- a/src/js/hotkeys.js +++ b/src/js/hotkeys.js @@ -1,10 +1,10 @@ import { confirmEditWord, submitWordForm } from "./wordManagement"; -import { showSection, getIsDetailsPanelDisplayed, hideDetailsPanel } from "./displayToggles"; +import { showSection, hideDetailsPanel } from "./displayToggles"; import { renderInfoModal, renderMaximizedTextbox } from "./render"; import { showSearchModal, clearSearchText } from "./search"; import { saveAndCloseSettingsModal, openSettingsModal, saveSettings } from "./settings"; import { saveAndCloseEditModal, openEditModal } from "./dictionaryManagement"; -import { addMessage } from "./utilities"; +import { addMessage, hideAllModals } from "./utilities"; export function enableHotKeys() { document.addEventListener('keydown', hotKeyActions); @@ -59,14 +59,6 @@ export function hotKeyActions(event) { } } -function hideAllModals() { - const permanentModals = ['#searchModal', '#settingsModal', '#editModal']; - const hideModals = document.querySelectorAll(permanentModals.join(',')), - removeModals = document.querySelectorAll('.modal:not(' + permanentModals.join('):not(') + ')'); - Array.from(hideModals).forEach(modal => modal.style.display = 'none'); - Array.from(removeModals).forEach(modal => modal.parentElement.removeChild(modal)); -} - function toggleDetailsDisplay() { const activeTab = document.querySelector('#detailsSection nav li.active'); console.log(activeTab); diff --git a/src/js/utilities.js b/src/js/utilities.js index 2631bb2..bfc072a 100644 --- a/src/js/utilities.js +++ b/src/js/utilities.js @@ -152,6 +152,14 @@ export function addMessage(messageText, time = 5000, extraClass = false) { setTimeout(closeMessage, time); } +export function hideAllModals() { + const permanentModals = ['#searchModal', '#settingsModal', '#editModal']; + const hideModals = document.querySelectorAll(permanentModals.join(',')), + removeModals = document.querySelectorAll('.modal:not(' + permanentModals.join('):not(') + ')'); + Array.from(hideModals).forEach(modal => modal.style.display = 'none'); + Array.from(removeModals).forEach(modal => modal.parentElement.removeChild(modal)); +} + export function hasToken() { return getCookie('token') !== ''; }