fix: minifying issues

Setting "$debug" to false  now correctly minifies the JS code. Before, it would minify it but syntax errors (missing semicolons) would cause the code to not execute.
I've also added final_newline to the editor config (I can't remember where but, I heard it's better to have them).

Author: TGRHavoc

.editorconfig

@@ -6,7 +6,7 @@ indent_size = 4
 end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = false
+insert_final_newline = true
 
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

index.php

@@ -203,4 +203,4 @@
 
 </body>
 
-</html>
+</html>

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){
@@ -53,4 +53,4 @@ $(document).ready(function(){
 		$("#connection").removeClass("label-success").removeClass("label-danger").addClass("label-warning").text("reconnecting");
 		connect();
 	});
-});
+});

js/src/init.js

@@ -15,7 +15,7 @@ function globalInit() {
 
 function initPage() {
 	$(window).on("load resize", function() {
-		$(".map-tab-content").height((($("#tab-content").height() - $(".page-title-1").height()) - ($("#map-overlay-global-controls").height() * 4.2)))
+		$(".map-tab-content").height((($("#tab-content").height() - $(".page-title-1").height()) - ($("#map-overlay-global-controls").height() * 4.2)));
 	});
 }
 
@@ -79,4 +79,4 @@ function initMarkers(debugOnly) {
 	} else {
 		createMarker(false, false, new MarkerObject("True Map Center", new Coordinates(0, 0, 0), MarkerTypes[6], "", ""), "");
 	}
-}
+}

js/src/map.js

@@ -152,7 +152,7 @@ function createMarker(animated, draggable, objectRef, title) {
 
 	var name = objectRef.reference;
 	if (name == "@DEBUG@@Locator") {
-		name = "@Locator"
+		name = "@Locator";
 	}
 	objectRef.position = stringCoordToFloat(objectRef.position);
 	var coord = convertToMapGMAP(objectRef.position.x, objectRef.position.y);
@@ -163,7 +163,7 @@ function createMarker(animated, draggable, objectRef, title) {
 	var html = '<div class="row info-body-row"><strong>Position:</strong>&nbsp;X {' + objectRef.position.x.toFixed(4) + "} Y {" + objectRef.position.y.toFixed(4) + "} Z {" + objectRef.position.z.toFixed(4) + "}</div>";
 
 	if (objectRef.description != ""){
-		html += '<div class="row info-body-row"><strong>Description:</strong>&nbsp;' + objectRef.description + "</div>"
+		html += '<div class="row info-body-row"><strong>Description:</strong>&nbsp;' + objectRef.description + "</div>";
 	}
 
 	var infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-header">' + name + '</div></div><div class="clear"></div><div id=info-body>' + html + "</div></div>";
@@ -191,43 +191,43 @@ function createMarker(animated, draggable, objectRef, title) {
 	});
 	google.maps.event.addListener(marker, "click", function() {
 		if (_MAP_currentMarker) {
-			_MAP_currentMarker.popup.close()
+			_MAP_currentMarker.popup.close();
 		}
 		_MAP_currentMarker = marker;
-		marker.popup.open(map, this)
+		marker.popup.open(map, this);
 	});
 	google.maps.event.addListener(marker, "drag", function() {
 		var posConverted = convertToGame(marker.position.lat(), marker.position.lng());
 		objectRef.position.x = posConverted.x;
 		objectRef.position.y = posConverted.y;
 		if (objectRef.reference == "@DEBUG@@Locator") {
 			$("#locator_x").val(posConverted.x);
-			$("#locator_y").val(posConverted.y)
+			$("#locator_y").val(posConverted.y);
 		}
 	});
 	if (name == "@DEBUG@@Locator") {
-		$("#marker-list").append('<div id="marker_' + marker.id + '" data-id="' + marker.id + '" class="marker-item"><div class="marker-desc"><span class="marker_name">@Locator</span></div><div class="marker-options"><a href="#" class="marker_view" title="View"><img src="images/icons/view.png" alt="View" height="16" width="16" /></a> </div></div><div class="clear"></div>')
+		$("#marker-list").append('<div id="marker_' + marker.id + '" data-id="' + marker.id + '" class="marker-item"><div class="marker-desc"><span class="marker_name">@Locator</span></div><div class="marker-options"><a href="#" class="marker_view" title="View"><img src="images/icons/view.png" alt="View" height="16" width="16" /></a> </div></div><div class="clear"></div>');
 	} else {
-		$("#marker-list").append('<div id="marker_' + marker.id + '" data-id="' + marker.id + '" class="marker-item"><div class="marker-desc"><span class="marker_name">' + name + '</span></div><div class="marker-options"><a href="#" class="marker_view" title="View"><img src="images/icons/view.png" alt="View" height="16" width="16" /></a> / <a href="#" class="marker_delete" title="Delete"><img src="images/icons/delete.png" alt="Delete" height="16" width="16" /></a></div></div><div class="clear"></div>')
+		$("#marker-list").append('<div id="marker_' + marker.id + '" data-id="' + marker.id + '" class="marker-item"><div class="marker-desc"><span class="marker_name">' + name + '</span></div><div class="marker-options"><a href="#" class="marker_view" title="View"><img src="images/icons/view.png" alt="View" height="16" width="16" /></a> / <a href="#" class="marker_delete" title="Delete"><img src="images/icons/delete.png" alt="Delete" height="16" width="16" /></a></div></div><div class="clear"></div>');
 	}
 	_MAP_markerStore.push(marker);
 	return _MAP_markerStore.length;
 }
 
 function setMapCenter(lat, lng) {
 	map.setCenter(new google.maps.LatLng(lat, lng));
-	map.setZoom(6)
+	map.setZoom(6);
 }
 
 function setMapCenterGMAP(coord) {
 	map.setCenter(coord);
-	map.setZoom(6)
+	map.setZoom(6);
 }
 
 function clearAllMarkers() {
 	for (var i = 0; i < _MAP_markerStore.length; i++) {
 		if (_MAP_markerStore[i] != "NULL") {
-			_MAP_markerStore[i].setMap(null)
+			_MAP_markerStore[i].setMap(null);
 		}
 	}
 	_MAP_markerStore.length = 0;
@@ -241,12 +241,12 @@ function clearMarker(id) {
 	if (_MAP_markerStore[id] != "NULL") {
 		_MAP_markerStore[id].setMap(null);
 		_MAP_markerStore[id] = "NULL";
-		$("#marker_" + id).remove()
+		$("#marker_" + id).remove();
 	}
 }
 
 function getMarker(id) {
 	if (_MAP_markerStore[id] != "NULL") {
-		return _MAP_markerStore[id]
+		return _MAP_markerStore[id];
 	}
-};
+};

js/src/markers.js

@@ -28,7 +28,6 @@ var MarkerTypes = {
 
 // FUCK ME, GTA HAS A LOT OF FUCKING BLIPS
 var types = {
-<<<<<<< Updated upstream
     Standard: {id: 1, x: 0, y: 0},
     Jet: {id: 16},
     Lift: {id: 36},
@@ -232,211 +231,6 @@ function generateBlipShit(){
             origin: new google.maps.Point( customImageWidth * currentX , customImageHeight * currentY ),
         };
     }
-=======
-	Standard: {id: 1, x: 0, y: 0},
-	Jet: {id: 16},
-	Lift: {id: 36},
-	RaceFinish : {id: 38},
-	Safehouse : {id: 40},
-	PoliceHelicopter: {id: 43},
-	ChatBubble : {id: 47},
-	Garage2 : {id: 50},
-	Drugs : {},
-	Store : {},
-	PoliceCar : {id: 56},
-	PoliceStation : {id: 60, x : 12, y: 0},
-	Hospital : {},
-	Helicopter : {id: 64},
-	StrangersAndFreaks : {},
-
-	ArmoredTruck : { x : 0, y:1 },
-	TowTruck : {id: 68},
-	Barber : {id: 71},
-	LosSantosCustoms : {},
-	Clothes : {},
-	TattooParlor : {id: 75},
-	Simeon : {},
-	Lester : {},
-	Michael : {},
-	Trevor : {},
-	Rampage : {id: 84, x : 11},
-	VinewoodTours : {},
-	Lamar : {},
-	Franklin : {id: 88},
-	Chinese : {},
-
-	Airport : {x : 0, y: 2},
-	Bar : {id: 93},
-	BaseJump : {},
-	CarWash : {id: 100, x: 4},
-	ComedyClub : {id: 102},
-	Dart : {},
-	Fib : {id: 106, x: 9},
-	Bank : {id: 108, x: 11}, // These are generally "banks". Original: DollarSign
-	Golf : {},
-	AmmuNation : {},
-	Exile : {id: 112},
-
-	ShootingRange : {id: 119, x: 1, y: 3},
-	Solomon : {},
-	StripClub : {},
-	Tennis : {},
-	Triathlon : {id: 126, x: 7},
-	OffRoadRaceFinish : {},
-	Key : {id: 134, x: 10},
-	MovieTheater : {},
-	Music : {},
-	Marijuana : {id: 140, x:14 },
-	Hunting : {},
-
-	ArmsTraffickingGround : {id: 147, y: 4, x: 0},
-	Nigel : {id: 149},
-	AssaultRifle : {},
-	Bat : {},
-	Grenade : {},
-	Health : {},
-	Knife : {},
-	Molotov : {},
-	Pistol : {},
-	Rpg : {},
-	Shotgun : {},
-	Smg : {},
-	Sniper : {},
-	PointOfInterest: {id: 162},
-	GtaOPassive : {},
-	GtaOUsingMenu : {},
-
-	Minigun : {id: 173, x:0, y: 5},
-	GrenadeLauncher : {},
-	Armor : {},
-	Castle : {},
-	Camera : {id: 184, x: 7},
-	Handcuffs : {id: 188, x: 11},
-	Yoga : {id: 197},
-	Cab : {},
-	Shrink: {id: 205},
-	Epsilon : {},
-
-	PersonalVehicleCar : {id: 225, x: 5, y: 6},
-	PersonalVehicleBike : {},
-	Custody : {id: 237, x:10},
-	ArmsTraffickingAir : {id: 251},
-	Fairground : {id: 266, x: 15},
-
-	PropertyManagement : {x: 0, y: 7},
-	Altruist : {id: 269},
-	Chop : {id: 273, x: 3},
-	Hooker : {id: 279, x: 7},
-	Friend : {},
-	GtaOMission: {id: 304, x: 14},
-	GtaOSurvival : {},
-
-	CrateDrop : { x:0, y:8},
-	PlaneDrop : {},
-	Sub : {},
-	Race : {},
-	Deathmatch : {},
-	ArmWrestling : {},
-	AmmuNationShootingRange : {id: 313},
-	RaceAir : {},
-	RaceCar : {},
-	RaceSea : {},
-	GarbageTruck : {id: 318, x:11},
-	SafehouseForSale : {id: 350, x:14},
-	Package : {},
-
-	MartinMadrazo: {x:0, y: 9},
-	Boost: {id: 354},
-	Devin : {},
-	Marina : {},
-	Garage : {},
-	GolfFlag : {},
-	Hangar : {},
-	Helipad : {},
-	JerryCan : {},
-	Masks : {},
-	HeistSetup : {},
-	PickupSpawn : {id: 365},
-	BoilerSuit : {},
-	Completed : {},
-	Rockets : {},
-	GarageForSale : {},
-
-	HelipadForSale : {x: 0, y: 10},
-	MarinaForSale : {},
-	HangarForSale : {},
-	Business : {id: 374},
-	BusinessForSale : {},
-	RaceBike : {},
-	Parachute : {},
-	TeamDeathmatch : {},
-	RaceFoot : {},
-	VehicleDeathmatch : {},
-	Barry : {},
-	Dom : {},
-	MaryAnn : {},
-	Cletus : {},
-	Josh : {},
-	Minute : {},
-
-	Omega:  {x:0, y:11},
-	Tonya : {},
-	Paparazzo : {},
-	Abigail : {id: 400},
-	Blimp : {},
-	Repair : {},
-	Testosterone : {},
-	Dinghy : {},
-	Fanatic : {},
-	CaptureBriefcase : {id: 408},
-	LastTeamStanding : {},
-	Boat : {},
-	CaptureHouse : {},
-	JerryCan2 : {id: 415,  x: 14},
-	CaptureAmericanFlag : {id: 419},
-
-	CaptureFlag : {x:0, y: 12},
-	Tank : {},
-	GunCar : {id: 426, x: 3},
-	Speedboat : {},
-	Heist : {},
-	Stopwatch : {id: 430},
-	DollarSignCircled : {},
-	Crosshair2 : {},
-	DollarSignSquared : {id: 434}
-}
-
-function generateBlipShit(){
-	var currentX = 0, currentY = 0, currentId = 0;
-	for(var blipName in types){
-		var blip = types[blipName];
-
-		if(typeof(blip.id) != 'undefined'){
-			currentId = blip.id;
-		}else{
-			currentId ++;
-		}
-
-		if(typeof(blip.x) != 'undefined'){
-			currentX = blip.x;
-		}else{
-			currentX ++;
-		}
-
-		if(typeof(blip.y) != 'undefined'){
-			currentY = blip.y;
-		}
-
-		MarkerTypes[currentId] = {
-			name: blipName.replace(/([A-Z0-9])/g, ' $1').trim(),
-			icon: "blips_texturesheet.png",
-			size: new google.maps.Size( customImageWidth, customImageHeight ),
-			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 ),
-		}
-	}
->>>>>>> Stashed changes
 }
 
-generateBlipShit();
+generateBlipShit();