Merge sorttable.js code into wikibits.js, get rid of JS hack for on-demand loading...
authorIlmari Karonen <vyznev@users.mediawiki.org>
Wed, 31 Jan 2007 12:51:18 +0000 (12:51 +0000)
committerIlmari Karonen <vyznev@users.mediawiki.org>
Wed, 31 Jan 2007 12:51:18 +0000 (12:51 +0000)
RELEASE-NOTES
includes/DefaultSettings.php
skins/common/sorttable.js [deleted file]
skins/common/wikibits.js

index b0223e1..bd5cdaa 100644 (file)
@@ -155,6 +155,8 @@ lighter making things easier to read.
   is passed as a query string parameter; we have to pass the title as
   a form parameter or it gets dropped from the form submission URL
 * (bug 8819) Fix full path disclosure in with skins dependencies
+* Fixed bug affecting HTML formatting in sortable table column titles
+* Merged table sorting code into wikibits.js
 
 
 == Languages updated ==
index 7d72325..44e0c83 100644 (file)
@@ -1110,7 +1110,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '52';
+$wgStyleVersion = '53';
 
 
 # Server-side caching:
diff --git a/skins/common/sorttable.js b/skins/common/sorttable.js
deleted file mode 100644 (file)
index 229b4c3..0000000
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Table sorting script  by Joost de Valk, check it out at http://www.joostdevalk.nl/code/sortable-table/.
- * Based on a script from http://www.kryogenix.org/code/browser/sorttable/.
- * Distributed under the MIT license: http://www.kryogenix.org/code/browser/licence.html .
- *
- * Copyright (c) 1997-2006 Stuart Langridge, Joost de Valk.
- *
- * @todo don't break on colspans/rowspans (bug 8028)
- * @todo language-specific digit grouping/decimals (bug 8063)
- * @todo support all accepted date formats (bug 8226)
- */
-
-var image_path = stylepath+"/common/images/";
-var image_up = "sort_up.gif";
-var image_down = "sort_down.gif";
-var image_none = "sort_none.gif";
-var europeandate = wgContentLanguage != "en"; // The non-American-inclined can change to "true"
-
-var alternate_row_colors = true;
-
-
-hookEvent( "load", sortables_init);
-
-var SORT_COLUMN_INDEX;
-var thead = false;
-
-function sortables_init() {
-       var idnum = 0;
-       // Find all tables with class sortable and make them sortable
-       if (!document.getElementsByTagName) return;
-       tbls = document.getElementsByTagName("table");
-       for (ti=0;ti<tbls.length;ti++) {
-               thisTbl = tbls[ti];
-               if ( (' '+thisTbl.className+' ').indexOf("sortable") != -1 ) {
-                       if (!thisTbl.id) {
-                               thisTbl.setAttribute('id','sortable_table_id_'+idnum);
-                               ++idnum;
-                       }
-                       ts_makeSortable(thisTbl);
-               }
-       }
-}
-
-function ts_makeSortable(table) {
-       if (table.rows && table.rows.length > 0) {
-               if (table.tHead && table.tHead.rows.length > 0) {
-                       var firstRow = table.tHead.rows[table.tHead.rows.length-1];
-                       thead = true;
-               } else {
-                       var firstRow = table.rows[0];
-               }
-       }
-       if (!firstRow) return;
-
-       // We have a first row: assume it's the header, and make its contents clickable links
-       for (var i=0;i<firstRow.cells.length;i++) {
-               var cell = firstRow.cells[i];
-               if (cell.className != "unsortable" && cell.className.indexOf("unsortable") == -1) {
-                       cell.innerHTML += '&nbsp;&nbsp;<a href="#" class="sortheader" onclick="ts_resortTable(this);return false;"><span class="sortarrow"><img src="'+ image_path + image_none + '" alt="&darr;"/></span></a>';
-               }
-       }
-       if (alternate_row_colors) {
-               alternate(table);
-       }
-}
-
-function ts_getInnerText(el) {
-       if (typeof el == "string") return el;
-       if (typeof el == "undefined") { return el };
-       if (el.innerText) return el.innerText;  //Not needed but it is faster
-       var str = "";
-       
-       var cs = el.childNodes;
-       var l = cs.length;
-       for (var i = 0; i < l; i++) {
-               switch (cs[i].nodeType) {
-                       case 1: //ELEMENT_NODE
-                               str += ts_getInnerText(cs[i]);
-                               break;
-                       case 3: //TEXT_NODE
-                               str += cs[i].nodeValue;
-                               break;
-               }
-       }
-       return str;
-}
-
-function ts_resortTable(lnk) {
-       // get the span
-       var span;
-       for (var ci=0;ci<lnk.childNodes.length;ci++) {
-               if (lnk.childNodes[ci].tagName && lnk.childNodes[ci].tagName.toLowerCase() == 'span') span = lnk.childNodes[ci];
-       }
-       var spantext = ts_getInnerText(span);
-       var td = lnk.parentNode;
-       var column = td.cellIndex;
-       var table = getParent(td,'TABLE');
-
-       // Work out a type for the column
-       if (table.rows.length <= 1) return;
-
-       for( var i = 1, itm = ""; itm.match(/^([\s]|\n|\&nbsp;|<!--[^-]+-->)*$/); i++) {
-               var itm = ts_getInnerText(table.tBodies[0].rows[i].cells[column]);
-               itm = trim(itm);
-       }
-       sortfn = ts_sort_caseinsensitive;
-       if (itm.match(/^\d\d[\/. -][a-zA-Z]{3}[\/. -]\d\d\d\d$/)) sortfn = ts_sort_date;
-       if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d\d\d$/)) sortfn = ts_sort_date;
-       if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d$/)) sortfn = ts_sort_date;
-       if (itm.match(/^[£$\80Û¢´]/)) sortfn = ts_sort_currency;
-       if (itm.match(/^[\d.,]+\%?$/)) sortfn = ts_sort_numeric;
-       SORT_COLUMN_INDEX = column;
-       var firstRow = new Array();
-       var newRows = new Array();
-
-       for (k=0;k<table.tBodies.length;k++) {
-               for (i=0;i<table.tBodies[k].rows[0].length;i++) {
-                       firstRow[i] = table.tBodies[k].rows[0][i];
-               }
-       }
-
-       for (k=0;k<table.tBodies.length;k++) {
-               if (!thead) {
-                       // Skip the first row
-                       for (j=1;j<table.tBodies[k].rows.length;j++) {
-                               newRows[j-1] = table.tBodies[k].rows[j];
-                       }
-               } else {
-                       // Do NOT skip the first row
-                       for (j=0;j<table.tBodies[k].rows.length;j++) { 
-                               newRows[j] = table.tBodies[k].rows[j];
-                       }
-               }
-       }
-
-       newRows.sort(sortfn);
-
-       if (span.getAttribute("sortdir") == 'down') {
-                       ARROW = '<img src="'+ image_path + image_down + '" alt="&darr;"/>';
-                       newRows.reverse();
-                       span.setAttribute('sortdir','up');
-       } else {
-                       ARROW = '<img src="'+ image_path + image_up + '" alt="&uarr;"/>';
-                       span.setAttribute('sortdir','down');
-       } 
-       
-       // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
-       // don't do sortbottom rows
-       for (i=0; i<newRows.length; i++) {
-               if (!newRows[i].className || (newRows[i].className && (newRows[i].className.indexOf('sortbottom') == -1))) {
-                       table.tBodies[0].appendChild(newRows[i]);
-               }
-       }
-       // do sortbottom rows only
-       for (i=0; i<newRows.length; i++) {
-               if (newRows[i].className && (newRows[i].className.indexOf('sortbottom') != -1))
-                       table.tBodies[0].appendChild(newRows[i]);
-       }
-
-       // Delete any other arrows there may be showing
-       var allspans = document.getElementsByTagName("span");
-       for (var ci=0;ci<allspans.length;ci++) {
-               if (allspans[ci].className == 'sortarrow') {
-                       if (getParent(allspans[ci],"table") == getParent(lnk,"table")) { // in the same table as us?
-                               allspans[ci].innerHTML = '<img src="'+ image_path + image_none + '" alt="&darr;"/>';
-                       }
-               }
-       }
-
-       span.innerHTML = ARROW;
-       alternate(table);               
-}
-
-function getParent(el, pTagName) {
-       if (el == null) {
-               return null;
-       } else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase()) {    // Gecko bug, supposed to be uppercase
-               return el;
-       } else {
-               return getParent(el.parentNode, pTagName);
-       }
-}
-
-function sort_date(date) {     
-       // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
-       dt = "00000000";
-       if (date.length == 11) {
-               monthstr = date.substr(3,3);
-               monthstr = monthstr.toLowerCase();
-               switch(monthstr) {
-                       case "jan": var month = "01"; break;
-                       case "feb": var month = "02"; break;
-                       case "mar": var month = "03"; break;
-                       case "apr": var month = "04"; break;
-                       case "may": var month = "05"; break;
-                       case "jun": var month = "06"; break;
-                       case "jul": var month = "07"; break;
-                       case "aug": var month = "08"; break;
-                       case "sep": var month = "09"; break;
-                       case "oct": var month = "10"; break;
-                       case "nov": var month = "11"; break;
-                       case "dec": var month = "12"; break;
-                       // default: var month = "00";
-               }
-               dt = date.substr(7,4)+month+date.substr(0,2);
-               return dt;
-       } else if (date.length == 10) {
-               if (europeandate == false) {
-                       dt = date.substr(6,4)+date.substr(0,2)+date.substr(3,2);
-                       return dt;
-               } else {
-                       dt = date.substr(6,4)+date.substr(3,2)+date.substr(0,2);
-                       return dt;
-               }
-       } else if (date.length == 8) {
-               yr = date.substr(6,2);
-               if (parseInt(yr) < 50) { 
-                       yr = '20'+yr; 
-               } else { 
-                       yr = '19'+yr; 
-               }
-               if (europeandate == true) {
-                       dt = yr+date.substr(3,2)+date.substr(0,2);
-                       return dt;
-               } else {
-                       dt = yr+date.substr(0,2)+date.substr(3,2);
-                       return dt;
-               }
-       }
-       return dt;
-}
-
-function ts_sort_date(a,b) {
-       dt1 = sort_date(ts_getInnerText(a.cells[SORT_COLUMN_INDEX]));
-       dt2 = sort_date(ts_getInnerText(b.cells[SORT_COLUMN_INDEX]));
-
-       if (dt1==dt2) {
-               return 0;
-       }
-       if (dt1<dt2) {
-               return -1;
-       }
-       return 1;
-}
-
-function ts_sort_currency(a,b) {
-       aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).replace(/[^0-9.]/g,'');
-       bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).replace(/[^0-9.]/g,'');
-       return compare_numeric(aa,bb);
-}
-function ts_sort_numeric(a,b) {
-       aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
-       bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
-       return compare_numeric(aa,bb);
-}
-function compare_numeric(a,b) {
-       a = parseFloat(a.replace(/,/, ""));
-       a = (isNaN(a) ? 0 : a);
-       b = parseFloat(b.replace(/,/, ""));
-       b = (isNaN(b) ? 0 : b);
-       return a - b;
-}
-
-function ts_sort_caseinsensitive(a,b) {
-       aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
-       bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
-       if (aa==bb) {
-               return 0;
-       }
-       if (aa<bb) {
-               return -1;
-       }
-       return 1;
-}
-
-function ts_sort_default(a,b) {
-       aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
-       bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
-       if (aa==bb) {
-               return 0;
-       }
-       if (aa<bb) {
-               return -1;
-       }
-       return 1;
-}
-
-function addEvent(elm, evType, fn, useCapture)
-// addEvent and removeEvent
-// cross-browser event handling for IE5+,      NS6 and Mozilla
-// By Scott Andrew
-{
-       if (elm.addEventListener){
-               elm.addEventListener(evType, fn, useCapture);
-               return true;
-       } else if (elm.attachEvent){
-               var r = elm.attachEvent("on"+evType, fn);
-               return r;
-       } else {
-               alert("Handler could not be removed");
-       }
-} 
-
-function replace(s, t, u) {
-       /*
-       **  Replace a token in a string
-       **    s  string to be processed
-       **    t  token to be found and removed
-       **    u  token to be inserted
-       **  returns new String
-       */
-       i = s.indexOf(t);
-       r = "";
-       if (i == -1) return s;
-       r += s.substring(0,i) + u;
-       if ( i + t.length < s.length) {
-               r += replace(s.substring(i + t.length, s.length), t, u);
-       }
-       return r;
-}
-
-function trim(s) {
-       return s.replace(/^([ \t]|\n|\&nbsp;|<!--[^-]+-->)*/, "").replace(/([ \t]|\n|\&nbsp;|<!--[^-]+-->)*$/, "");
-}
-
-function alternate(table) {
-       // Take object table and get all it's tbodies.
-       var tableBodies = table.getElementsByTagName("tbody");
-       // Loop through these tbodies
-       for (var i = 0; i < tableBodies.length; i++) {
-               // Take the tbody, and get all it's rows
-               var tableRows = tableBodies[i].getElementsByTagName("tr");
-               // Loop through these rows
-               // Start at 1 because we want to leave the heading row untouched
-               for (var j = 0; j < tableRows.length; j++) {
-                       // Check if j is even, and apply classes for both possible results
-                       if ( (j % 2) == 0  ) {
-                               if ( !(tableRows[j].className.indexOf('odd') == -1) ) {
-                                       tableRows[j].className = replace(tableRows[j].className, 'odd', 'even');
-                               } else {
-                                       if ( tableRows[j].className.indexOf('even') == -1 ) {
-                                               tableRows[j].className += " even";
-                                       }
-                               }
-                       } else {
-                               if ( !(tableRows[j].className.indexOf('even') == -1) ) {
-                                       tableRows[j].className = replace(tableRows[j].className, 'even', 'odd');
-                               } else {
-                                       if ( tableRows[j].className.indexOf('odd') == -1 ) {
-                                               tableRows[j].className += " odd";
-                                       }
-                               }
-                       } 
-               }
-       }
-}
index 3ee6352..06f9b9f 100644 (file)
@@ -947,12 +947,6 @@ function getElementsByClassName(oElm, strTagName, oClassNames){
        return (arrReturnElements)
 }
 
-function sortableTables() {
-       if (getElementsByClassName(document, "table", "sortable").length != 0) {
-               document.write('<script type="text/javascript" src="'+stylepath+'/common/sorttable.js"></script>');
-       }
-}
-
 function redirectToFragment(fragment) {
        var match = navigator.userAgent.match(/AppleWebKit\/(\d+)/);
        if (match) {
@@ -975,6 +969,269 @@ function redirectToFragment(fragment) {
        }
 }
 
+/*
+ * Table sorting script  by Joost de Valk, check it out at http://www.joostdevalk.nl/code/sortable-table/.
+ * Based on a script from http://www.kryogenix.org/code/browser/sorttable/.
+ * Distributed under the MIT license: http://www.kryogenix.org/code/browser/licence.html .
+ *
+ * Copyright (c) 1997-2006 Stuart Langridge, Joost de Valk.
+ *
+ * @todo don't break on colspans/rowspans (bug 8028)
+ * @todo language-specific digit grouping/decimals (bug 8063)
+ * @todo support all accepted date formats (bug 8226)
+ */
+
+var ts_image_path = stylepath+"/common/images/";
+var ts_image_up = "sort_up.gif";
+var ts_image_down = "sort_down.gif";
+var ts_image_none = "sort_none.gif";
+var ts_europeandate = wgContentLanguage != "en"; // The non-American-inclined can change to "true"
+var ts_alternate_row_colors = true;
+var SORT_COLUMN_INDEX;
+
+function sortables_init() {
+       var idnum = 0;
+       // Find all tables with class sortable and make them sortable
+       var tables = getElementsByClassName(document, "table", "sortable");
+       for (var ti = 0; ti < tables.length ; ti++) {
+               if (!tables[ti].id) {
+                       tables[ti].setAttribute('id','sortable_table_id_'+idnum);
+                       ++idnum;
+               }
+               ts_makeSortable(tables[ti]);
+       }
+}
+
+function ts_makeSortable(table) {
+       var firstRow;
+       if (table.rows && table.rows.length > 0) {
+               if (table.tHead && table.tHead.rows.length > 0) {
+                       firstRow = table.tHead.rows[table.tHead.rows.length-1];
+               } else {
+                       firstRow = table.rows[0];
+               }
+       }
+       if (!firstRow) return;
+
+       // We have a first row: assume it's the header, and make its contents clickable links
+       for (var i = 0; i < firstRow.cells.length; i++) {
+               var cell = firstRow.cells[i];
+               if ((" "+cell.className+" ").indexOf(" unsortable ") == -1) {
+                       cell.innerHTML += '&nbsp;&nbsp;<a href="#" class="sortheader" onclick="ts_resortTable(this);return false;"><span class="sortarrow"><img src="'+ ts_image_path + ts_image_none + '" alt="&darr;"/></span></a>';
+               }
+       }
+       if (ts_alternate_row_colors) {
+               ts_alternate(table);
+       }
+}
+
+function ts_getInnerText(el) {
+       if (typeof el == "string") return el;
+       if (typeof el == "undefined") { return el };
+       if (el.innerText) return el.innerText;  // Not needed but it is faster
+       var str = "";
+       
+       var cs = el.childNodes;
+       var l = cs.length;
+       for (var i = 0; i < l; i++) {
+               switch (cs[i].nodeType) {
+                       case 1: //ELEMENT_NODE
+                               str += ts_getInnerText(cs[i]);
+                               break;
+                       case 3: //TEXT_NODE
+                               str += cs[i].nodeValue;
+                               break;
+               }
+       }
+       return str;
+}
+
+function ts_resortTable(lnk) {
+       // get the span
+       var span = lnk.getElementsByTagName('span')[0];
+
+       var td = lnk.parentNode;
+       var tr = td.parentNode;
+       var column = td.cellIndex;
+
+       var table = tr.parentNode;
+       while (table && !(table.tagName && table.tagName.toLowerCase() == 'table'))
+               table = table.parentNode;
+       if (!table) return;
+
+       // Work out a type for the column
+       if (table.rows.length <= 1) return;
+
+       // Skip the first row if that's where the headings are
+       var rowStart = (table.tHead && table.tHead.rows.length > 0 ? 0 : 1);
+
+       var itm = "";
+       for (var i = rowStart; i < table.rows.length; i++) {
+               if (table.rows[i].cells.length > column) {
+                       itm = ts_getInnerText(table.rows[i].cells[column]);
+                       itm = itm.replace(/^[\s\xa0]+/, "").replace(/[\s\xa0]+$/, "");
+                       if (itm != "") break;
+               }
+       }
+
+       sortfn = ts_sort_caseinsensitive;
+       if (itm.match(/^\d\d[\/. -][a-zA-Z]{3}[\/. -]\d\d\d\d$/))
+               sortfn = ts_sort_date;
+       if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d\d\d$/))
+               sortfn = ts_sort_date;
+       if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d$/))
+               sortfn = ts_sort_date;
+       if (itm.match(/^[£$\80Û¢´]/))
+               sortfn = ts_sort_currency;
+       if (itm.match(/^[\d.,]+\%?$/))
+               sortfn = ts_sort_numeric;
+
+       var reverse = (span.getAttribute("sortdir") == 'down');
+
+       var newRows = new Array();
+       for (var j = rowStart; j < table.rows.length; j++) {
+               var row = table.rows[j];
+               var keyText = ts_getInnerText(row.cells[column]);
+               var oldIndex = (reverse ? -j : j);
+
+               newRows[newRows.length] = new Array(row, keyText, oldIndex);
+       }
+
+       newRows.sort(sortfn);
+
+       var arrowHTML;
+       if (reverse) {
+                       arrowHTML = '<img src="'+ ts_image_path + ts_image_down + '" alt="&darr;"/>';
+                       newRows.reverse();
+                       span.setAttribute('sortdir','up');
+       } else {
+                       arrowHTML = '<img src="'+ ts_image_path + ts_image_up + '" alt="&uarr;"/>';
+                       span.setAttribute('sortdir','down');
+       } 
+       
+       // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
+       // don't do sortbottom rows
+       for (var i = 0; i < newRows.length; i++) {
+               if ((" "+newRows[i][0].className+" ").indexOf(" sortbottom ") == -1)
+                       table.tBodies[0].appendChild(newRows[i][0]);
+       }
+       // do sortbottom rows only
+       for (var i = 0; i < newRows.length; i++) {
+               if ((" "+newRows[i][0].className+" ").indexOf(" sortbottom ") != -1)
+                       table.tBodies[0].appendChild(newRows[i][0]);
+       }
+
+       // Delete any other arrows there may be showing
+       var spans = getElementsByClassName(tr, "span", "sortarrow");
+       for (var i = 0; i < spans.length; i++) {
+               spans[i].innerHTML = '<img src="'+ ts_image_path + ts_image_none + '" alt="&darr;"/>';
+       }
+       span.innerHTML = arrowHTML;
+
+       ts_alternate(table);            
+}
+
+function ts_dateToSortKey(date) {      
+       // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
+       if (date.length == 11) {
+               switch (date.substr(3,3).toLowerCase()) {
+                       case "jan": var month = "01"; break;
+                       case "feb": var month = "02"; break;
+                       case "mar": var month = "03"; break;
+                       case "apr": var month = "04"; break;
+                       case "may": var month = "05"; break;
+                       case "jun": var month = "06"; break;
+                       case "jul": var month = "07"; break;
+                       case "aug": var month = "08"; break;
+                       case "sep": var month = "09"; break;
+                       case "oct": var month = "10"; break;
+                       case "nov": var month = "11"; break;
+                       case "dec": var month = "12"; break;
+                       // default: var month = "00";
+               }
+               return date.substr(7,4)+month+date.substr(0,2);
+       } else if (date.length == 10) {
+               if (ts_europeandate == false) {
+                       return date.substr(6,4)+date.substr(0,2)+date.substr(3,2);
+               } else {
+                       return date.substr(6,4)+date.substr(3,2)+date.substr(0,2);
+               }
+       } else if (date.length == 8) {
+               yr = date.substr(6,2);
+               if (parseInt(yr) < 50) { 
+                       yr = '20'+yr; 
+               } else { 
+                       yr = '19'+yr; 
+               }
+               if (ts_europeandate == true) {
+                       return yr+date.substr(3,2)+date.substr(0,2);
+               } else {
+                       return yr+date.substr(0,2)+date.substr(3,2);
+               }
+       }
+       return "00000000";
+}
+
+function ts_parseFloat(num) {
+       if (!num) return 0;
+       num = parseFloat(num.replace(/,/, ""));
+       return (isNaN(num) ? 0 : num);
+}
+
+function ts_sort_date(a,b) {
+       var aa = ts_dateToSortKey(a[1]);
+       var bb = ts_dateToSortKey(b[1]);
+       return (aa < bb ? -1 : aa > bb ? 1 : a[2] - b[2]);
+}
+
+function ts_sort_currency(a,b) {
+       var aa = ts_parseFloat(a[1].replace(/[^0-9.]/g,''));
+       var bb = ts_parseFloat(b[1].replace(/[^0-9.]/g,''));
+       return (aa != bb ? aa - bb : a[2] - b[2]);
+}
+function ts_sort_numeric(a,b) {
+       var aa = ts_parseFloat(a[1]);
+       var bb = ts_parseFloat(b[1]);
+       return (aa != bb ? aa - bb : a[2] - b[2]);
+}
+function ts_sort_caseinsensitive(a,b) {
+       var aa = a[1].toLowerCase();
+       var bb = b[1].toLowerCase();
+       return (aa < bb ? -1 : aa > bb ? 1 : a[2] - b[2]);
+}
+
+function ts_sort_default(a,b) {
+       return (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2]);
+}
+
+function ts_alternate(table) {
+       // Take object table and get all it's tbodies.
+       var tableBodies = table.getElementsByTagName("tbody");
+       // Loop through these tbodies
+       for (var i = 0; i < tableBodies.length; i++) {
+               // Take the tbody, and get all it's rows
+               var tableRows = tableBodies[i].getElementsByTagName("tr");
+               // Loop through these rows
+               // Start at 1 because we want to leave the heading row untouched
+               for (var j = 0; j < tableRows.length; j++) {
+                       // Check if j is even, and apply classes for both possible results
+                       var oldClasses = tableRows[j].className.split(" ");
+                       var newClassName = "";
+                       for (var k = 0; k < oldClasses.length; k++) {
+                               if (oldClasses[k] != "" && oldClasses[k] != "even" && oldClasses[k] != "odd")
+                                       newClassName += oldClasses[k] + " ";
+                       }
+                       tableRows[j].className = newClassName + (j % 2 == 0 ? "even" : "odd");
+               }
+       }
+}
+
+/*
+ * End of table sorting code
+ */
+
 function runOnloadHook() {
        // don't run anything below this for non-dom browsers
        if (doneOnloadHook || !(document.getElementById && document.getElementsByTagName)) {
@@ -992,7 +1249,7 @@ function runOnloadHook() {
        akeytt( null );
        scrollEditBox();
        setupCheckboxShiftClick();
-       sortableTables();
+       sortables_init();
 
        // Run any added-on functions
        for (var i = 0; i < onloadFuncts.length; i++) {