X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Ftabsort;h=e114319a0254f4780bfcaa6071093d39f016f23f;hb=f0c6aae5a301ba3236debfe2588a55ae3f8481c6;hp=b11c8785a8e090bd989fc0b68df6cef272f4ab07;hpb=41eff7a5ec6225db4a8a4737ec004866e8da6425;p=ypp-sc-tools.main.git

diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort
index b11c878..e114319 100644
--- a/yarrg/web/tabsort
+++ b/yarrg/web/tabsort
@@ -40,6 +40,7 @@ $table => 'ts_table'
 $sortkeys => 'ts_sortkeys'
 $throw => undef
 $tbrow => undef
+$rowclass => undef
 $cols
 </%args>
 
@@ -53,6 +54,8 @@ $cols
 
 <&| script &>
 
+% print $m->content();
+
 %	my $sortfn= "ts_sort__$table";
 function <% $sortfn %>(compar) {
   debug('sorting compar='+compar);
@@ -67,6 +70,7 @@ function <% $sortfn %>(compar) {
   for (; rowix < rows.length; rowix++) {
     var row= rows.item(rowix);
     if (row.id == '<% $throw %>') break;
+    debug('skip row '+rowix+' [[ '+row+' ]] id='+row.id);
   }
   rowix++;
 %	}
@@ -75,16 +79,28 @@ function <% $sortfn %>(compar) {
 %	if (defined $tbrow) {
     if (row.id == '<% $tbrow %>') break;
 %	}
-    if (!row.id) continue;
-    if (row.tagName != 'TR') continue;
-    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id)
+    if (!row.id) { debug('noid row '+rowix+' [[ '+row+' ]]'); continue; }
+    if (row.tagName != 'TR') {
+      debug('no-tr row '+rowix+' tagName='+row.tagName+' [[ '+row+' ]]');
+      continue;
+    }
+    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id);
     newrows.push(row);
   }
   for (; rowix < rows.length; rowix++) {
     var row= rows.item(rowix);
     finalrows.push(row);
+    debug('final row '+rowix+' [[ '+row+' ]]');
   }
   newrows.sort(compar);
+%	if (defined $rowclass) {
+  for (var rowix=0; rowix < newrows.length; rowix++) {
+    var row= newrows[rowix];
+    var classname= '<% $rowclass %>'+(rowix % 2);
+    debug('fix row '+rowix+' class '+classname);
+    row.className= classname;
+  }
+%	}
   newrows= newrows.concat(finalrows);
   for (var rowix=0; rowix < newrows.length; rowix++) {
     var row= newrows[rowix];
@@ -127,7 +143,7 @@ function <% $comparefn %>(a,b) {
 %	}
 }
 
-%	foreach my $reverse (qw(0 1)) {
+%	foreach my $reverse (qw(1 0)) {
 %		my $tcomparefn= "ts_compar${cix}_cmp${reverse}__$table";
 %		if ($reverse) {
 %			next unless $col->{DoReverse};
@@ -154,4 +170,6 @@ function ts_onload__<% $table %>() {
     thlist.item(cix).innerHTML += ah;
   }
 }
+
+register_onload(ts_onload__<% $table %>);
 </&>