From 9cd578e453ab810d807aeb768e34c24847693c90 Mon Sep 17 00:00:00 2001 From: Elijah R Date: Tue, 9 Apr 2024 18:27:43 -0400 Subject: [PATCH] if language is not english, the rules button should re-open the modal instead of opening rules.html --- src/html/index.html | 2 +- src/ts/i18n.ts | 2 ++ src/ts/main.ts | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/html/index.html b/src/html/index.html index e2c4329..0343b0c 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -186,7 +186,7 @@
  • - +
  • Discord diff --git a/src/ts/i18n.ts b/src/ts/i18n.ts index c5ae82d..6653f18 100644 --- a/src/ts/i18n.ts +++ b/src/ts/i18n.ts @@ -142,6 +142,8 @@ export class I18n { private lang: Language = fallbackLanguage; private languageDropdown: HTMLSpanElement = document.getElementById('languageDropdown') as HTMLSpanElement; + CurrentLanguage = () => this.langId; + // the ID of the language private langId: string = fallbackId; diff --git a/src/ts/main.ts b/src/ts/main.ts index 6eb7278..45e04c4 100644 --- a/src/ts/main.ts +++ b/src/ts/main.ts @@ -23,6 +23,7 @@ const elements = { vmview: document.getElementById('vmview') as HTMLDivElement, vmDisplay: document.getElementById('vmDisplay') as HTMLDivElement, homeBtn: document.getElementById('homeBtn') as HTMLAnchorElement, + rulesBtn: document.getElementById('rulesBtn') as HTMLAnchorElement, chatList: document.getElementById('chatList') as HTMLTableSectionElement, chatListDiv: document.getElementById('chatListDiv') as HTMLDivElement, userlist: document.getElementById('userlist') as HTMLTableSectionElement, @@ -1268,10 +1269,10 @@ document.addEventListener('DOMContentLoaded', async () => { await loadList(); // Welcome modal + let welcomeModal = new bootstrap.Modal(document.getElementById('welcomeModal') as HTMLDivElement); let noWelcomeModal = window.localStorage.getItem('no-welcome-modal'); if (noWelcomeModal !== '1') { let welcomeModalDismissBtn = document.getElementById('welcomeModalDismiss') as HTMLButtonElement; - let welcomeModal = new bootstrap.Modal(document.getElementById('welcomeModal') as HTMLDivElement); welcomeModalDismissBtn.addEventListener('click', () => { window.localStorage.setItem('no-welcome-modal', '1'); }); @@ -1281,4 +1282,10 @@ document.addEventListener('DOMContentLoaded', async () => { welcomeModalDismissBtn.disabled = false; }, 5000); } + elements.rulesBtn.addEventListener('click', e => { + if (TheI18n.CurrentLanguage() !== "en-us") { + e.preventDefault(); + welcomeModal.show(); + } + }); });