Merge branch 'testing' into testing

Author: LukePrior

js/tracker.js

@@ -1061,7 +1061,9 @@ function sidebar_update() {
             if (map.getBounds().contains(vehicles[serial].marker.getLatLng())) {
                 $("#main .vehicle"+vehicles[serial].uuid).show();
             } else {
-                $("#main .vehicle"+vehicles[serial].uuid).hide();
+                if (!($("#main .vehicle"+vehicles[serial].uuid).hasClass("follow"))) {
+                    $("#main .vehicle"+vehicles[serial].uuid).hide();
+                }
             }
         }
     } else {
@@ -3489,7 +3491,7 @@ function refresh() {
             refreshSingle(wvar.query);
         } else {
             response = formatData(data, false);
-            update(response);   
+            update(response, true);   
             $("#stTimer").attr("data-timestamp", response.fetch_timestamp);
         }
         $("#stText").text("");
@@ -3617,7 +3619,7 @@ function refreshSingle(serial) {
       dataType: "json",
       success: function(data, textStatus) {
         response = formatData(data, false);
-        update(response);
+        update(response, true);
         singleRecovery(serial);
         $("#stText").text("");
       },
@@ -3659,7 +3661,7 @@ function refreshSingleNew(serial) {
       dataType: "json",
       success: function(data, textStatus) {
         response = formatData(data, false);
-        update(response);
+        update(response, true);
       },
       error: function() {
         ajax_inprogress_single_new = false;
@@ -4374,14 +4376,16 @@ var ssdv = {};
 var status = "";
 var bs_idx = 0;
 
-function update(response) {
+function update(response, none) {
     if (response === null ||
         !response.positions ||
         !response.positions.position ||
         !response.positions.position.length) {
 
         // if no vehicles are found, this will remove the spinner and put a friendly message
-        $("#main .empty").html("<span>No vehicles :(</span>");
+        if (none) {
+            $("#main .empty").html("<span>No vehicles :(</span>");
+        }
 
         return;
     }