From 0ba4ba3fd7da4e569db0e3dff5a1bcb3905503b5 Mon Sep 17 00:00:00 2001
From: byronbest <43890914+byronbest@users.noreply.github.com>
Date: Wed, 4 Sep 2019 09:43:13 -0700
Subject: [PATCH] fixed up the merge problems

---
 public_html/script.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/public_html/script.js b/public_html/script.js
index 134bf43..c18f09e 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -1106,18 +1106,16 @@ function refreshHighlighted() {
 		highlighted = Planes[HighlightedPlane];
 	}
 
+	var infoBox = $('#highlighted_infoblock');
+
 	// no highlighted plane or in process of removing plane
 	if (!highlighted || !highlighted.marker) {
-		$('#highlighted_infoblock').fadeOut();
+		infoBox.fadeOut();
 		return;
 	}
-
-	var marker = highlighted.marker;
-	var infoBox = $('#highlighted_infoblock');
-	var mapCanvas = $('#map_canvas');
-
 	infoBox.fadeIn(100);
 
+	var mapCanvas = $('#map_canvas');
 	var markerCoordinates = highlighted.marker.getGeometry().getCoordinates();
     var markerPosition = OLMap.getPixelFromCoordinate(markerCoordinates);
         var x = markerPosition[0] + 20;