chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-5.x'
[ypp-sc-tools.db-test.git]
/
yarrg
/
web
/
tabsort
diff --git
a/yarrg/web/tabsort
b/yarrg/web/tabsort
index db7ac2b48cdd5468e5ccab0fe553719e18c23a38..45d5e69e3763f56cbd2a1e1b888ad26261094116 100644
(file)
--- a/
yarrg/web/tabsort
+++ b/
yarrg/web/tabsort
@@
-40,6
+40,7
@@
$table => 'ts_table'
$sortkeys => 'ts_sortkeys'
$throw => undef
$tbrow => undef
$sortkeys => 'ts_sortkeys'
$throw => undef
$tbrow => undef
+$rowclass => undef
$cols
</%args>
$cols
</%args>
@@
-53,7
+54,9
@@
$cols
<&| script &>
<&| script &>
-% my $sortfn= "ts_sort__$table";
+% print $m->content();
+
+% my $sortfn= "ts_s_$table";
function <% $sortfn %>(compar) {
debug('sorting compar='+compar);
var table= document.getElementById('<% $table %>');
function <% $sortfn %>(compar) {
debug('sorting compar='+compar);
var table= document.getElementById('<% $table %>');
@@
-90,6
+93,14
@@
function <% $sortfn %>(compar) {
debug('final row '+rowix+' [[ '+row+' ]]');
}
newrows.sort(compar);
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];
newrows= newrows.concat(finalrows);
for (var rowix=0; rowix < newrows.length; rowix++) {
var row= newrows[rowix];
@@
-104,9
+115,9
@@
function <% $sortfn %>(compar) {
% my $thhtml= '';
% next if $col->{NoSort};
% my $thhtml= '';
% next if $col->{NoSort};
-% my $mapfn= "ts_
compar${cix}_map_
_$table";
-function <% $mapfn %>(r
owelement
) {
- var rowid = r
owelement
.id;
+% my $mapfn= "ts_
${cix}m
_$table";
+function <% $mapfn %>(r
e
) {
+ var rowid = r
e
.id;
% if ($col->{SortKey}) {
return <% $col->{SortKey} %>;
% } else {
% if ($col->{SortKey}) {
return <% $col->{SortKey} %>;
% } else {
@@
-119,24
+130,25
@@
function <% $mapfn %>(rowelement) {
% }
}
% }
}
-% my $comparefn= "ts_
compar${cix}_cmp0_
_$table";
+% my $comparefn= "ts_
${cix}c0
_$table";
function <% $comparefn %>(a,b) {
function <% $comparefn %>(a,b) {
- var a
_key
= <% $mapfn %>(a);
- var b
_key
= <% $mapfn %>(b);
+ var a
k
= <% $mapfn %>(a);
+ var b
k
= <% $mapfn %>(b);
% if ($col->{Numeric}) {
% if ($col->{Numeric}) {
- return a
_key - b_key
+ return a
k - bk
% } else {
% } else {
- if (a
_key < b_key
) return -1;
- if (a
_key > b_key
) return +1;
+ if (a
k < bk
) return -1;
+ if (a
k > bk
) return +1;
return 0;
% }
}
% foreach my $reverse (qw(1 0)) {
return 0;
% }
}
% foreach my $reverse (qw(1 0)) {
-% my $tcomparefn= "ts_
compar${cix}_cmp${reverse}_
_$table";
+% my $tcomparefn= "ts_
${cix}c${reverse}
_$table";
% if ($reverse) {
% next unless $col->{DoReverse};
function <% $tcomparefn %>(a,b) { return -<% $comparefn %>(a,b); }
% if ($reverse) {
% next unless $col->{DoReverse};
function <% $tcomparefn %>(a,b) { return -<% $comparefn %>(a,b); }
+
% }
% $thhtml .= "<a href=\"javascript:$sortfn($tcomparefn)\">".
% ($reverse ? '∨' : '∧'). '</a>';
% }
% $thhtml .= "<a href=\"javascript:$sortfn($tcomparefn)\">".
% ($reverse ? '∨' : '∧'). '</a>';
@@
-159,4
+171,6
@@
function ts_onload__<% $table %>() {
thlist.item(cix).innerHTML += ah;
}
}
thlist.item(cix).innerHTML += ah;
}
}
+
+register_onload(ts_onload__<% $table %>);
</&>
</&>