From 0f606a85fb4cdad747c129848c0d791e1b18693a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 21 Sep 2009 02:43:44 +0100 Subject: [PATCH] Abbreviate some variable names in tabsort --- yarrg/web/tabsort | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort index e114319..45d5e69 100644 --- a/yarrg/web/tabsort +++ b/yarrg/web/tabsort @@ -56,7 +56,7 @@ $cols % print $m->content(); -% my $sortfn= "ts_sort__$table"; +% my $sortfn= "ts_s_$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 $mapfn= "ts_compar${cix}_map__$table"; -function <% $mapfn %>(rowelement) { - var rowid = rowelement.id; +% my $mapfn= "ts_${cix}m_$table"; +function <% $mapfn %>(re) { + var rowid = re.id; % 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) { - var a_key = <% $mapfn %>(a); - var b_key = <% $mapfn %>(b); + var ak = <% $mapfn %>(a); + var bk = <% $mapfn %>(b); % if ($col->{Numeric}) { - return a_key - b_key + return ak - bk % } else { - if (a_key < b_key) return -1; - if (a_key > b_key) return +1; + if (ak < bk) return -1; + if (ak > bk) return +1; 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); } + % } % $thhtml .= "". % ($reverse ? '∨' : '∧'). ''; -- 2.30.2