refactor: update various files to use new alerts

Socket errors are now displayed in a alert (if debug is abled).

If the interface gets an error when trying to get blips, it's shown in an error.

Author: TGRHavoc

js/src/alerter.js

@@ -90,9 +90,9 @@ function createAlert(type, title, message, fadeOut){
 
     $("#alert-holder").append(html);
 
-    if(fadeOut){
+    if(fadeOut != false){
         // Auto-close the alert after 10 seconds
-        $("#"+ id).slideDown("slow").delay(10000).fadeOut(1000, function(){
+        $("#"+ id).slideDown("slow").delay(fadeOut * 1000).fadeOut(1000, function(){
             $(this).remove();
         });
     }

js/src/controls.js

@@ -22,13 +22,12 @@ function toggleBlips(){
 
         for(var spriteId in _blips){
             var blipArray = _blips[spriteId];
-
+            
             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;
-
             }
         }
 

js/src/init.js

@@ -93,7 +93,7 @@ function createBlip(blip){
     }
 
     blip.markerId = createMarker(false, false, obj, "") - 1;
-    
+
     _blips[blip.type].push(blip);
     _blipCount++;
 }
@@ -102,6 +102,7 @@ function blipSuccess(data, textStatus){
     if (data.error){
         //Do something about the error i guess.
         console.error("Error: " + data.error);
+        createAlert("warning", "Error getting blips!", data.error);
         return;
     }
 
@@ -130,7 +131,7 @@ function blipSuccess(data, textStatus){
 }
 
 function blipError( textStatus, errorThrown){
-    console.error("Error \"" + textStatus + "\": " + errorThrown);
+    console.error("Error \"" + JSON.stringify(textStatus) + "\": " + errorThrown);
 }
 
 function initBlips(){

js/src/socket.js

@@ -56,7 +56,7 @@ function onOpen(e) {
 function sorter(plr1, plr2){
     var str1 = plr1["name"];
     var str2 = plr2["name"];
-    
+
     return (str1 < str2) ? -1 : (str1 > str2) ? 1 : 0;
 }
 
@@ -138,6 +138,9 @@ function onError(e) {
 
     //$("#socket_error").text(reason);
     console.error("Socket error: " + reason);
+    if(_SETTINGS_debug){
+        createAlert("warning", "Socket error", ["There was an error with the socket connnection", reason], 2);
+    }
 }
 
 function onClose(e) {