jquery-tablesorter 1.0.5 → 1.1.0

data/vendor/assets/javascripts/jquery-tablesorter/jquery.metadata.js

@@ -1,56 +1,48 @@
-/*
+/*
  * Metadata - jQuery plugin for parsing metadata from elements
  *
- * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan
+ * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  *
- * Revision: $Id: jquery.metadata.js 3640 2007-10-11 18:34:38Z pmclanahan $
- *
  */
 
 /**
  * Sets the type of metadata to use. Metadata is encoded in JSON, and each property
  * in the JSON will become a property of the element itself.
  *
- * There are four supported types of metadata storage:
+ * There are three supported types of metadata storage:
  *
  *   attr:  Inside an attribute. The name parameter indicates *which* attribute.
- *          
+ *
  *   class: Inside the class attribute, wrapped in curly braces: { }
- *   
+ *
  *   elem:  Inside a child element (e.g. a script tag). The
  *          name parameter indicates *which* element.
- *   html5: Values are stored in data-* attributes.
- *          
+ *
  * The metadata for an element is loaded the first time the element is accessed via jQuery.
  *
  * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements
  * matched by expr, then redefine the metadata type and run another $(expr) for other elements.
- * 
+ *
  * @name $.metadata.setType
  *
  * @example <p id="one" class="some_class {item_id: 1, item_label: 'Label'}">This is a p</p>
  * @before $.metadata.setType("class")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from the class attribute
- * 
+ *
  * @example <p id="one" class="some_class" data="{item_id: 1, item_label: 'Label'}">This is a p</p>
  * @before $.metadata.setType("attr", "data")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from a "data" attribute
- * 
+ *
  * @example <p id="one" class="some_class"><script>{item_id: 1, item_label: 'Label'}</script>This is a p</p>
  * @before $.metadata.setType("elem", "script")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from a nested script element
- * 
- * @example <p id="one" class="some_class" data-item_id="1" data-item_label="Label">This is a p</p>
- * @before $.metadata.setType("html5")
- * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
- * @desc Reads metadata from a series of data-* attributes
  *
  * @param String type The encoding type
  * @param String name The name of the attribute to be used to get metadata (optional)
@@ -63,73 +55,49 @@
 (function($) {
 
 $.extend({
-  metadata : {
-    defaults : {
-      type: 'class',
-      name: 'metadata',
-      cre: /({.*})/,
-      single: 'metadata'
-    },
-    setType: function( type, name ){
-      this.defaults.type = type;
-      this.defaults.name = name;
-    },
-    get: function( elem, opts ){
-      var settings = $.extend({},this.defaults,opts);
-      // check for empty string in single property
-      if ( !settings.single.length ) settings.single = 'metadata';
-      
-      var data = $.data(elem, settings.single);
-      // returned cached data if it already exists
-      if ( data ) return data;
-      
-      data = "{}";
-      
-      var getData = function(data) {
-        if(typeof data != "string") return data;
-        
-        if( data.indexOf('{') < 0 ) {
-          data = eval("(" + data + ")");
-        }
-      }
-      
-      var getObject = function(data) {
-        if(typeof data != "string") return data;
-        
-        data = eval("(" + data + ")");
-        return data;
-      }
-      
-      if ( settings.type == "html5" ) {
-        var object = {};
-        $( elem.attributes ).each(function() {
-          var name = this.nodeName;
-          if(name.match(/^data-/)) name = name.replace(/^data-/, '');
-          else return true;
-          object[name] = getObject(this.nodeValue);
-        });
-      } else {
-        if ( settings.type == "class" ) {
-          var m = settings.cre.exec( elem.className );
-          if ( m )
-            data = m[1];
-        } else if ( settings.type == "elem" ) {
-          if( !elem.getElementsByTagName ) return;
-          var e = elem.getElementsByTagName(settings.name);
-          if ( e.length )
-            data = $.trim(e[0].innerHTML);
-        } else if ( elem.getAttribute != undefined ) {
-          var attr = elem.getAttribute( settings.name );
-          if ( attr )
-            data = attr;
-        }
-        object = getObject(data.indexOf("{") < 0 ? "{" + data + "}" : data);
-      }
-      
-      $.data( elem, settings.single, object );
-      return object;
-    }
-  }
+	metadata : {
+		defaults : {
+			type: 'class',
+			name: 'metadata',
+			cre: /(\{.*\})/,
+			single: 'metadata'
+		},
+		setType: function( type, name ){
+			this.defaults.type = type;
+			this.defaults.name = name;
+		},
+		get: function( elem, opts ){
+			var data, m, e, attr,
+				settings = $.extend({},this.defaults,opts);
+			// check for empty string in single property
+			if ( !settings.single.length ) { settings.single = 'metadata'; }
+
+			data = $.data(elem, settings.single);
+			// returned cached data if it already exists
+			if ( data ) { return data; }
+
+			data = "{}";
+
+			if ( settings.type === "class" ) {
+				m = settings.cre.exec( elem.className );
+				if ( m ) { data = m[1]; }
+			} else if ( settings.type === "elem" ) {
+				if( !elem.getElementsByTagName ) { return undefined; }
+				e = elem.getElementsByTagName(settings.name);
+				if ( e.length ) { data = $.trim(e[0].innerHTML); }
+			} else if ( elem.getAttribute !== undefined ) {
+				attr = elem.getAttribute( settings.name );
+				if ( attr ) { data = attr; }
+			}
+
+			if ( data.indexOf( '{' ) <0 ) { data = "{" + data + "}"; }
+
+			data = eval("(" + data + ")");
+
+			$.data( elem, settings.single, data );
+			return data;
+		}
+	}
 });
 
 /**
@@ -142,7 +110,7 @@ $.extend({
  * @cat Plugins/Metadata
  */
 $.fn.metadata = function( opts ){
-  return $.metadata.get( this[0], opts );
+	return $.metadata.get( this[0], opts );
 };
 
 })(jQuery);

data/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js

@@ -1,5 +1,5 @@
 /*!
-* TableSorter 2.3.11 - Client-side table sorting with ease!
+* TableSorter 2.4.6 - Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
@@ -14,24 +14,32 @@
 * @author Christian Bach/christian.bach@polyester.se
 * @contributor Rob Garrison/https://github.com/Mottie/tablesorter
 */
+/*jshint evil:true, browser:true, jquery:true, unused:false */
+/*global console:false, alert:false */
 !(function($) {
+	"use strict";
 	$.extend({
 		tablesorter: new function() {
 
-			this.version = "2.3.11";
+			var ts = this;
 
-			var parsers = [], widgets = [];
-			this.defaults = {
+			ts.version = "2.4.5";
+
+			ts.parsers = [];
+			ts.widgets = [];
+			ts.defaults = {
 
 				// appearance
+				theme            : 'default',  // adds tablesorter-{theme} to the table for styling
 				widthFixed       : false,      // adds colgroup to fix widths of columns
+				showProcessing   : false,      // show an indeterminate timer icon in the header when the table is sorted or filtered.
 
 				// functionality
 				cancelSelection  : true,       // prevent text selection in the header
-				dateFormat       : "mmddyyyy", // other options: "ddmmyyy" or "yyyymmdd"
-				sortMultiSortKey : "shiftKey", // key used to select additional columns
+				dateFormat       : 'mmddyyyy', // other options: "ddmmyyy" or "yyyymmdd"
+				sortMultiSortKey : 'shiftKey', // key used to select additional columns
 				usNumberFormat   : true,       // false for German "1.234.567,89" or French "1 234 567,89"
-				delayInit        : false,      // if false, the parsed table contents will not update until the first sort.
+				delayInit        : false,      // if false, the parsed table contents will not update until the first sort
 
 				// sort options
 				headers          : {},         // set sorter, string, empty, locked order, sortInitialOrder, filter, etc.
@@ -40,20 +48,20 @@
 				sortList         : [],         // Initial sort order; applied initially; updated when manually sorted
 				sortAppend       : null,       // column(s) sorted last; always applied
 
-				sortInitialOrder : "asc",      // sort direction on first click
+				sortInitialOrder : 'asc',      // sort direction on first click
 				sortLocaleCompare: false,      // replace equivalent character (accented characters)
 				sortReset        : false,      // third click on the header will reset column to default - unsorted
 				sortRestart      : false,      // restart sort to "sortInitialOrder" when clicking on previously unsorted columns
 
-				emptyTo          : "bottom",   // sort empty cell to bottom, top, none, zero
-				stringTo         : "max",      // sort strings in numerical column as max, min, top, bottom, zero
-				textExtraction   : "simple",   // text extraction method/function - function(node, table, cellIndex){}
+				emptyTo          : 'bottom',   // sort empty cell to bottom, top, none, zero
+				stringTo         : 'max',      // sort strings in numerical column as max, min, top, bottom, zero
+				textExtraction   : 'simple',   // text extraction method/function - function(node, table, cellIndex){}
 				textSorter       : null,       // use custom text sorter - function(a,b){ return a.sort(b); } // basic sort
 
 				// widget options
 				widgets: [],                   // method to add widgets, e.g. widgets: ['zebra']
 				widgetOptions    : {
-					zebra : [ "even", "odd" ]    // zebra widget alternating row class names
+					zebra : [ 'even', 'odd' ]    // zebra widget alternating row class names
 				},
 				initWidgets      : true,       // apply widgets on tablesorter initialization
 
@@ -63,15 +71,19 @@
 
 				// css class names
 				tableClass       : 'tablesorter',
-				cssAsc           : "tablesorter-headerSortUp",
-				cssChildRow      : "expand-child",
-				cssDesc          : "tablesorter-headerSortDown",
-				cssHeader        : "tablesorter-header",
-				cssInfoBlock     : "tablesorter-infoOnly", // don't sort tbody with this class name
+				cssAsc           : 'tablesorter-headerSortUp',
+				cssChildRow      : 'tablesorter-childRow', // previously "expand-child"
+				cssDesc          : 'tablesorter-headerSortDown',
+				cssHeader        : 'tablesorter-header',
+				cssHeaderRow     : 'tablesorter-headerRow',
+				cssIcon          : 'tablesorter-icon', //  if this class exists, a <i> will be added to the header automatically
+				cssInfoBlock     : 'tablesorter-infoOnly', // don't sort tbody with this class name
+				cssProcessing    : 'tablesorter-processing', // processing icon applied to header during sort/filter
 
 				// selectors
-				selectorHeaders  : '> thead th',
-				selectorRemove   : "tr.remove-me",
+				selectorHeaders  : '> thead th, > thead td',
+				selectorSort     : 'th, td',   // jQuery selector of content within selectorHeaders that is clickable to trigger a sort
+				selectorRemove   : '.remove-me',
 
 				// advanced
 				debug            : false,
@@ -100,8 +112,7 @@
 				log(s + " (" + (new Date().getTime() - d.getTime()) + "ms)");
 			}
 
-			this.benchmark = benchmark;
-			this.hasInitialized = false;
+			ts.benchmark = benchmark;
 
 			function getElementText(table, node, cellIndex) {
 				if (!node) { return ""; }
@@ -125,19 +136,8 @@
 				return $.trim(text);
 			}
 
-			/* parsers utils */
-			function getParserById(name) {
-				var i, l = parsers.length;
-				for (i = 0; i < l; i++) {
-					if (parsers[i].id.toLowerCase() === (name.toString()).toLowerCase()) {
-						return parsers[i];
-					}
-				}
-				return false;
-			}
-
 			function detectParserForColumn(table, rows, rowIndex, cellIndex) {
-				var i, l = parsers.length,
+				var i, l = ts.parsers.length,
 				node = false,
 				nodeValue = '',
 				keepLooking = true;
@@ -154,18 +154,18 @@
 					}
 				}
 				for (i = 1; i < l; i++) {
-					if (parsers[i].is(nodeValue, table, node)) {
-						return parsers[i];
+					if (ts.parsers[i].is(nodeValue, table, node)) {
+						return ts.parsers[i];
 					}
 				}
 				// 0 is always the generic parser (text)
-				return parsers[0];
+				return ts.parsers[0];
 			}
 
 			function buildParserCache(table, $headers) {
 				var c = table.config,
 					tb = $(table.tBodies).filter(':not(.' + c.cssInfoBlock + ')'),
-					ts = $.tablesorter, rows, list, l, i, h, m, ch, cl, p, parsersDebug = "";
+					rows, list, l, i, h, ch, p, parsersDebug = "";
 				if ( tb.length === 0) { return; } // In the case of empty tables
 				rows = tb[0].rows;
 				if (rows[0]) {
@@ -176,8 +176,8 @@
 						h = $headers.filter(':not([colspan])[data-column="' + i + '"]:last,[colspan="1"][data-column="' + i + '"]:last');
 						ch = c.headers[i];
 						// get column parser
-						p = getParserById( ts.getData(h, ch, 'sorter') );
-						// empty cells behaviour - keeping emptyToBottom for backwards compatibility.
+						p = ts.getParserById( ts.getData(h, ch, 'sorter') );
+						// empty cells behaviour - keeping emptyToBottom for backwards compatibility
 						c.empties[i] = ts.getData(h, ch, 'empty') || c.emptyTo || (c.emptyToBottom ? 'bottom' : 'top' );
 						// text strings behaviour in numerical sorts
 						c.strings[i] = ts.getData(h, ch, 'string') || c.stringTo || 'max';
@@ -208,11 +208,14 @@
 				if (tc.debug) {
 					cacheTime = new Date();
 				}
+				// processing icon
+				if (tc.showProcessing) {
+					ts.isProcessing(table, true);
+				}
 				for (k = 0; k < b.length; k++) {
 					tc.cache[k] = { row: [], normalized: [] };
 					// ignore tbodies with class name from css.cssInfoBlock
 					if (!$(b[k]).hasClass(tc.cssInfoBlock)) {
-						$(b[k]).addClass('tablesorter-hidden');
 						totalRows = (b[k] && b[k].rows.length) || 0;
 						totalCells = (b[k].rows[0] && b[k].rows[0].cells.length) || 0;
 						for (i = 0; i < totalRows; ++i) {
@@ -235,42 +238,13 @@
 							cols.push(tc.cache[k].normalized.length); // add position for rowCache
 							tc.cache[k].normalized.push(cols);
 						}
-						$(b[k]).removeClass('tablesorter-hidden');
 					}
 				}
-				if (tc.debug) {
-					benchmark("Building cache for " + totalRows + " rows", cacheTime);
-				}
-			}
-
-			function getWidgetById(name) {
-				var i, w, l = widgets.length;
-				for (i = 0; i < l; i++) {
-					w = widgets[i];
-					if (w && w.hasOwnProperty('id') && w.id.toLowerCase() === name.toLowerCase()) {
-						return w;
-					}
-				}
-			}
-
-			function applyWidget(table, init) {
-				var tc = table.config, c = tc.widgets,
-				time, i, w, l = c.length;
-				if (tc.debug) {
-					time = new Date();
-				}
-				for (i = 0; i < l; i++) {
-					w = getWidgetById(c[i]);
-					if ( w ) {
-						if (init === true && w.hasOwnProperty('init')) {
-							w.init(table, widgets, w);
-						} else if (!init && w.hasOwnProperty('format')) {
-							w.format(table);
-						}
-					}
+				if (tc.showProcessing) {
+					ts.isProcessing(table); // remove processing icon
 				}
 				if (tc.debug) {
-					benchmark("Completed " + (init === true ? "initializing" : "applying") + " widgets", time);
+					benchmark("Building cache for " + totalRows + " rows", cacheTime);
 				}
 			}
 
@@ -279,15 +253,17 @@
 				var c = table.config,
 				b = table.tBodies,
 				rows = [],
-				r, n, totalRows, checkCell, c2 = c.cache,
-				f, i, j, k, l, pos, appendTime;
+				c2 = c.cache,
+				r, n, totalRows, checkCell, $bk, $tb,
+				i, j, k, l, pos, appendTime;
 				if (c.debug) {
 					appendTime = new Date();
 				}
 				for (k = 0; k < b.length; k++) {
-					if (!$(b[k]).hasClass(c.cssInfoBlock)){
-						$(b[k]).addClass('tablesorter-hidden');
-						f = document.createDocumentFragment();
+					$bk = $(b[k]);
+					if (!$bk.hasClass(c.cssInfoBlock)) {
+						// get tbody
+						$tb = ts.processTbody(table, $bk, true);
 						r = c2[k].row;
 						n = c2[k].normalized;
 						totalRows = n.length;
@@ -299,12 +275,12 @@
 							if (!c.appender || !c.removeRows) {
 								l = r[pos].length;
 								for (j = 0; j < l; j++) {
-									f.appendChild(r[pos][j]);
+									$tb.append(r[pos][j]);
 								}
 							}
 						}
-						table.tBodies[k].appendChild(f);
-						$(b[k]).removeClass('tablesorter-hidden');
+						// restore tbody
+						ts.processTbody(table, $tb, false);
 					}
 				}
 				if (c.appender) {
@@ -314,7 +290,7 @@
 					benchmark("Rebuilt table", appendTime);
 				}
 				// apply table widgets
-				if (!init) { applyWidget(table); }
+				if (!init) { ts.applyWidget(table); }
 				// trigger sortend
 				$(table).trigger("sortEnd", table);
 			}
@@ -325,7 +301,7 @@
 			function computeThIndexes(t) {
 				var matrix = [],
 				lookup = {},
-				trs = $(t).find('thead:eq(0) tr'),
+				trs = $(t).find('thead:eq(0) tr, tfoot tr'),
 				i, j, k, l, c, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow;
 				for (i = 0; i < trs.length; i++) {
 					cells = trs[i].cells;
@@ -367,36 +343,38 @@
 				return (/^d/i.test(v) || v === 1);
 			}
 
-
 			function buildHeaders(table) {
 				var header_index = computeThIndexes(table), ch, $t,
-					$th, lock, time, $tableHeaders, c = table.config, ts = $.tablesorter;
+					t, lock, time, $tableHeaders, c = table.config;
 					c.headerList = [];
 				if (c.debug) {
 					time = new Date();
 				}
-				$tableHeaders = $(table).find(c.selectorHeaders)
-				.each(function(index) {
+				$tableHeaders = $(table).find(c.selectorHeaders).each(function(index) {
 					$t = $(this);
 					ch = c.headers[index];
-					this.innerHTML = '<div class="tablesorter-header-inner">' + this.innerHTML + '</div>'; // faster than wrapInner
+					t = c.cssIcon ? '<i class="' + c.cssIcon + '"></i>' : ''; // add icon if cssIcon option exists
+					this.innerHTML = '<div class="tablesorter-header-inner">' + this.innerHTML + t + '</div>'; // faster than wrapInner
 					if (c.onRenderHeader) { c.onRenderHeader.apply($t, [index]); }
 					this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
 					this.order = formatSortingOrder( ts.getData($t, ch, 'sortInitialOrder') || c.sortInitialOrder ) ? [1,0,2] : [0,1,2];
 					this.count = -1; // set to -1 because clicking on the header automatically adds one
-					if (ts.getData($t, ch, 'sorter') === 'false') { this.sortDisabled = true; }
+					if (ts.getData($t, ch, 'sorter') === 'false') {
+						this.sortDisabled = true;
+						$t.addClass('sorter-false');
+					} else {
+						$t.removeClass('sorter-false');
+					}
 					this.lockedOrder = false;
 					lock = ts.getData($t, ch, 'lockedOrder') || false;
 					if (typeof(lock) !== 'undefined' && lock !== false) {
 						this.order = this.lockedOrder = formatSortingOrder(lock) ? [1,1,1] : [0,0,0];
 					}
-					if (!this.sortDisabled) {
-						$th = $t.addClass(c.cssHeader);
-					}
+					$t.addClass( this.sortDisabled ? 'sorter-false' : c.cssHeader );
 					// add cell to headerList
 					c.headerList[index] = this;
 					// add to parent in case there are multiple rows
-					$t.parent().addClass(c.cssHeader);
+					$t.parent().addClass(c.cssHeaderRow);
 				});
 				if (table.config.debug) {
 					benchmark("Built headers:", time);
@@ -405,39 +383,30 @@
 				return $tableHeaders;
 			}
 
-			function isValueInArray(v, a) {
-				var i, l = a.length;
-				for (i = 0; i < l; i++) {
-					if (a[i][0] === v) {
-						return true;
-					}
-				}
-				return false;
-			}
-
-			function setHeadersCss(table, $headers, list) {
-				var f, h = [], i, j, l, css = [table.config.cssDesc, table.config.cssAsc];
+			function setHeadersCss(table, $headers) {
+				var f, i, j, l,
+					c = table.config,
+					list = c.sortList,
+					css = [c.cssDesc, c.cssAsc],
+					// find the footer
+					$t = $(table).find('tfoot tr').children().removeClass(css.join(' '));
 				// remove all header information
-				$headers
-					.removeClass(css.join(' '))
-					.each(function() {
-						if (!this.sortDisabled) {
-							h[this.column] = $(this);
-						}
-					});
+				$headers.removeClass(css.join(' '));
 				l = list.length;
 				for (i = 0; i < l; i++) {
-					if (list[i][1] === 2) { continue; } // direction = 2 means reset!
-					if (h[list[i][0]]) {
-						// add class if cell exists - fix for issue #78
-						h[list[i][0]].addClass(css[list[i][1]]);
-					}
-					// multicolumn sorting updating
-					f = $headers.filter('[data-column="' + list[i][0] + '"]');
-					if (l > 1 && f.length) {
-						for (j = 0; j < f.length; j++) {
-							if (!f[j].sortDisabled) {
-								$(f[j]).addClass(css[list[i][1]]);
+					// direction = 2 means reset!
+					if (list[i][1] !== 2) {
+						// multicolumn sorting updating - choose the :last in case there are nested columns
+						f = $headers.not('.sorter-false').filter('[data-column="' + list[i][0] + '"]' + (l === 1 ? ':last' : '') );
+						if (f.length) {
+							for (j = 0; j < f.length; j++) {
+								if (!f[j].sortDisabled) {
+									f.eq(j).addClass(css[list[i][1]]);
+									// add sorted class to footer, if it exists
+									if ($t.length) {
+										$t.filter('[data-column="' + list[i][0] + '"]').eq(j).addClass(css[list[i][1]]); 
+									}
+								}
 							}
 						}
 					}
@@ -445,35 +414,41 @@
 			}
 
 			function fixColumnWidth(table) {
-				if (table.config.widthFixed) {
-					var colgroup = $('<colgroup>');
+				if (table.config.widthFixed && $(table).find('colgroup').length === 0) {
+					var colgroup = $('<colgroup>'),
+						overallWidth = $(table).width();
 					$("tr:first td", table.tBodies[0]).each(function() {
-						colgroup.append($('<col>').css('width', $(this).width()));
+						colgroup.append($('<col>').css('width', parseInt(($(this).width()/overallWidth)*1000, 10)/10 + '%'));
 					});
 					$(table).prepend(colgroup);
 				}
 			}
 
-			function updateHeaderSortCount(table, sortList) {
-				var i, s, o, c = table.config,
-				l = sortList.length;
-				for (i = 0; i < l; i++) {
-					s = sortList[i];
+			function updateHeaderSortCount(table, list) {
+				var s, o, c = table.config,
+					l = c.headerList.length,
+					sl = list || c.sortList;
+				c.sortList = [];
+				$.each(sl, function(i,v){
+					// ensure all sortList values are numeric - fixes #127
+					s = [ parseInt(v[0], 10), parseInt(v[1], 10) ];
+					// make sure header exists
 					o = c.headerList[s[0]];
 					if (o) { // prevents error if sorton array is wrong
+						c.sortList.push(s);
 						o.count = s[1] % (c.sortReset ? 3 : 2);
 					}
-				}
+				});
 			}
 
 			function getCachedSortType(parsers, i) {
 				return (parsers && parsers[i]) ? parsers[i].type || '' : '';
 			}
 
-			/* sorting methods - reverted sorting method back to version 2.0.3 */
-			function multisort(table, sortList) {
+			// sort multiple columns
+			function multisort(table) {
 				var dynamicExp, sortWrapper, col, mx = 0, dir = 0, tc = table.config,
-				l = sortList.length, bl = table.tBodies.length,
+				sortList = tc.sortList, l = sortList.length, bl = table.tBodies.length,
 				sortTime, i, j, k, c, cache, lc, s, e, order, orgOrderCol;
 				if (tc.debug) { sortTime = new Date(); }
 				for (k = 0; k < bl; k++) {
@@ -514,48 +489,54 @@
 					dynamicExp += "}; ";
 					cache.normalized.sort(eval(dynamicExp)); // sort using eval expression
 				}
-				if (tc.debug) { benchmark("Sorting on " + sortList.toString() + " and dir " + order+ " time", sortTime); }
+				if (tc.debug) { benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time", sortTime); }
+			}
+
+			function resortComplete($table, callback){
+				$table.trigger('updateComplete');
+				if (typeof callback === "function") {
+					callback($table[0]);
+				}
 			}
 
 			function checkResort($table, flag, callback) {
-				var t = $table[0];
 				if (flag !== false) {
-					$table.trigger("sorton", [t.config.sortList, function(){
-						$table.trigger('updateComplete');
-						if (typeof callback === "function") {
-							callback(t);
-						}
+					$table.trigger("sorton", [$table[0].config.sortList, function(){
+						resortComplete($table, callback);
 					}]);
 				} else {
-					$table.trigger('updateComplete');
-					if (typeof callback === "function") {
-						callback(t);
-					}
+					resortComplete($table, callback);
 				}
 			}
 
 			/* public methods */
-			this.construct = function(settings) {
+			ts.construct = function(settings) {
 				return this.each(function() {
-					// if no thead or tbody quit.
-					if (!this.tHead || this.tBodies.length === 0) { return; }
+					// if no thead or tbody, or tablesorter is already present, quit
+					if (!this.tHead || this.tBodies.length === 0 || this.hasInitialized === true) { return; }
 					// declare
-					var $headers, $cell, $this,
-						c, i, j, k, a, s, o, downTime,
+					var $headers, $cell, $this = $(this),
+						c, i, j, k = '', a, s, o, downTime,
 						m = $.metadata;
+					// initialization flag
+					this.hasInitialized = false;
 					// new blank config object
 					this.config = {};
-					// merge and extend.
-					c = $.extend(true, this.config, $.tablesorter.defaults, settings);
-
-					if (c.debug) { $.data( this, 'startoveralltimer', new Date()); }
-					// store common expression for speed
-					$this = $(this).addClass(c.tableClass);
+					// merge and extend
+					c = $.extend(true, this.config, ts.defaults, settings);
 					// save the settings where they read
 					$.data(this, "tablesorter", c);
+					if (c.debug) { $.data( this, 'startoveralltimer', new Date()); }
+					// constants
 					c.supportsTextContent = $('<span>x</span>')[0].textContent === 'x';
+					c.supportsDataObject = parseFloat($.fn.jquery) >= 1.4;
 					// digit sort text location; keeping max+/- for backwards compatibility
 					c.string = { 'max': 1, 'min': -1, 'max+': 1, 'max-': -1, 'zero': 0, 'none': 0, 'null': 0, 'top': true, 'bottom': false };
+					// add table theme class only if there isn't already one there
+					if (!/tablesorter\-/.test($this.attr('class'))) {
+						k = (c.theme !== '' ? ' tablesorter-' + c.theme : '');
+					}
+					$this.addClass(c.tableClass + k);
 					// build headers
 					$headers = buildHeaders(this);
 					// try to auto detect column type, and store in tables config
@@ -563,29 +544,36 @@
 					// build the cache for the tbody cells
 					// delayInit will delay building the cache until the user starts a sort
 					if (!c.delayInit) { buildCache(this); }
-					// fixate columns if the users supplies the fixedWidth option
-					fixColumnWidth(this);
 					// apply event handling to headers
 					// this is to big, perhaps break it out?
-					$headers.bind('mousedown.tablesorter mouseup.tablesorter', function(e, external) {
+					$headers
+					// http://stackoverflow.com/questions/5312849/jquery-find-self
+					.find('*').andSelf().filter(c.selectorSort)
+					.unbind('mousedown.tablesorter mouseup.tablesorter')
+					.bind('mousedown.tablesorter mouseup.tablesorter', function(e, external) {
+						// jQuery v1.2.6 doesn't have closest()
+						var $cell = this.tagName.match('TH|TD') ? $(this) : $(this).parents('th, td').filter(':last'), cell = $cell[0];
+						// only recognize left clicks
+						if ((e.which || e.button) !== 1) { return false; }
+						// set timer on mousedown
 						if (e.type === 'mousedown') {
 							downTime = new Date().getTime();
-							return !c.cancelSelection;
+							return e.target.tagName === "INPUT" ? '' : !c.cancelSelection;
 						}
-						// prevent resizable widget from initializing a sort (long clicks are ignored)
-						if (external !== true && (new Date().getTime() - downTime > 500)) { return false; }
+						// ignore long clicks (prevents resizable widget from initializing a sort)
+						if (external !== true && (new Date().getTime() - downTime > 250)) { return false; }
 						if (c.delayInit && !c.cache) { buildCache($this[0]); }
-						if (!this.sortDisabled) {
-							// Only call sortStart if sorting is enabled.
+						if (!cell.sortDisabled) {
+							// Only call sortStart if sorting is enabled
 							$this.trigger("sortStart", $this[0]);
 							// store exp, for speed
-							$cell = $(this);
+							// $cell = $(this);
 							k = !e[c.sortMultiSortKey];
 							// get current column sort order
-							this.count = (this.count + 1) % (c.sortReset ? 3 : 2);
+							cell.count = (cell.count + 1) % (c.sortReset ? 3 : 2);
 							// reset all sorts on non-current column - issue #30
 							if (c.sortRestart) {
-								i = this;
+								i = cell;
 								$headers.each(function() {
 									// only reset counts on columns that weren't just clicked on and if not included in a multisort
 									if (this !== i && (k || !$(this).is('.' + c.cssDesc + ',.' + c.cssAsc))) {
@@ -594,7 +582,7 @@
 								});
 							}
 							// get current column index
-							i = this.column;
+							i = cell.column;
 							// user only wants to sort on one column
 							if (k) {
 								// flush the sort list
@@ -608,21 +596,27 @@
 									}
 								}
 								// add column to sort list
-								o = this.order[this.count];
+								o = cell.order[cell.count];
 								if (o < 2) {
 									c.sortList.push([i, o]);
 									// add other columns if header spans across multiple
-									if (this.colSpan > 1) {
-										for (j = 1; j < this.colSpan; j++) {
+									if (cell.colSpan > 1) {
+										for (j = 1; j < cell.colSpan; j++) {
 											c.sortList.push([i + j, o]);
 										}
 									}
 								}
 								// multi column sorting
 							} else {
-								// the user has clicked on an already sorted column.
-								if (isValueInArray(i, c.sortList)) {
-									// reverse the sorting direction for all tables.
+								// get rid of the sortAppend before adding more - fixes issue #115
+								if (c.sortAppend && c.sortList.length > 1) {
+									if (ts.isValueInArray(c.sortAppend[0][0], c.sortList)) {
+										c.sortList.pop();
+									}
+								}
+								// the user has clicked on an already sorted column
+								if (ts.isValueInArray(i, c.sortList)) {
+									// reverse the sorting direction for all tables
 									for (j = 0; j < c.sortList.length; j++) {
 										s = c.sortList[j];
 										o = c.headerList[s[0]];
@@ -636,12 +630,12 @@
 									}
 								} else {
 									// add column to sort list array
-									o = this.order[this.count];
+									o = cell.order[cell.count];
 									if (o < 2) {
 										c.sortList.push([i, o]);
 										// add other columns if header spans across multiple
-										if (this.colSpan > 1) {
-											for (j = 1; j < this.colSpan; j++) {
+										if (cell.colSpan > 1) {
+											for (j = 1; j < cell.colSpan; j++) {
 												c.sortList.push([i + j, o]);
 											}
 										}
@@ -658,10 +652,13 @@
 							}
 							// sortBegin event triggered immediately before the sort
 							$this.trigger("sortBegin", $this[0]);
-							// set css for headers
-							setHeadersCss($this[0], $headers, c.sortList);
-							multisort($this[0], c.sortList);
-							appendToTable($this[0]);
+							// setTimeout needed so the processing icon shows up
+							setTimeout(function(){
+								// set css for headers
+								setHeadersCss($this[0], $headers);
+								multisort($this[0]);
+								appendToTable($this[0]);
+							}, 1);
 						}
 					});
 					if (c.cancelSelection) {
@@ -674,24 +671,33 @@
 					}
 					// apply easy methods that trigger binded events
 					$this
+					.unbind('update updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave')
 					.bind("update", function(e, resort, callback) {
 						// remove rows/elements before update
 						$(c.selectorRemove, this).remove();
-						// rebuild parsers.
+						// rebuild parsers
 						c.parsers = buildParserCache(this, $headers);
 						// rebuild the cache map
 						buildCache(this);
 						checkResort($this, resort, callback);
 					})
 					.bind("updateCell", function(e, cell, resort, callback) {
-						// get position from the dom.
-						var t = this, $tb = $(this).find('tbody'), row, pos,
+						// get position from the dom
+						var l, row, icell,
+						t = this, $tb = $(this).find('tbody'),
 						// update cache - format: function(s, table, cell, cellIndex)
-						tbdy = $tb.index( $(cell).closest('tbody') );
-						row = $tb.eq(tbdy).find('tr').index( $(cell).closest('tr') );
-						pos = [ row, cell.cellIndex];
-						t.config.cache[tbdy].normalized[pos[0]][pos[1]] = c.parsers[pos[1]].format( getElementText(t, cell, pos[1]), t, cell, pos[1] );
-						checkResort($this, resort, callback);
+						// no closest in jQuery v1.2.6 - tbdy = $tb.index( $(cell).closest('tbody') ),$row = $(cell).closest('tr');
+						tbdy = $tb.index( $(cell).parents('tbody').filter(':last') ),
+						$row = $(cell).parents('tr').filter(':last');
+						// tbody may not exist if update is initialized while tbody is removed for processing
+						if ($tb.length && tbdy >= 0) {
+							row = $tb.eq(tbdy).find('tr').index( $row );
+							icell = cell.cellIndex;
+							l = t.config.cache[tbdy].normalized[row].length - 1;
+							t.config.cache[tbdy].row[t.config.cache[tbdy].normalized[row][l]] = $row;
+							t.config.cache[tbdy].normalized[row][icell] = c.parsers[icell].format( getElementText(t, cell, icell), t, cell, icell );
+							checkResort($this, resort, callback);
+						}
 					})
 					.bind("addRows", function(e, $row, resort, callback) {
 						var i, rows = $row.filter('tr').length,
@@ -715,68 +721,158 @@
 					})
 					.bind("sorton", function(e, list, callback, init) {
 						$(this).trigger("sortStart", this);
-						var l = c.headerList.length;
-						c.sortList = [];
-						$.each(list, function(i,v){
-							// make sure column exists
-							if (v[0] < l) { c.sortList.push(list[i]); }
-						});
 						// update header count index
-						updateHeaderSortCount(this, c.sortList);
+						updateHeaderSortCount(this, list);
 						// set css for headers
-						setHeadersCss(this, $headers, c.sortList);
+						setHeadersCss(this, $headers);
 						// sort the table and append it to the dom
-						multisort(this, c.sortList);
+						multisort(this);
 						appendToTable(this, init);
 						if (typeof callback === "function") {
 							callback(this);
 						}
 					})
-					.bind("appendCache", function(e, init) {
+					.bind("appendCache", function(e, callback, init) {
 						appendToTable(this, init);
+						if (typeof callback === "function") {
+							callback(this);
+						}
 					})
 					.bind("applyWidgetId", function(e, id) {
-						getWidgetById(id).format(this);
+						ts.getWidgetById(id).format(this, c, c.widgetOptions);
 					})
 					.bind("applyWidgets", function(e, init) {
 						// apply widgets
-						applyWidget(this, init);
+						ts.applyWidget(this, init);
 					})
-					.bind("destroy", function(e,c){
-						$.tablesorter.destroy(this, c);
+					.bind("refreshWidgets", function(e, all, dontapply){
+						ts.refreshWidgets(this, all, dontapply);
+					})
+					.bind("destroy", function(e, c, cb){
+						ts.destroy(this, c, cb);
 					});
 
 					// get sort list from jQuery data or metadata
-					if ($this.data() && typeof $this.data().sortlist !== 'undefined') {
+					// in jQuery < 1.4, an error occurs when calling $this.data()
+					if (c.supportsDataObject && typeof $this.data().sortlist !== 'undefined') {
 						c.sortList = $this.data().sortlist;
 					} else if (m && ($this.metadata() && $this.metadata().sortlist)) {
 						c.sortList = $this.metadata().sortlist;
 					}
 					// apply widget init code
-					applyWidget(this, true);
-					// if user has supplied a sort list to constructor.
+					ts.applyWidget(this, true);
+					// if user has supplied a sort list to constructor
 					if (c.sortList.length > 0) {
 						$this.trigger("sorton", [c.sortList, {}, !c.initWidgets]);
 					} else if (c.initWidgets) {
 						// apply widget format
-						applyWidget(this);
+						ts.applyWidget(this);
+					}
+
+					// fixate columns if the users supplies the fixedWidth option
+					// do this after theme has been applied
+					fixColumnWidth(this);
+
+					// show processesing icon
+					if (c.showProcessing) {
+						$this
+						.unbind('sortBegin sortEnd')
+						.bind('sortBegin sortEnd', function(e) {
+							ts.isProcessing($this[0], e.type === 'sortBegin');
+						});
 					}
 
 					// initialized
 					this.hasInitialized = true;
 					if (c.debug) {
-						$.tablesorter.benchmark("Overall initialization time", $.data( this, 'startoveralltimer'));
+						ts.benchmark("Overall initialization time", $.data( this, 'startoveralltimer'));
 					}
 					$this.trigger('tablesorter-initialized', this);
 					if (typeof c.initialized === 'function') { c.initialized(this); }
 				});
 			};
 
+			// *** Process table ***
+			// add processing indicator
+			ts.isProcessing = function(table, toggle, $ths) {
+				var c = table.config,
+					// default to all headers
+					$h = $ths || $(table).find('.' + c.cssHeader);
+				if (toggle) {
+					if (c.sortList.length > 0) {
+						// get headers from the sortList
+						$h = $h.filter(function(){
+							// get data-column from attr to keep  compatibility with jQuery 1.2.6
+							return this.sortDisabled ? false : ts.isValueInArray( parseFloat($(this).attr('data-column')), c.sortList);
+						});
+					}
+					$h.addClass(c.cssProcessing);
+				} else {
+					$h.removeClass(c.cssProcessing);
+				}
+			};
+
+			// detach tbody but save the position
+			// don't use tbody because there are portions that look for a tbody index (updateCell)
+			ts.processTbody = function(table, $tb, getIt){
+				var t, holdr;
+				if (getIt) {
+					$tb.before('<span class="tablesorter-savemyplace"/>');
+					holdr = ($.fn.detach) ? $tb.detach() : $tb.remove();
+					return holdr;
+				}
+				holdr = $(table).find('span.tablesorter-savemyplace');
+				$tb.insertAfter( holdr );
+				holdr.remove();
+			};
+
+			ts.clearTableBody = function(table) {
+				$(table.tBodies).filter(':not(.' + table.config.cssInfoBlock + ')').empty();
+			};
+
+			ts.destroy = function(table, removeClasses, callback){
+				var $t = $(table), c = table.config,
+				$h = $t.find('thead:first');
+				// clear flag in case the plugin is initialized again
+				table.hasInitialized = false;
+				// remove widget added rows
+				$h.find('tr:not(.' + c.cssHeaderRow + ')').remove();
+				// remove resizer widget stuff
+				$h.find('.tablesorter-resizer').remove();
+				// remove all widgets
+				ts.refreshWidgets(table, true, true);
+				// disable tablesorter
+				$t
+					.removeData('tablesorter')
+					.unbind('update updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave')
+					.find('.' + c.cssHeader)
+					.unbind('click mousedown mousemove mouseup')
+					.removeClass(c.cssHeader + ' ' + c.cssAsc + ' ' + c.cssDesc)
+					.find('.tablesorter-header-inner').each(function(){
+						if (c.cssIcon !== '') { $(this).find('.' + c.cssIcon).remove(); }
+						$(this).replaceWith( $(this).contents() );
+					});
+				if (removeClasses !== false) {
+					$t.removeClass(c.tableClass);
+				}
+				if (typeof callback === 'function') {
+					callback(table);
+				}
+			};
+
+			// *** sort functions ***
+			// regex used in natural sort
+			ts.regex = [
+				/(^-?[0-9]+(\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi, // chunk/tokenize numbers & letters
+				/(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/, //date
+				/^0x[0-9a-f]+$/i // hex
+			];
+
 			// Natural sort - https://github.com/overset/javascript-natural-sort
-			this.sortText = function(table, a, b, col) {
+			ts.sortText = function(table, a, b, col) {
 				if (a === b) { return 0; }
 				var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ],
-					r = $.tablesorter.regex, xN, xD, yN, yD, xF, yF, i, mx;
+					r = ts.regex, xN, xD, yN, yD, xF, yF, i, mx;
 				if (a === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? -1 : 1) : -e || -1; }
 				if (b === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? 1 : -1) : e || 1; }
 				if (typeof c.textSorter === 'function') { return c.textSorter(a, b, table, col); }
@@ -794,9 +890,9 @@
 				mx = Math.max(xN.length, yN.length);
 				// natural sorting through split numeric strings and default strings
 				for (i = 0; i < mx; i++) {
-					// find floats not starting with '0', string or 0 if not defined (Clint Priest)
-					xF = (!(xN[i] || '').match(r[3]) && parseFloat(xN[i])) || xN[i] || 0;
-					yF = (!(yN[i] || '').match(r[3]) && parseFloat(yN[i])) || yN[i] || 0;
+					// find floats not starting with '0', string or 0 if not defined
+					xF = isNaN(xN[i]) ? xN[i] || 0 : parseFloat(xN[i]) || 0;
+					yF = isNaN(yN[i]) ? yN[i] || 0 : parseFloat(yN[i]) || 0;
 					// handle numeric vs string comparison - number < string - (Kyle Adams)
 					if (isNaN(xF) !== isNaN(yF)) { return (isNaN(xF)) ? 1 : -1; }
 					// rely on string comparison if different types - i.e. '02' < 2 != '02' < '2'
@@ -810,19 +906,19 @@
 				return 0;
 			};
 
-			this.sortTextDesc = function(table, a, b, col) {
+			ts.sortTextDesc = function(table, a, b, col) {
 				if (a === b) { return 0; }
 				var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ];
 				if (a === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? -1 : 1) : e || 1; }
 				if (b === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? 1 : -1) : -e || -1; }
 				if (typeof c.textSorter === 'function') { return c.textSorter(b, a, table, col); }
-				return this.sortText(table, b, a);
+				return ts.sortText(table, b, a);
 			};
 
 			// return text string value by adding up ascii value
 			// so the text is somewhat sorted when using a digital sort
 			// this is NOT an alphanumeric sort
-			this.getTextValue = function(a, mx, d) {
+			ts.getTextValue = function(a, mx, d) {
 				if (mx) {
 					// make sure the text value is greater than the max numerical value (mx)
 					var i, l = a.length, n = mx + d;
@@ -834,89 +930,28 @@
 				return 0;
 			};
 
-			this.sortNumeric = function(table, a, b, col, mx, d) {
+			ts.sortNumeric = function(table, a, b, col, mx, d) {
 				if (a === b) { return 0; }
 				var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ];
 				if (a === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? -1 : 1) : -e || -1; }
 				if (b === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? 1 : -1) : e || 1; }
-				if (isNaN(a)) { a = this.getTextValue(a, mx, d); }
-				if (isNaN(b)) { b = this.getTextValue(b, mx, d); }
+				if (isNaN(a)) { a = ts.getTextValue(a, mx, d); }
+				if (isNaN(b)) { b = ts.getTextValue(b, mx, d); }
 				return a - b;
 			};
 
-			this.sortNumericDesc = function(table, a, b, col, mx, d) {
+			ts.sortNumericDesc = function(table, a, b, col, mx, d) {
 				if (a === b) { return 0; }
 				var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ];
 				if (a === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? -1 : 1) : e || 1; }
 				if (b === '' && e !== 0) { return (typeof(e) === 'boolean') ? (e ? 1 : -1) : -e || -1; }
-				if (isNaN(a)) { a = this.getTextValue(a, mx, d); }
-				if (isNaN(b)) { b = this.getTextValue(b, mx, d); }
+				if (isNaN(a)) { a = ts.getTextValue(a, mx, d); }
+				if (isNaN(b)) { b = ts.getTextValue(b, mx, d); }
 				return b - a;
 			};
 
-			this.destroy = function(table, removeClasses){
-				var $t = $(table), c = table.config;
-				// remove widget added rows
-				$t.find('thead:first tr:not(.' + c.cssHeader + ')').remove();
-				// remove resizer widget stuff
-				$t.find('thead:first .tablesorter-resizer').remove();
-				// disable tablesorter
-				$t
-					.unbind('update updateCell addRows sorton appendCache applyWidgetId applyWidgets destroy mouseup mouseleave')
-					.find(c.selectorHeaders)
-					.unbind('click mousedown mousemove mouseup')
-					.removeClass(c.cssHeader + ' ' + c.cssAsc + ' ' + c.cssDesc);
-				if (removeClasses !== false) {
-					$t.removeClass(c.tableClass);
-				}
-			};
-
-			this.addParser = function(parser) {
-				var i, l = parsers.length, a = true;
-				for (i = 0; i < l; i++) {
-					if (parsers[i].id.toLowerCase() === parser.id.toLowerCase()) {
-						a = false;
-					}
-				}
-				if (a) {
-					parsers.push(parser);
-				}
-			};
-			this.addWidget = function(widget) {
-				widgets.push(widget);
-			};
-
-			this.formatFloat = function(s, table) {
-				if (typeof(s) !== 'string' || s === '') { return s; }
-				if (table.config.usNumberFormat !== false) {
-					// US Format - 1,234,567.89 -> 1234567.89
-					s = s.replace(/,/g,'');
-				} else {
-					// German Format = 1.234.567,89 -> 1234567.89
-					// French Format = 1 234 567,89 -> 1234567.89
-					s = s.replace(/[\s|\.]/g,'').replace(/,/g,'.');
-				}
-				if(/^\s*\([.\d]+\)/.test(s)) {
-					s = s.replace(/^\s*\(/,'-').replace(/\)/,'');
-				}
-				var i = parseFloat(s);
-				// return the text instead of zero
-				return isNaN(i) ? $.trim(s) : i;
-			};
-			this.isDigit = function(s) {
-				// replace all unwanted chars and match.
-				return (/^[\-+(]?\d+[)]?$/).test(s.replace(/[,.'\s]/g, ''));
-			};
-
-			// regex used in natural sort
-			this.regex = [
-				/(^-?[0-9]+(\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi, // chunk/tokenize numbers & letters
-				/(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/, //date
-				/^0x[0-9a-f]+$/i, // hex
-				/^0/ // leading zeros
-			];
 			// used when replacing accented characters during sorting
-			this.characterEquivalents = {
+			ts.characterEquivalents = {
 				"a" : "\u00e1\u00e0\u00e2\u00e3\u00e4", // áàâãä
 				"A" : "\u00c1\u00c0\u00c2\u00c3\u00c4", // ÁÀÂÃÄ
 				"c" : "\u00e7", // ç
@@ -931,37 +966,130 @@
 				"u" : "\u00fa\u00f9\u00fb\u00fc", // úùûü
 				"U" : "\u00da\u00d9\u00db\u00dc" // ÚÙÛÜ
 			};
-			this.replaceAccents = function(s) {
-				var a, acc = '[', eq = this.characterEquivalents;
-				if (!this.characterRegex) {
-					this.characterRegexArray = {};
+			ts.replaceAccents = function(s) {
+				var a, acc = '[', eq = ts.characterEquivalents;
+				if (!ts.characterRegex) {
+					ts.characterRegexArray = {};
 					for (a in eq) {
 						if (typeof a === 'string') {
 							acc += eq[a];
-							this.characterRegexArray[a] = new RegExp('[' + eq[a] + ']', 'g');
+							ts.characterRegexArray[a] = new RegExp('[' + eq[a] + ']', 'g');
 						}
 					}
-					this.characterRegex = new RegExp(acc + ']');
+					ts.characterRegex = new RegExp(acc + ']');
 				}
-				if (this.characterRegex.test(s)) {
+				if (ts.characterRegex.test(s)) {
 					for (a in eq) {
 						if (typeof a === 'string') {
-							s = s.replace( this.characterRegexArray[a], a );
+							s = s.replace( ts.characterRegexArray[a], a );
 						}
 					}
 				}
 				return s;
 			};
 
+			// *** utilities ***
+			ts.isValueInArray = function(v, a) {
+				var i, l = a.length;
+				for (i = 0; i < l; i++) {
+					if (a[i][0] === v) {
+						return true;
+					}
+				}
+				return false;
+			};
+
+			ts.addParser = function(parser) {
+				var i, l = ts.parsers.length, a = true;
+				for (i = 0; i < l; i++) {
+					if (ts.parsers[i].id.toLowerCase() === parser.id.toLowerCase()) {
+						a = false;
+					}
+				}
+				if (a) {
+					ts.parsers.push(parser);
+				}
+			};
+
+			ts.getParserById = function(name) {
+				var i, l = ts.parsers.length;
+				for (i = 0; i < l; i++) {
+					if (ts.parsers[i].id.toLowerCase() === (name.toString()).toLowerCase()) {
+						return ts.parsers[i];
+					}
+				}
+				return false;
+			};
+
+			ts.addWidget = function(widget) {
+				ts.widgets.push(widget);
+			};
+
+			ts.getWidgetById = function(name) {
+				var i, w, l = ts.widgets.length;
+				for (i = 0; i < l; i++) {
+					w = ts.widgets[i];
+					if (w && w.hasOwnProperty('id') && w.id.toLowerCase() === name.toLowerCase()) {
+						return w;
+					}
+				}
+			};
+
+			ts.applyWidget = function(table, init) {
+				var c = table.config,
+					wo = c.widgetOptions,
+					ws = c.widgets.sort().reverse(), // ensure that widgets are always applied in a certain order
+					time, i, w, l = ws.length;
+				// make zebra last
+				i = $.inArray('zebra', c.widgets);
+				if (i >= 0) {
+					c.widgets.splice(i,1);
+					c.widgets.push('zebra');
+				}
+				if (c.debug) {
+					time = new Date();
+				}
+				// add selected widgets
+				for (i = 0; i < l; i++) {
+					w = ts.getWidgetById(ws[i]);
+					if ( w ) {
+						if (init === true && w.hasOwnProperty('init')) {
+							w.init(table, w, c, wo);
+						} else if (!init && w.hasOwnProperty('format')) {
+							w.format(table, c, wo);
+						}
+					}
+				}
+				if (c.debug) {
+					benchmark("Completed " + (init === true ? "initializing" : "applying") + " widgets", time);
+				}
+			};
+
+			ts.refreshWidgets = function(table, doAll, dontapply) {
+				var i, c = table.config,
+					cw = c.widgets,
+					w = ts.widgets, l = w.length;
+				// remove previous widgets
+				for (i = 0; i < l; i++){
+					if ( w[i] && w[i].id && (doAll || $.inArray( w[i].id, cw ) < 0) ) {
+						if (c.debug) { log( 'removing ' + w[i].id  ); }
+						if (w[i].hasOwnProperty('remove')) { w[i].remove(table, c, c.widgetOptions); }
+					}
+				}
+				if (dontapply !== true) {
+					ts.applyWidget(table, doAll);
+				}
+			};
+
 			// get sorter, string, empty, etc options for each column from
 			// jQuery data, metadata, header option or header class name ("sorter-false")
 			// priority = jQuery data > meta > headers option > header class name
-			this.getData = function(h, ch, key) {
+			ts.getData = function(h, ch, key) {
 				var val = '', $h = $(h), m, cl;
 				if (!$h.length) { return ''; }
 				m = $.metadata ? $h.metadata() : false;
 				cl = ' ' + ($h.attr('class') || '');
-				if ($h.data() && ( typeof $h.data(key) !== 'undefined' || typeof $h.data(key.toLowerCase()) !== 'undefined') ){
+				if (typeof $h.data(key) !== 'undefined' || typeof $h.data(key.toLowerCase()) !== 'undefined'){
 					// "data-lockedOrder" is assigned to "lockedorder"; but "data-locked-order" is assigned to "lockedOrder"
 					// "data-sort-initial-order" is assigned to "sortInitialOrder"
 					val += $h.data(key) || $h.data(key.toLowerCase());
@@ -969,19 +1097,39 @@
 					val += m[key];
 				} else if (ch && typeof ch[key] !== 'undefined') {
 					val += ch[key];
-				} else if (cl && cl.match(' ' + key + '-')) {
+				} else if (cl !== ' ' && cl.match(' ' + key + '-')) {
 					// include sorter class name "sorter-text", etc
 					val = cl.match( new RegExp(' ' + key + '-(\\w+)') )[1] || '';
 				}
 				return $.trim(val);
 			};
 
-			this.clearTableBody = function(table) {
-				$(table.tBodies).filter(':not(.' + table.config.cssInfoBlock + ')').empty();
+			ts.formatFloat = function(s, table) {
+				if (typeof(s) !== 'string' || s === '') { return s; }
+				if (table.config.usNumberFormat !== false) {
+					// US Format - 1,234,567.89 -> 1234567.89
+					s = s.replace(/,/g,'');
+				} else {
+					// German Format = 1.234.567,89 -> 1234567.89
+					// French Format = 1 234 567,89 -> 1234567.89
+					s = s.replace(/[\s|\.]/g,'').replace(/,/g,'.');
+				}
+				if(/^\s*\([.\d]+\)/.test(s)) {
+					// make (#) into a negative number -> (10) = -10
+					s = s.replace(/^\s*\(/,'-').replace(/\)/,'');
+				}
+				var i = parseFloat(s);
+				// return the text instead of zero
+				return isNaN(i) ? $.trim(s) : i;
 			};
 
-		}
-	})();
+			ts.isDigit = function(s) {
+				// replace all unwanted chars and match
+				return isNaN(s) ? (/^[\-+(]?\d+[)]?$/).test(s.toString().replace(/[,.'\s]/g, '')) : true;
+			};
+
+		}()
+	});
 
 	// make shortcut
 	var ts = $.tablesorter;
@@ -1069,10 +1217,10 @@
 	ts.addParser({
 		id: "usLongDate",
 		is: function(s) {
-			return s.match(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/);
+			return (/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4}|'?\d{2})\s+(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i).test(s);
 		},
 		format: function(s, table) {
-			return ts.formatFloat( (new Date(s).getTime() || ''), table);
+			return ts.formatFloat( (new Date(s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ''), table);
 		},
 		type: "numeric"
 	});
@@ -1106,10 +1254,10 @@
 	ts.addParser({
 		id: "time",
 		is: function(s) {
-			return (/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/).test(s);
+			return (/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i).test(s);
 		},
 		format: function(s, table) {
-			return ts.formatFloat( (new Date("2000/01/01 " + s).getTime() || ''), table);
+			return ts.formatFloat( (new Date("2000/01/01 " + s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ""), table);
 		},
 		type: "numeric"
 	});
@@ -1141,15 +1289,10 @@
 	// add default widgets
 	ts.addWidget({
 		id: "zebra",
-		format: function(table) {
+		format: function(table, c, wo) {
 			var $tb, $tv, $tr, row, even, time, k, l,
-			c = table.config,
 			child = new RegExp(c.cssChildRow, 'i'),
-			b = $(table).children('tbody:not(.' + c.cssInfoBlock + ')'),
-			css = [ "even", "odd" ];
-			// maintain backwards compatibility
-			css = c.widgetZebra && c.hasOwnProperty('css') ? c.widgetZebra.css :
-				(c.widgetOptions && c.widgetOptions.hasOwnProperty('zebra')) ? c.widgetOptions.zebra : css;
+			b = $(table).children('tbody:not(.' + c.cssInfoBlock + ')');
 			if (c.debug) {
 				time = new Date();
 			}
@@ -1159,22 +1302,30 @@
 				l = $tb.children('tr').length;
 				if (l > 1) {
 					row = 0;
-					$tv = $tb.find('tr:visible');
-					$tb.addClass('tablesorter-hidden');
+					$tv = $tb.children('tr:visible');
 					// revered back to using jQuery each - strangely it's the fastest method
 					$tv.each(function(){
 						$tr = $(this);
 						// style children rows the same way the parent row was styled
 						if (!child.test(this.className)) { row++; }
 						even = (row % 2 === 0);
-						$tr.removeClass(css[even ? 1 : 0]).addClass(css[even ? 0 : 1]);
+						$tr.removeClass(wo.zebra[even ? 1 : 0]).addClass(wo.zebra[even ? 0 : 1]);
 					});
-					$tb.removeClass('tablesorter-hidden');
 				}
 			}
 			if (c.debug) {
 				ts.benchmark("Applying Zebra widget", time);
 			}
+		},
+		remove: function(table, c, wo){
+			var k, $tb,
+				b = $(table).children('tbody:not(.' + c.cssInfoBlock + ')'),
+				rmv = (c.widgetOptions.zebra || [ "even", "odd" ]).join(' ');
+			for (k = 0; k < b.length; k++ ){
+				$tb = $.tablesorter.processTbody(table, $(b[k]), true); // remove tbody
+				$tb.children().removeClass(rmv);
+				$.tablesorter.processTbody(table, $tb, false); // restore tbody
+			}
 		}
 	});