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 'refs/remote/t.fa.dict.test' into stable-5.x
[ypp-sc-tools.db-test.git]
/
yarrg
/
web
/
tabsort
diff --git
a/yarrg/web/tabsort
b/yarrg/web/tabsort
index e114319a0254f4780bfcaa6071093d39f016f23f..45d5e69e3763f56cbd2a1e1b888ad26261094116 100644
(file)
--- a/
yarrg/web/tabsort
+++ b/
yarrg/web/tabsort
@@
-56,7
+56,7
@@
$cols
% print $m->content();
% print $m->content();
-% my $sortfn= "ts_s
ort_
_$table";
+% 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 %>');
@@
-115,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 {
@@
-130,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>';