turn off sounds when we time out or such

[tricorder.git] / js / tricorder.js

diff --git a/js/tricorder.js b/js/tricorder.js
index 2debeec9964f1d1d2c0acd9cab1a0f9895f8b33b..3bf19c6357e10ee28a4f1dd4787cb8f32ea0dad5 100644 (file)
--- a/js/tricorder.js
+++ b/js/tricorder.js
@@ -74,8 +74,11 @@ function switchModule(modname) {
     navs[i].classList.remove("active");
   }
 
     navs[i].classList.remove("active");
   }
 

-  document.getElementById("nav" + modname).classList.add("active");
+  var navItem = document.getElementById("nav" + modname);
+  navItem.classList.add("active");

   document.getElementById("sect" + modname).classList.add("active");
   document.getElementById("sect" + modname).classList.add("active");

+  document.getElementById("mainHeader").textContent =
+      (modname == "Other") ? "Web Tricorder" : navItem.textContent;

 
   window["gMod" + modname].activate();
 }
 
   window["gMod" + modname].activate();
 }


@@ -116,13 +119,15 @@ var gModPos = {
             document.getElementById("posHead").textContent = "...";
             document.getElementById("posSpd").textContent = "...";
             document.getElementById("posTime").textContent = "...";
             document.getElementById("posHead").textContent = "...";
             document.getElementById("posSpd").textContent = "...";
             document.getElementById("posTime").textContent = "...";

+            setTimeout(function() { gModPos.deactivate(); }, 5000);

           }
           else {
             document.getElementById("posunavail").style.display = "block";
             document.getElementById("posavail").style.display = "none";
           }
           }
           else {
             document.getElementById("posunavail").style.display = "block";
             document.getElementById("posavail").style.display = "none";
           }

+          gSounds.scan.pause();

         },
         },

-        {enableHighAccuracy: true}
+        {enableHighAccuracy: true, maximumAge: 10000, timeout: 60000}

       );
     }
     else {
       );
     }
     else {