fix: blip controls breaking when switching servers

They no longer break when swicthing servers.

Author: TGRHavoc

dist/first-bundle.js

@@ -17,37 +17,50 @@
 // ************************************************************************** //
 
 function toggleBlips(){
-    console._log("showing local blips");
-    if (_showBlips){
-
-        for(var spriteId in _blips){
-            var blipArray = _blips[spriteId];
-            //console._log("Disabled (" + spriteId + ")? " + _disabledBlips.includes(spriteId));
-
-            if(_disabledBlips.indexOf(spriteId) != -1){
-                if(_SETTINGS_debug){
-                    console._log("Blip " + spriteId + "'s are disabled..");
-                }
-                // If disabled, don't make a marker for it
-                continue;
-            }
 
-            for(var i in blipArray){
-                var blip = blipArray[i];
+    clearAllMarkers();
+    if(!_showBlips){
+        return;
+    }
 
-                var obj = new MarkerObject(blip.name, new Coordinates(blip.pos.x, blip.pos.y, blip.pos.z), MarkerTypes[blip.type], blip.description, "", "");
-                blip.markerId = createMarker(false, false, obj, "") - 1;
-            }
+    for (var spriteId in _blips) {
+        var blipArray = _blips[spriteId];
+        console._log("Disabled (" + spriteId + ")? " + _disabledBlips.includes(spriteId));
+
+        if (_disabledBlips.indexOf(spriteId) != -1) {
+            console._log("Blip " + spriteId + "'s are disabled..");
+            // If disabled, don't make a marker for it
+            continue;
         }
 
-    }else{
-        clearAllMarkers();
+        for (var i in blipArray) {
+            var blip = blipArray[i];
+
+            var obj = new MarkerObject(blip.name, new Coordinates(blip.pos.x, blip.pos.y, blip.pos.z), MarkerTypes[blip.type], blip.description, "", "");
+            blip.markerId = createMarker(false, false, obj, "") - 1;
+        }
     }
+
 }
 
 $(document).ready(function(){
     globalInit();
 
+    // Toggle blip
+    $("#showBlips").click(function(e){
+        e.preventDefault();
+
+        _showBlips = !_showBlips;
+
+        //webSocket.send("getBlips");
+        toggleBlips();
+
+        $("#blips_enabled").removeClass("badge-success").removeClass("badge-danger")
+            .addClass( _showBlips ? "badge-success" : "badge-danger")
+            .text(_showBlips ? "on" : "off");
+    });
+
+
     $("#playerSelect").on("change", function(){
         if (this.value == ""){
             _trackPlayer = null;
@@ -60,30 +73,16 @@ $(document).ready(function(){
 
     $("#refreshBlips").click(function(e){
         e.preventDefault();
-        if (_showBlips){
-            clearAllMarkers();
-            initBlips();
-        }
+
+        clearAllMarkers();
+        initBlips(connectedTo.getBlipUrl());
     });
 
     $("#server_menu").on("click", ".serverMenuItem", function(e){
         console._log($(this).text());
         changeServer($(this).text());
     });
 
-    $("#showBlips").click(function(e){
-        e.preventDefault();
-
-        _showBlips = !_showBlips;
-
-        //webSocket.send("getBlips");
-        toggleBlips();
-
-        $("#blips_enabled").removeClass("badge-success").removeClass("badge-danger")
-            .addClass( _showBlips ? "badge-success" : "badge-danger")
-            .text(_showBlips ? "on" : "off");
-    });
-
     $("#reconnect").click(function(e){
         e.preventDefault();
 
@@ -97,25 +96,26 @@ $(document).ready(function(){
     });
 
     $("#toggle-all-blips").on("click", function(){
+        _blipControlToggleAll = !_blipControlToggleAll;
+        console._log(_blipControlToggleAll +" showing blips?");
         // Toggle the classes and add/remove the blipIds from the array
+
         $("#blip-control-container").find("a").each(function(index, ele){
             var ele = $(ele);
-            var blipId = ele.data("blipNumber").toString();
+            var blipId = ele.data("blip-number").toString();
 
-            // Toggle blip
-            if(_disabledBlips.includes(blipId)){
-                // Already disabled, enable it
+            if (_blipControlToggleAll){
+                // Showing them
                 _disabledBlips.splice(_disabledBlips.indexOf(blipId), 1);
                 ele.removeClass("blip-disabled").addClass("blip-enabled");
             }else{
-                // Enabled, disable it
+                // Hiding them all
                 _disabledBlips.push(blipId);
                 ele.removeClass("blip-enabled").addClass("blip-disabled");
             }
         });
 
         // Now we can refresh the markers
-        clearAllMarkers();
         toggleBlips();
     });
 });
@@ -159,15 +159,6 @@ function initControls(Map, PlayerMarkers){
         Map.fitBounds(mapBounds);
         CurrentLayer = e.layer;
 
-        Map.removeLayer(PlayerMarkers); // Remove the cluster layer
-        window.PlayerMarkers = L.markerClusterGroup({ // Re-make it fresh
-            maxClusterRadius: 20,
-            spiderfyOnMaxZoom: false,
-            showCoverageOnHover: false,
-            zoomToBoundsOnClick: false
-        });
-        Map.addLayer(PlayerMarkers); // Add it back. The clearAllMarkers() will ensure player markers are added to the new cluster layer
-
         clearAllMarkers();
         toggleBlips();
     });

dist/last-bundle.js

@@ -34,8 +34,11 @@ var _trackPlayer = null;
 var playerCount = 0;
 var _overlays = [];
 var _disabledBlips = [];
+var _blipControlToggleAll = true; // Show all by default
+
 window.changeServer = function (nameOfServer) {
     console._log("Changing connected server to: " + nameOfServer);
+
     if (!(nameOfServer in config.servers)) {
         createAlert({
             title: "<strong>Couldn't load server config!</strong>",
@@ -61,7 +64,6 @@ window.changeServer = function (nameOfServer) {
     }
 
     // If we've changed servers. Might as well reset everything.
-    clearAllMarkers();
     if (window.webSocket && window.webSocket.readyState == WebSocket.OPEN) window.webSocket.close();
 
     $("#server_name").text(nameOfServer);
@@ -217,7 +219,7 @@ function blipSuccess(data, textStatus){
 
     console._log(_blipCount + " blips created");
     $("#blip_count").text(_blipCount);
-
+    toggleBlips();
 }
 
 function blipError( textStatus, errorThrown){

js/src/controls.2.js

@@ -87,8 +87,6 @@ function createMarker(animated, draggable, objectRef, title) {
     var infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-header">' + name + '</div></div><div class="clear"></div><div class=info-body>' + html + "</div></div>";
 
     var image = L.icon(markerType);
-    //console._log(image);
-    //console._log("image: " + JSON.stringify(image));
 
     var where = Map;
     if(objectRef.data && objectRef.data.isPlayer){
@@ -121,15 +119,25 @@ function setMapCenterLeaflet(coord) {
 
 function clearAllMarkers() {
     for (var i = 0; i < MarkerStore.length; i++) {
-        if (MarkerStore[i] != "NULL") {
-            MarkerStore[i].remove();
-        }
+        clearMarker(i);
     }
     MarkerStore.length = 0;
+
     // Re-do player markers
     for(var id in localCache){
         localCache[id].marker = null;
     }
+    if(Map != undefined){
+        Map.removeLayer(window.PlayerMarkers); // Remove the cluster layer
+
+        window.PlayerMarkers = L.markerClusterGroup({ // Re-make it fresh
+            maxClusterRadius: 20,
+            spiderfyOnMaxZoom: false,
+            showCoverageOnHover: false,
+            zoomToBoundsOnClick: false
+        });
+        Map.addLayer(window.PlayerMarkers); // Add it back. The clearAllMarkers() will ensure player markers are added to the new cluster layer
+    }
 }
 
 function clearMarker(id) {

js/src/init.1.js

@@ -246,17 +246,16 @@ function generateBlipControls(){
         }
     }
 
-    // Events
-    $(".blip-button-a").on("click", function(e){
+    $(".blip-button-a").on("click", function (e) {
         var ele = $(e.currentTarget);
         var blipId = ele.data("blipNumber").toString();
 
         // Toggle blip
-        if(_disabledBlips.includes(blipId)){
+        if (_disabledBlips.includes(blipId)) {
             // Already disabled, enable it
             _disabledBlips.splice(_disabledBlips.indexOf(blipId), 1);
             ele.removeClass("blip-disabled").addClass("blip-enabled");
-        }else{
+        } else {
             // Enabled, disable it
             _disabledBlips.push(blipId);
             ele.removeClass("blip-enabled").addClass("blip-disabled");
@@ -266,7 +265,6 @@ function generateBlipControls(){
         clearAllMarkers();
         toggleBlips();
     });
-
 }
 
 function generateBlipShit(){