adjust Stardate slightly and add a comment for the source; rename one redundant gModN...

[tricorder.git] / js / tricorder.js

diff --git a/js/tricorder.js b/js/tricorder.js
index f88ebb120e470277fc7818a1d35a095e2ff76a5e..28852a02b72c504475529d29f8bf298ec1e79ca2 100644 (file)
--- a/js/tricorder.js
+++ b/js/tricorder.js
@@ -37,8 +37,10 @@ function updateStardate() {
 
   var curDate = new Date();
 
 
   var curDate = new Date();
 

+  // Star Trek famously premiered on Thursday, September 8, 1966, at 8:30 p.m.
+  // See http://www.startrek.com/article/what-if-the-original-star-trek-had-debuted-on-friday-nights

   if (!gSDBase)
   if (!gSDBase)

-    gSDBase = new Date("September 8, 1966 20:00:00 EST");
+    gSDBase = new Date("September 8, 1966 20:30:00 EST");

 
   var sdateval = (curDate - gSDBase) / (86400 * 365.2425);
   gStardate.textContent = sdateval.toFixed(1);
 
   var sdateval = (curDate - gSDBase) / (86400 * 365.2425);
   gStardate.textContent = sdateval.toFixed(1);


@@ -226,18 +228,37 @@ var gModDev = {
     gSounds.scan.pause();
   },
   updateBattery: function() {
     gSounds.scan.pause();
   },
   updateBattery: function() {

-    document.getElementById("devBattLevel").textContent = (navigator.battery.level * 100).toFixed(1) + "%";
-    document.getElementById("devBattStatus").textContent = 
-        navigator.battery.charging ? "charging, " + navigator.battery.chargingTime + "s remaining"
-                                   : navigator.battery.dischargingTime + "s usage remaining";
+    document.getElementById("devBattLevel").textContent =
+        (navigator.battery.level * 100).toFixed(1) + "%";
+    if (navigator.battery.charging) {
+      if (navigator.battery.chargingTime == 0 ||
+          navigator.battery.chargingTime == Infinity) {
+        document.getElementById("devBattStatus").textContent = "charging";
+      }
+      else {
+        document.getElementById("devBattStatus").textContent = 
+            "charging, " + navigator.battery.chargingTime + "s remaining";
+      }
+    }
+    else {
+      if (navigator.battery.dischargingTime == 0 ||
+          navigator.battery.dischargingTime == Infinity) {
+        document.getElementById("devBattStatus").textContent = "discharging";
+      }
+      else {
+        document.getElementById("devBattStatus").textContent = 
+            navigator.battery.dischargingTime + "s usage remaining";
+      }
+    }

   },
   batteryTimer: null,
 }
 
   },
   batteryTimer: null,
 }
 

-var gModNull = {
+var gModSound = {

   activate: function() {
     //gSounds.scan.play();
   },
   activate: function() {
     //gSounds.scan.play();
   },

+  // getUserMedia ("WebRTC") + MediaElementAudioSourceNode (WebAudio)

   deactivate: function() {
     gSounds.scan.pause();
   },
   deactivate: function() {
     gSounds.scan.pause();
   },