From 8b63808d2cb98667a49c7a8c05f240a091715e0c Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Wed, 5 Jun 2019 17:28:49 -0600 Subject: [PATCH] Fix settings not existing before being used --- src/index.js | 2 +- src/js/settings.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index d7800aa..5e7abfa 100644 --- a/src/index.js +++ b/src/index.js @@ -6,8 +6,8 @@ import { loadSettings } from './js/settings'; import { setupAds } from './js/ads'; function initialize() { - loadDictionary(); loadSettings(); + loadDictionary(); setupListeners(); if (hasToken()) { diff --git a/src/js/settings.js b/src/js/settings.js index f40d19a..cc1b07d 100644 --- a/src/js/settings.js +++ b/src/js/settings.js @@ -8,7 +8,7 @@ import { enableHotKeys, disableHotKeys } from "./hotkeys"; export function loadSettings() { const storedSettings = window.localStorage.getItem(SETTINGS_KEY); window.settings = storedSettings ? JSON.parse(storedSettings) : cloneObject(DEFAULT_SETTINGS); - toggleIPAPronunciationFields(); + toggleIPAPronunciationFields(false); } export function saveSettings() { @@ -67,7 +67,7 @@ export function toggleHotkeysEnabled() { } } -export function toggleIPAPronunciationFields() { +export function toggleIPAPronunciationFields(render = true) { const ipaButtons = document.querySelectorAll('.ipa-table-button, .ipa-field-help-button'), ipaFields = document.querySelectorAll('.ipa-field'); if (!window.settings.useIPAPronunciationField) { @@ -85,5 +85,7 @@ export function toggleIPAPronunciationFields() { field.addEventListener('keypress', usePhondueDigraphs); }); } - renderWords(); + if (render) { + renderWords(); + } }