Make da_Refresh output into a method

diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index fc7999341fee3451976280d98faa00d2770aa1b1..e0591e3a20f69573fd72195366c1d17834b9b591 100644 (file)
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -101,27 +101,36 @@ Time since this page loaded:
 <& "lookup:formhidden", ours => sub { 0; } &>
 </form>
 
+<%method dataages>
+<%args>
+  $id2age
+  $elemidprefix => ''
+</%args>
 <&| script &>
-  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
-  da_ages= <% to_json_protecttags(\%da_ages) %>;
-
+  da_ages= <% to_json_protecttags($id2age) %>;
   function da_Refresh() {
     var now= Date.now();
     debug('updating now='+now);
-    for (var rowid in da_ages) {
-      var oldage= da_ages[rowid];
-      var cellid= 'c'+rowid;
-      var el= document.getElementById(cellid);
+    for (var ageid in da_ages) {
+      var oldage= da_ages[ageid];
+      var el= document.getElementById(<% $elemidprefix %>ageid);
       var age= oldage + (now - da_pageload) / 1000;
       var newhtml= <% meta_prettyprint_age('age','Math.floor','+') %>;
 % if ($ARGS{debug}) {
-      if (cellid == 'cid_loaded')
-       debug('element rowid='+rowid+' cellid='+cellid
-               +' oldage='+oldage+' age='+age+': '+newhtml);
+      if (elemid == 'cid_loaded')
+       debug('element ageid='+ageid+' oldage='+oldage
+               +' age='+age+': '+newhtml);
 % }
       el.innerHTML= newhtml;
     }
   }
+</&>
+</%method>
+
+<& SELF:dataages, id2age => \%da_ages, elemidprefix => "'c'+" &>
+
+<&| script &>
+  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
 
   function all_onload() {
     ts_onload__ts_table();