Moved element setters to text.js

Pedro270707 · Oct 29, 2023 · b2bfa67 · b2bfa67
1 parent 631246b
commit b2bfa67
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 37 deletions.
diff --git a/csstest.html b/csstest.html
@@ -3,4 +3,4 @@
 title: "CSS Test"
 ---
 
-<button class="button">Test Button</button>
+<button class="button" data-string='{"text":"Test Button %2$s %1$s","with":[{"translate":"minecrafttooltips-download"},{"translate":"minecrafttooltips-close"}]}'>Test Button</button>
diff --git a/js/cookieclicker.js b/js/cookieclicker.js
@@ -86,17 +86,17 @@ function upgradeClicker() {
  cookieAmount -= clickerCost
  recountCookies();
  clickerLevel += 1;
- translate.setElementString(clickerLevelCounter, new TranslatableText("cookieclicker-clickerlevel", clickerLevel));
+ setElementString(clickerLevelCounter, new TranslatableText("cookieclicker-clickerlevel", clickerLevel));
 
  clickerCost = Math.ceil(Math.pow(clickerCost / 1.3, 1.25));
- translate.setElementString(upgradeClickerButtonText, new TranslatableText("cookieclicker-clickerlevelbutton", clickerCost));
+ setElementString(upgradeClickerButtonText, new TranslatableText("cookieclicker-clickerlevelbutton", clickerCost));
  }
 }
 
 function setCookieString(key, cookieAmount) {
- translate.setElementString(cookieCounter, new TranslatableText(key, cookieAmount));
+ setElementString(cookieCounter, new TranslatableText(key, cookieAmount));
 }
 
 function setWorkerString(key, workerAmount) {
- translate.setElementString(workerCounter, new TranslatableText(key, workerAmount));
+ setElementString(workerCounter, new TranslatableText(key, workerAmount));
 }
diff --git a/js/senha.js b/js/senha.js
@@ -82,7 +82,7 @@ function startNewGame(pAmountOfCharacters = 5) {
  translate.translateString("senha-gamestarted", randomSequence).then(str => {
  console.log(str);
  });
- translate.setElementString(document.getElementById("valid-characters"), new TranslatableText("senha-validcharacters", validCharacters));
+ setElementString(document.getElementById("valid-characters"), new TranslatableText("senha-validcharacters", validCharacters));
  amountOfCharactersInput.max = validCharacters.length;
  updateKeyboard();
  addNewCharacterSlotArray();
@@ -157,7 +157,7 @@ document.addEventListener("keyup", (event) => {
  let charactersInSlotArray = getCharacterSlotArrayAsString();
  if (!charactersInSlotArray.includes(' ') && !hasDuplicateLetters(charactersInSlotArray)) {
  numberOfAttempts++;
- translate.setElementString(victoryText, new TranslatableText("senha-victory", numberOfAttempts));
+ setElementString(victoryText, new TranslatableText("senha-victory", numberOfAttempts));
  if (charactersInSlotArray !== randomSequence) {
  addNewGuessesArray(getCorrectInWrongPlace(charactersInSlotArray), getCorrectInCorrectPlace(charactersInSlotArray));
  addNewCharacterSlotArray();

diff --git a/js/text.js b/js/text.js
@@ -101,4 +101,34 @@ function getTextFromJSON(jsonObject) {
  console.log('Invalid text type: ' + key);
  }
  }
+}
+
+async function setElementString(element, text) {
+ if (text instanceof LiteralText || text instanceof TranslatableText) {
+ text = JSON.stringify(text);
+ }
+ element.dataset.string = text;
+ getTextFromJSON(text).get().then(str => {
+ element.innerHTML = str;
+ });
+}
+
+async function setElementPlaceholder(element, text) {
+ if (text instanceof LiteralText || text instanceof TranslatableText) {
+ text = JSON.stringify(text);
+ }
+ element.dataset.placeholder = text;
+ getTextFromJSON(text).get().then(str => {
+ element.placeholder = str;
+ });
+}
+
+async function setElementAriaLabel(element, text) {
+ if (text instanceof LiteralText || text instanceof TranslatableText) {
+ text = JSON.stringify(text);
+ }
+ element.dataset.ariaLabel = text;
+ getTextFromJSON(text).get().then(str => {
+ element.ariaLabel = str;
+ });
 }
diff --git a/js/translate.js b/js/translate.js
@@ -93,36 +93,6 @@ class Translate {
  async getKeyWrapped(key, ...args) {
  return "<span data-string='" + JSON.stringify(new TranslatableText(key, ...args)) + "'>" + (await this.translateString(key, ...args)) + "</span>";
  }
-
- async setElementString(element, text) {
- if (text instanceof LiteralText || text instanceof TranslatableText) {
- text = JSON.stringify(text);
- }
- element.dataset.string = text;
- getTextFromJSON(text).get().then(str => {
- element.innerHTML = str;
- });
- }
-
- async setElementPlaceholder(element, text) {
- if (text instanceof LiteralText || text instanceof TranslatableText) {
- text = JSON.stringify(text);
- }
- element.dataset.placeholder = text;
- getTextFromJSON(text).get().then(str => {
- element.placeholder = str;
- });
- }
-
- async setElementAriaLabel(element, text) {
- if (text instanceof LiteralText || text instanceof TranslatableText) {
- text = JSON.stringify(text);
- }
- element.dataset.ariaLabel = text;
- getTextFromJSON(text).get().then(str => {
- element.ariaLabel = str;
- });
- }
 }
 
 var translate = new Translate();