X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Ftabsort;h=e114319a0254f4780bfcaa6071093d39f016f23f;hb=cf9d0277c5d6bfe900a0881a00984f8268a90514;hp=ad25f86b9ab981d58ed2e740cd91cc9d7d6ba23e;hpb=fceed60843f6a7c037b908eb529b542ad263c500;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort
index ad25f86..e114319 100644
--- a/yarrg/web/tabsort
+++ b/yarrg/web/tabsort
@@ -39,16 +39,23 @@
 $table => 'ts_table'
 $sortkeys => 'ts_sortkeys'
 $throw => undef
+$tbrow => undef
+$rowclass => undef
 $cols
 </%args>
 
 <%doc>
+	Numeric
+	SortKey
+	MapFn
 	NoSort
 	DoReverse
 </%doc>
 
 <&| script &>
 
+% print $m->content();
+
 %	my $sortfn= "ts_sort__$table";
 function <% $sortfn %>(compar) {
   debug('sorting compar='+compar);
@@ -57,17 +64,44 @@ function <% $sortfn %>(compar) {
   var tbody= firstrow.parentNode
   var rows= tbody.childNodes
   var newrows= new Array;
-  for (var rowix=0; rowix < rows.length; rowix++) {
-    var row= rows.item(rowix);
-    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id)
-    if (!row.id) continue;
+  var finalrows= new Array;
+  var rowix= 0;
 %	if (defined $throw) {
-    if (row.id == '<% $throw %>') continue;
+  for (; rowix < rows.length; rowix++) {
+    var row= rows.item(rowix);
+    if (row.id == '<% $throw %>') break;
+    debug('skip row '+rowix+' [[ '+row+' ]] id='+row.id);
+  }
+  rowix++;
 %	}
-    if (row.tagName != 'TR') continue;
+  for (; rowix < rows.length; rowix++) {
+    var row= rows.item(rowix);
+%	if (defined $tbrow) {
+    if (row.id == '<% $tbrow %>') break;
+%	}
+    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];
     debug('add row '+rowix+' [[ '+row+' ]]');
@@ -109,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};
@@ -136,4 +170,6 @@ function ts_onload__<% $table %>() {
     thlist.item(cix).innerHTML += ah;
   }
 }
+
+register_onload(ts_onload__<% $table %>);
 </&>