From 06b2173885cf29366194dde4848ed9cf1377ff1d Mon Sep 17 00:00:00 2001
From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Mon, 2 Sep 2013 18:02:17 +0200
Subject: [PATCH 1/1] improve status messages

---
 js/tricorder.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/js/tricorder.js b/js/tricorder.js
index f88ebb1..ff53ccb 100644
--- a/js/tricorder.js
+++ b/js/tricorder.js
@@ -226,10 +226,28 @@ var gModDev = {
     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,
 }
-- 
2.35.3