Continuously update vague timestamps. This fixes issue #12

brikteknologier · Sep 30, 2013 · d249653 · d249653
1 parent 8aa6d6c
commit d249653
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "mu2": "~0.5.19",
     "formidable": "~1.0.14",
     "memorystream": "~0.2.0",
-    "vague-time": "~0.5.5"
+    "vague-time": "git://github.com/brikteknologier/vagueTime.js.git"
   },
   "devDependencies": {
     "mocha": "~1.9.0",

diff --git a/subsystems/webui/static/vagueTime.js b/subsystems/webui/static/vagueTime.js
@@ -0,0 +1 @@
+../../../node_modules/vague-time/src/vagueTime.js
diff --git a/subsystems/webui/static/vagueTimeUpdater.js b/subsystems/webui/static/vagueTimeUpdater.js
@@ -0,0 +1,23 @@
+document.addEventListener("DOMContentLoaded", function(event) {
+    var elements = document.getElementsByClassName("vagueTime");
+
+    for (var i = 0; i < elements.length; ++i) {
+        watchElement(elements[i]);
+    }
+
+    function watchElement(element) {
+        var since = new Date(element.getAttribute("data-since"));
+
+        function update() {
+            var now = new Date();
+            var results = vagueTime.get({
+                from: now,
+                to: since,
+                remaining: true
+            });
+            element.innerText = results.timeString;
+            setTimeout(update, results.remaining);
+        }
+        update();
+    }
+});
diff --git a/subsystems/webui/templates/index.mu.html b/subsystems/webui/templates/index.mu.html
@@ -43,6 +43,8 @@
         }
     });
     </script>
+    <script src="static/vagueTime.js"></script>
+    <script src="static/vagueTimeUpdater.js"></script>
 </head>
 <body>
     <h1>Actions</h1>
@@ -78,7 +80,7 @@ <h1>Currently running subprocesses</h1>
         <tbody>
             {{#running}}
             <tr>
-                <td title="{{sincePrecise}}">{{since}}</td>
+                <td title="{{sincePrecise}}" data-since="{{sincePrecise}}" class="vagueTime">{{since}}</td>
                 <td><a href="subprocess/{{id}}">{{title}}</a></td>
             </tr>
             {{/running}}
@@ -97,7 +99,7 @@ <h1>Recently terminated subprocesses</h1>
         <tbody>
             {{#finished}}
             <tr>
-                <td title="{{finishedPrecise}}">{{finished}}</td>
+                <td title="{{finishedPrecise}}" data-since="{{finishedPrecise}}" class="vagueTime">{{finished}}</td>
                 <td><a href="subprocess/{{id}}">{{title}}</a></td>
                 <td><span class="exec-status {{status_class}}">{{status}}</span></td>
             </tr>