From 3967fa102756f2e97fa17cb5693775e35c964543 Mon Sep 17 00:00:00 2001
From: zoe <zoe@cat.fritz.box>
Date: Sat, 16 Apr 2022 22:53:56 +0200
Subject: [PATCH] improve randomizer

---
 static/js/randomword.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/static/js/randomword.js b/static/js/randomword.js
index 3dd5780..d6f0f65 100644
--- a/static/js/randomword.js
+++ b/static/js/randomword.js
@@ -7,22 +7,29 @@ export function randomizeWords() {
 function registerButtons() {
   for (let button of buttons) {
     button.addEventListener("click", function () {
-      let new_word = processWordlist(button.getAttribute("data-wordlist"));
+      button.innerHTML = processWordlist(
+        button.getAttribute("data-wordlist"),
+        button.innerHTML
+      );
       // do this so people dont have to click twice
-      if (button.innerHTML == new_word) {
-        button.click();
-        console.log("oh no!!! this was already the value!");
-      } else {
-        button.innerHTML = new_word;
-      }
     });
     button.click();
   }
 }
 
 // takes all the words and returns only one
-function processWordlist(wordlist) {
+function processWordlist(wordlist, old) {
   let seperated = wordlist.split(",");
+  for (let word of wordlist) {
+    word = word.trim();
+  }
+  if (seperated.length <= 0) {
+    return "error! empty";
+  }
+  if (seperated.length == 1) {
+    return seperated[0];
+  }
+  seperated = seperated.filter((e) => e !== old);
   return seperated.random();
 }