refactor: various changes to make code more readable

TGRHavoc · TGRHavoc · commit f24ade74abd8 · 2019-05-17T17:12:38.000+01:00
Removed whitespace infront of a player's name.
Removed some JS that wasn't needed.
Updated websocket to use the "getPlayerData" stuff
diff --git a/index.php b/index.php
@@ -115,13 +115,6 @@
         printFirstJs($debug);
     ?>
 
-    <script>
-    function startMarkers(){
-        initMarkers(true);
-        //initMarkers(false);
-    }
-    </script>
-
 </head>
 <body>
 
diff --git a/js/src/controls.js b/js/src/controls.js
@@ -72,7 +72,7 @@ $(document).ready(function(){
             .text(_isLive ? "on" : "off");
 
         if (_isLive){
-            _invervalId = setInterval(function(){ webSocket.send("getLocations"); }, 250);
+            _invervalId = setInterval(function(){ webSocket.send("getPlayerData"); }, 250);
         }else{
             clearInterval(_invervalId);
         }
diff --git a/js/src/init.js b/js/src/init.js
@@ -1,6 +1,5 @@
 function globalInit() {
     mapInit("map-canvas");
-    startMarkers();
     initPage()
 }
 
diff --git a/js/src/socket.js b/js/src/socket.js
@@ -207,7 +207,7 @@ function doPlayerUpdate(players){
             //update popup with the information we have been sent
             var html = getPlayerInfoHtml(plr);
 
-            var infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-icon"></div><div class="info-header">' + plr.name + '</div></div><div class="clear"></div><div id=info-body>' + html + "</div></div>";
+            var infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-header">' + plr.name + '</div></div><div class="clear"></div><div id=info-body>' + html + "</div></div>";
             var infoBox = new google.maps.InfoWindow({
                 content: infoContent
             });

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ $(document).ready(function(){`
`72`	`72`	`.text(_isLive ? "on" : "off");`
`73`	`73`
`74`	`74`	`if (_isLive){`
`75`		`- _invervalId = setInterval(function(){ webSocket.send("getLocations"); }, 250);`
	`75`	`+ _invervalId = setInterval(function(){ webSocket.send("getPlayerData"); }, 250);`
`76`	`76`	`}else{`
`77`	`77`	`clearInterval(_invervalId);`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`function globalInit() {`
`2`	`2`	`mapInit("map-canvas");`
`3`		`- startMarkers();`
`4`	`3`	`initPage()`
`5`	`4`	`}`
`6`	`5`