fix: minifying issues

There was some issues when using the minifier ($debug = false). They were caused by missing semicolons (don't ask). So, now minifying should work like a charm.

Author: TGRHavoc

index.php

@@ -6,7 +6,7 @@
 
     // Set to false to enable the miinified versions of JS and CSS files
     // that should speed up content delivery on production websites
-    $debug = true;
+    $debug = false;
 
     // Set to the IP of the GTA server that has live_map. Make sure it has the trailing slash (/)
     $gtaServer = "http://127.0.0.1:30120/";
@@ -167,7 +167,7 @@
                       <a id="toggleLive" href="#">Live update <span id="live_enabled" class="label label-danger pull-right">off</span></a>
                   </li>
                   -->
-                  
+
                   <li>
                       <a id="reconnect" href="#">Connect <span id="connection" class="label label-danger pull-right">disconnected</span></a>
                   </li>

js/src/controls.js

@@ -44,7 +44,7 @@ $(document).ready(function(){
 
         $("#blips_enabled").removeClass("label-success").removeClass("label-danger")
             .addClass( _showBlips ? "label-success" : "label-danger")
-            .text(_showBlips ? "on" : "off")
+            .text(_showBlips ? "on" : "off");
     });
 
     $("#reconnect").click(function(e){

js/src/markers.js

@@ -199,7 +199,7 @@ var types = {
     DollarSignCircled : {},
     Crosshair2 : {},
     DollarSignSquared : {id: 434}
-}
+};
 
 function generateBlipShit(){
     var currentX = 0, currentY = 0, currentId = 0;
@@ -229,7 +229,7 @@ function generateBlipShit(){
             anchor: new google.maps.Point( customImageWidth/2, customImageHeight ),
             scaledSize: new google.maps.Size( 1024/2,1024/2 ),
             origin: new google.maps.Point( customImageWidth * currentX , customImageHeight * currentY ),
-        }
+        };
     }
 }
 

js/src/objects.js

@@ -6,29 +6,29 @@ function EuclideanProjection() {
     this.scaleLat = 2;
     this.scaleLng = 2;
     this.offsetLat = 0;
-    this.offsetLng = 0
+    this.offsetLng = 0;
 }
 
 EuclideanProjection.prototype.fromLatLngToPoint = function(latLng, opt_point) {
     var point = opt_point || new google.maps.Point(0, 0);
     var origin = this.pixelOrigin_;
     point.x = (origin.x + (latLng.lng() + this.offsetLng) * this.scaleLng * this.pixelsPerLonDegree_);
     point.y = (origin.y + (-1 * latLng.lat() + this.offsetLat) * this.scaleLat * this.pixelsPerLonDegree_);
-    return point
+    return point;
 };
 
 EuclideanProjection.prototype.fromPointToLatLng = function(point) {
     var me = this;
     var origin = me.pixelOrigin_;
     var lng = (((point.x - origin.x) / me.pixelsPerLonDegree_) / this.scaleLng) - this.offsetLng;
     var lat = ((-1 * (point.y - origin.y) / me.pixelsPerLonDegree_) / this.scaleLat) - this.offsetLat;
-    return new google.maps.LatLng(lat, lng, true)
+    return new google.maps.LatLng(lat, lng, true);
 };
 
 function Coordinates(x, y, z) {
     this.x = x;
     this.y = y;
-    this.z = z
+    this.z = z;
 }
 
 function MarkerObject(reference, position, type, description, data) {

js/src/socket.js

@@ -54,41 +54,11 @@ function onMessage(e){
 }
 
 function onError(e){
-    // from http://stackoverflow.com/a/28396165
-    var reason;
-    // See http://tools.ietf.org/html/rfc6455#section-7.4.1
-    if (event.code == 1000)
-        reason = "Normal closure, meaning that the purpose for which the connection was established has been fulfilled.";
-    else if(event.code == 1001)
-        reason = "An endpoint is \"going away\", such as a server going down or a browser having navigated away from a page.";
-    else if(event.code == 1002)
-        reason = "An endpoint is terminating the connection due to a protocol error";
-    else if(event.code == 1003)
-        reason = "An endpoint is terminating the connection because it has received a type of data it cannot accept (e.g., an endpoint that understands only text data MAY send this if it receives a binary message).";
-    else if(event.code == 1004)
-        reason = "Reserved. The specific meaning might be defined in the future.";
-    else if(event.code == 1005)
-        reason = "No status code was actually present.";
-    else if(event.code == 1006)
-       reason = "The connection was closed abnormally, e.g., without sending or receiving a Close control frame";
-    else if(event.code == 1007)
-        reason = "An endpoint is terminating the connection because it has received data within a message that was not consistent with the type of the message (e.g., non-UTF-8 [http://tools.ietf.org/html/rfc3629] data within a text message).";
-    else if(event.code == 1008)
-        reason = "An endpoint is terminating the connection because it has received a message that \"violates its policy\". This reason is given either if there is no other sutible reason, or if there is a need to hide specific details about the policy.";
-    else if(event.code == 1009)
-       reason = "An endpoint is terminating the connection because it has received a message that is too big for it to process.";
-    else if(event.code == 1010) // Note that this status code is not used by the server, because it can fail the WebSocket handshake instead.
-        reason = "An endpoint (client) is terminating the connection because it has expected the server to negotiate one or more extension, but the server didn't return them in the response message of the WebSocket handshake. <br /> Specifically, the extensions that are needed are: " + event.reason;
-    else if(event.code == 1011)
-        reason = "A server is terminating the connection because it encountered an unexpected condition that prevented it from fulfilling the request.";
-    else if(event.code == 1015)
-        reason = "The connection was closed due to a failure to perform a TLS handshake (e.g., the server certificate can't be verified).";
-    else
-        reason = "Unknown reason (Server is probably down)";
-
+    var reason = "Unknown reason (Server is probably down)";
     //$("#socket_error").text(reason);
     console.log("Socket error: " + reason);
 }
+
 function onClose(e){
     $("#connection").removeClass("label-success")
         .removeClass("label-warning")

js/src/utils.js

@@ -16,7 +16,7 @@ function convertToGame(lat, lng) {
     return result = {
         x: rX,
         y: rY
-    }
+    };
 }
 
 function convertToGameCoord(lat, lng) {
@@ -26,7 +26,7 @@ function convertToGameCoord(lat, lng) {
         x: rX,
         y: rY,
         z: 0
-    }
+    };
 }
 
 function convertToMap(x, y) {
@@ -35,25 +35,25 @@ function convertToMap(x, y) {
     return result = {
         lat: rLat,
         lng: rLng
-    }
+    };
 }
 
 function convertToMapGMAP(x, y) {
     var rLng = map_1_lng + (x - game_1_x) * (map_1_lng - map_2_lng) / (game_1_x - game_2_x);
     var rLat = map_1_lat + (y - game_1_y) * (map_1_lat - map_2_lat) / (game_1_y - game_2_y);
-    return new google.maps.LatLng(rLat, rLng)
+    return new google.maps.LatLng(rLat, rLng);
 }
 
 function convertToMapGMAPcoord(coord) {
     var rLng = map_1_lng + (coord.x - game_1_x) * (map_1_lng - map_2_lng) / (game_1_x - game_2_x);
     var rLat = map_1_lat + (coord.y - game_1_y) * (map_1_lat - map_2_lat) / (game_1_y - game_2_y);
-    return new google.maps.LatLng(rLat, rLng)
+    return new google.maps.LatLng(rLat, rLng);
 }
 
 function stringCoordToFloat(coord) {
     return result = {
         x: parseFloat(coord.x),
         y: parseFloat(coord.y),
         z: parseFloat(coord.z),
-    }
-};
+    };
+};