From 49366dc20f58462999ca35592ccb3104086b5b59 Mon Sep 17 00:00:00 2001
From: Franziska <franziska.schaeffer@gmail.com>
Date: Wed, 7 Apr 2021 18:50:24 +0200
Subject: [PATCH] =?UTF-8?q?Tickleiste=20=C3=A4ndern=20onmessage=20zu=20Web?=
 =?UTF-8?q?socket=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 website/javascript.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/website/javascript.js b/website/javascript.js
index 77e1344..9046ebb 100644
--- a/website/javascript.js
+++ b/website/javascript.js
@@ -12,11 +12,14 @@ document.getElementById("p4").innerHTML = "" + Id;
 
 
 /* Handles Events from Server */
-ws.onmessage = function(evt){
+ws.onmessage = function(evt) {messageHandling(evt)};
+
+
+
+function messageHandling(evt){
         var msg = evt.data;
         var obj = JSON.parse(msg);
         var valid = false;
-        console.log (obj);
         /*Changes Tick of one Player in players. Updates the Playerlist and current Player.*/
         if (obj.eventType == "SetPlayerTickE") {
             valid = true;
@@ -57,7 +60,6 @@ ws.onmessage = function(evt){
         if (obj.eventType == "InitializeTickLeisteE") {
             valid = true;
             players = [];
-            console.log(obj);
             for (i = 0; i<obj.tickLeiste.length;i++){
                 for (j =0;j<obj.tickLeiste[i][1].length;j++ ){
                     if (obj.tickLeiste[i][0].tickType == "Tick"){
@@ -156,10 +158,11 @@ changeTickButton.onclick = function() {
 
 /*When the Button is clicked, a new WebSocket connection is opened with the new ID*/
 changeIdButton.onclick = function() {
-                        Id = document.getElementById("D").value;
+                        newId = document.getElementById("D").value;
                         ws.close();
-                        ws = new WebSocket(url + Id);
-                        document.getElementById("p4").innerHTML = "" + Id;
+                        ws = new WebSocket(url + newId);
+                        document.getElementById("p4").innerHTML = "" + newId;
+                        ws.onmessage = function(evt) {messageHandling(evt)};
                     }
 
 /*When the Button is clicked, a TickLeisteR request is send to the server.*/