[hamradio-commits] [dump1090] 257/373: IE 8/9 Bugs in Web interface

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit 2c28d9fe2f85b6e5fd2bb65037dc2a03410f7f0c
Author: Malcolm Robb <Support at ATTAvionics.com>
Date:   Thu Sep 26 12:59:46 2013 +0100

    IE 8/9 Bugs in Web interface
    
    *DISCLAIMER*
    I didn't write any of this code initially, I've never tried to use it,
    and I don't understand Java Script at all. In-fact I hate the wretched
    stuff.
    
    Anyway, it appears that no-one has bothered to test any of the Web
    interface code using Microsoft Internet Explorer 8 or 9. I've attempted
    to hack out the sections of the code that are causing problems, and at
    least the web interface now seems to run.
    
    However, for some reason the planes never move - I know this must be a
    bug, but I don't know how to fix it.
    
    Most of the errors relate to trailing commas.  My guess it that some
    Java engines don't mind trailing commas, but that the Microsoft ones do.
    There are also some undefined modules (untrackedDeveloperSettings) and
    functions (console.log) which I guess those who wrote the code have on
    their machines, but forgot to include in the public distribution. I've
    no idea how to fix this, so I've just hacked them out of the code.
---
 public_html/gmap.html      | 3 +--
 public_html/options.js     | 2 +-
 public_html/planeObject.js | 9 +++------
 public_html/script.js      | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/public_html/gmap.html b/public_html/gmap.html
index 7f311ed..80afe02 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -6,7 +6,6 @@
 		<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
 		<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&libraries=geometry"></script>
 		<script type="text/javascript" src="config.js"></script>
-		<script type="text/javascript" src="untrackedDeveloperSettings.js"></script> <!-- Developers -->
 		<script type="text/javascript" src="planeObject.js"></script>
 		<script type="text/javascript" src="options.js"></script>
 		<script type="text/javascript" src="extension.js"></script>
@@ -22,7 +21,6 @@
 		<div id="map_container">
 			<div id="map_canvas"></div>
 		</div>
-		<div id="container_splitter"></div>
 		<div id="sidebar_container">
 			<div id="sidebar_canvas">
 				<div id="timestamps" style="align: center">
@@ -60,5 +58,6 @@
             This is most likely an error in reciving or decoding.<br>
             Please do not call the local authorities, they already know about it if it is valid squak.
 		</div>
+		<div id="container_splitter"></div>
 	</body>
 </html>
diff --git a/public_html/options.js b/public_html/options.js
index 8ca2a83..f4e3627 100644
--- a/public_html/options.js
+++ b/public_html/options.js
@@ -8,7 +8,7 @@ function optionsInitalize() {
 		height: 140,
 		modal: true,
 		autoOpen: false,
-		closeOnEscape: false,
+		closeOnEscape: false
 	});
 }
 
diff --git a/public_html/planeObject.js b/public_html/planeObject.js
index 1f91783..dfb0130 100644
--- a/public_html/planeObject.js
+++ b/public_html/planeObject.js
@@ -45,7 +45,6 @@ var planeObject = {
 
 	// This is to remove the line from the screen if we deselect the plane
 	funcClearLine	: function() {
-			console.log("Clearing line for: " + this.icao);
 			if (this.line) {
 				this.line.setMap(null);
 				this.line = null;
@@ -164,7 +163,6 @@ var planeObject = {
 				}
 			} else {
 				if (this.reapable == true) {
-					console.log(this.icao + ' has come back into range before the reaper!');
 				}
 				this.reapable = false;
 			}
@@ -216,7 +214,7 @@ var planeObject = {
 					position: new google.maps.LatLng(this.latitude, this.longitude),
 					map: GoogleMap,
 					icon: this.funcGetIcon(),
-					visable: true,
+					visable: true
 				});
 
 				// This is so we can match icao address
@@ -243,15 +241,14 @@ var planeObject = {
 				var path = this.line.getPath();
 				path.push(new google.maps.LatLng(this.latitude, this.longitude));
 			} else {
-				console.log("Starting new line");
 				this.line = new google.maps.Polyline({
 					strokeColor: '#000000',
 					strokeOpacity: 1.0,
 					strokeWeight: 3,
 					map: GoogleMap,
-					path: this.trackline,
+					path: this.trackline
 				});
 			}
 			return this.line;
-		},
+		}
 };
diff --git a/public_html/script.js b/public_html/script.js
index bda2ec3..9371ce0 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -5,7 +5,7 @@ var PlanesOnMap   = 0;
 var PlanesOnTable = 0;
 var PlanesToReap  = 0;
 var SelectedPlane = null;
-var SpecialSqawk  = false;
+var SpecialSquawk = false;
 
 var iSortCol=-1;
 var bSortASC=true;
@@ -136,7 +136,7 @@ function initialize() {
 		zoom: ZoomLvl,
 		mapTypeId: google.maps.MapTypeId.ROADMAP,
 		mapTypeControlOptions: {
-			mapTypeIds: mapTypeIds,
+			mapTypeIds: mapTypeIds
 		}
 	};
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git