jquery-tablesorter 1.10.10 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1591f84710f85ceb7162d750a39df47356371b14
-  data.tar.gz: 1be6e92aa78bf994599a91a5c8ce4107442800fd
+  metadata.gz: 618934fed3abb717299bc8c54013a3b1d3d53863
+  data.tar.gz: afbd307142ac50a3577cee070ae22a9f8b1a2bea
 SHA512:
-  metadata.gz: 6f844b8b9ea9af7ccdc7389b55e69ed24f727a7c565355de3a9212552400a1327498fd82466ca3deb5c537a3beee49d931833c8a31724a3bb2b23078901d9181
-  data.tar.gz: 8eb94e20072ac16362d837190fd8407c50d17b290db3b46ea037549aab87e338ba1836068ac24279622250e372d030f5c2a075d33b973d496ebb8e17dc7d9fd8
+  metadata.gz: b5fd391890c8feef67fba3c66f00f9e9f1f45d2bc1bc78fad870fa2db6d10c54ce0b68269ce4afcb8c04fb5d5b0b402d9c086add0085b53d94ec4905570cb758
+  data.tar.gz: e29cceab65caa5c1a248d1b90ae61cdc46364dbadb9be1ae68e01097fe34428b8f4e462928452b98f1f659b41c7a472aa90df1defffcba228d237ae356cf2503

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.15.14 (4/10/2014), [documentation]
+Current tablesorter version: 2.16.1 (4/24/2014), [documentation]
 
 Any issue associate with the js/css files, please report to [Mottie's fork].
 

data/lib/jquery-tablesorter/version.rb

@@ -1,3 +1,3 @@
 module JqueryTablesorter
-  VERSION = '1.10.10'
+  VERSION = '1.11.0'
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 4/10/2014 (v2.15.14)
+ * updated 4/23/2014 (v2.16.0)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -58,6 +58,10 @@
 			// starting page of the pager (zero based index)
 			page: 0,
 
+		// reset pager after filtering; set to desired page #
+		// set to false to not change page at filter start
+			pageReset: 0,
+
 			// Number of visible rows
 			size: 10,
 
@@ -125,15 +129,23 @@
 		},
 
 		updatePageDisplay = function(table, p, completed) {
-			var i, pg, s, out,
+			var i, pg, s, out, regex,
 				c = table.config,
 				f = c.$table.hasClass('hasFilters') && !p.ajaxUrl,
-				t = (c.widgetOptions && c.widgetOptions.filter_filteredRow || 'filtered') + ',' + c.selectorRemove +
-					(p.countChildRows ? '' : ',.' + c.cssChildRow),
+				t = [],
 				sz = p.size || 10; // don't allow dividing by zero
+			t = [ (c.widgetOptions && c.widgetOptions.filter_filteredRow || 'filtered'), c.selectorRemove ];
+			if (p.countChildRows) { t.push(c.cssChildRow); }
+			regex = new RegExp( '(' + t.join('|') + ')' );
 			p.totalPages = Math.ceil( p.totalRows / sz ); // needed for "pageSize" method
-			p.filteredRows = (f) ? c.$tbodies.eq(0).children('tr').not('.' + t ).length : p.totalRows;
-			p.filteredPages = (f) ? Math.ceil( p.filteredRows / sz ) || 1 : p.totalPages;
+			p.filteredRows = (f) ? 0 : p.totalRows;
+			p.filteredPages = p.totalPages;
+			if (f) {
+				$.each(c.cache[0].normalized, function(i, el) {
+					p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
+				});
+				p.filteredPages = Math.ceil( p.filteredRows / sz ) || 0;
+			}
 			if ( Math.min( p.totalPages, p.filteredPages ) >= 0 ) {
 				t = (p.size * p.page > p.filteredRows);
 				p.startRow = (t) ? 1 : (p.filteredRows === 0 ? 0 : p.size * p.page + 1);
@@ -448,12 +460,13 @@
 		},
 
 		renderTable = function(table, rows, p) {
-			var i, $tb,
+			var $tb, index, count, added,
 				$t = $(table),
 				c = table.config,
+				f = c.$table.hasClass('hasFilters'),
 				l = rows && rows.length || 0, // rows may be undefined
 				s = ( p.page * p.size ),
-				e = ( s + p.size );
+				e = p.size;
 			if ( l < 1 ) { return; } // empty table, abort!
 			if ( p.page >= p.totalPages ) {
 				// lets not render the table more than once
@@ -465,18 +478,25 @@
 			if ( !p.removeRows ) {
 				hideRows(table, p);
 			} else {
-				if ( e > rows.length ) {
-					e = rows.length;
-				}
 				ts.clearTableBody(table);
 				$tb = ts.processTbody(table, c.$tbodies.eq(0), true);
-				for ( i = s; i < e; i++ ) {
-					$tb.append(rows[i]);
+				// not filtered, start from the calculated starting point (s)
+				// if filtered, start from zero
+				index = f ? 0 : s;
+				count = f ? 0 : s;
+				added = 0; 
+				while (added < e && index < rows.length) {
+					if (!f || !/filtered/.test(rows[index][0].className)){
+						count++;
+						if (count > s && added <= e) {
+							added++;
+							$tb.append(rows[index]);
+						}
+					}
+					index++;
 				}
-				
 				ts.processTbody(table, $tb, false);
 			}
-
 			updatePageDisplay(table, p);
 			if ( !p.isDisabled ) { fixHeight(table, p); }
 			$t.trigger('applyWidgets');
@@ -594,6 +614,7 @@
 			p.$container.hide(); // hide pager
 			table.config.appender = null; // remove pager appender function
 			p.initialized = false;
+			delete table.config.rowsCopy;
 			$(table).unbind('destroy.pager sortEnd.pager filterEnd.pager enable.pager disable.pager');
 			if (ts.storage) {
 				ts.storage(table, p.storageKey, '');
@@ -647,7 +668,8 @@
 				var t, ctrls, fxn,
 					table = this,
 					c = table.config,
-					p = c.pager = $.extend( {}, $.tablesorterPager.defaults, settings ),
+					wo = c.widgetOptions,
+					p = c.pager = $.extend( true, {}, $.tablesorterPager.defaults, settings ),
 					$t = c.$table,
 					// added in case the pager is reinitialized after being destroyed.
 					pager = p.$container = $(p.container).addClass('tablesorter-pager').show();
@@ -669,17 +691,24 @@
 					$.data(table, 'pagerLastSize', p.size);
 				}
 
+				// skipped rows
+				p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.substring(1) + '|' + c.cssChildRow + ')');
+
 				$t
 					.unbind('filterStart filterEnd sortEnd disable enable destroy update updateRows updateAll addRows pageSize '.split(' ').join('.pager '))
 					.bind('filterStart.pager', function(e, filters) {
 						p.currentFilters = filters;
-						p.page = 0; // fixes #456
+						// don't change page is filters are the same (pager updating, etc)
+						if (p.pageReset !== false && (c.lastCombinedFilter || '') !== (filters || []).join('')) {
+							p.page = p.pageReset; // fixes #456 & #565
+						}
 					})
 					// update pager after filter widget completes
 					.bind('filterEnd.pager sortEnd.pager', function() {
 						if (p.initialized) {
-							moveToPage(table, p, false);
+							// update page display first, so we update p.filteredPages
 							updatePageDisplay(table, p, false);
+							moveToPage(table, p, false);
 							fixHeight(table, p);
 						}
 					})

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.15.14 - Client-side table sorting with ease!
+* TableSorter 2.16.1 - Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
@@ -24,7 +24,7 @@
 
 			var ts = this;
 
-			ts.version = "2.15.14";
+			ts.version = "2.16.1";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -64,7 +64,8 @@
 
 				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){}
+				textExtraction   : 'basic',    // text extraction method/function - function(node, table, cellIndex){}
+				textAttribute    : 'data-text',// data-attribute that contains alternate cell text (used in textExtraction function)
 				textSorter       : null,       // choose overall or specific column sorter function(a, b, direction, table, columnIndex) [alt: ts.sortText]
 				numberSorter     : null,       // choose overall numeric sorter function(a, b, direction, maxColumnValue)
 
@@ -167,20 +168,19 @@
 			function getElementText(table, node, cellIndex) {
 				if (!node) { return ""; }
 				var c = table.config,
-					t = c.textExtraction, text = "";
-				if (t === "simple") {
-					if (c.supportsTextContent) {
-						text = node.textContent; // newer browsers support this
-					} else {
-						text = $(node).text();
-					}
+					t = c.textExtraction || '',
+					text = "";
+				if (t === "basic") {
+					// check data-attribute first
+					text = $(node).attr(c.textAttribute) || node.textContent || node.innerText || $(node).text() || "";
 				} else {
-					if (typeof t === "function") {
+					if (typeof(t) === "function") {
 						text = t(node, table, cellIndex);
-					} else if (typeof t === "object" && t.hasOwnProperty(cellIndex)) {
+					} else if (typeof(t) === "object" && t.hasOwnProperty(cellIndex)) {
 						text = t[cellIndex](node, table, cellIndex);
 					} else {
-						text = c.supportsTextContent ? node.textContent : $(node).text();
+						// previous "simple" method
+						text = node.textContent || node.innerText || $(node).text() || "";
 					}
 				}
 				return $.trim(text);
@@ -219,41 +219,47 @@
 				var c = table.config,
 					// update table bodies in case we start with an empty table
 					tb = c.$tbodies = c.$table.children('tbody:not(.' + c.cssInfoBlock + ')'),
-					rows, list, l, i, h, ch, p, time, parsersDebug = "";
-				if ( tb.length === 0) {
+					rows, list, l, i, h, ch, p, time,
+					j = 0,
+					parsersDebug = "",
+					len = tb.length;
+				if ( len === 0) {
 					return c.debug ? log('Warning: *Empty table!* Not building a parser cache') : '';
 				} else if (c.debug) {
 					time = new Date();
 					log('Detecting parsers for each column');
 				}
-				rows = tb[0].rows;
-				if (rows[0]) {
-					list = [];
-					l = rows[0].cells.length;
-					for (i = 0; i < l; i++) {
-						// tons of thanks to AnthonyM1229 for working out the following selector (issue #74) to make this work in IE8!
-						// More fixes to this selector to work properly in iOS and jQuery 1.8+ (issue #132 & #174)
-						h = c.$headers.filter(':not([colspan])');
-						h = h.add( c.$headers.filter('[colspan="1"]') ) // ie8 fix
-							.filter('[data-column="' + i + '"]:last');
-						ch = c.headers[i];
-						// get column parser
-						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';
-						if (!p) {
-							p = detectParserForColumn(table, rows, -1, i);
-						}
-						if (c.debug) {
-							parsersDebug += "column:" + i + "; parser:" + p.id + "; string:" + c.strings[i] + '; empty: ' + c.empties[i] + "\n";
+				list = [];
+				while (j < len) {
+					rows = tb[j].rows;
+					if (rows[j]) {
+						l = rows[j].cells.length;
+						for (i = 0; i < l; i++) {
+							// tons of thanks to AnthonyM1229 for working out the following selector (issue #74) to make this work in IE8!
+							// More fixes to this selector to work properly in iOS and jQuery 1.8+ (issue #132 & #174)
+							h = c.$headers.filter(':not([colspan])');
+							h = h.add( c.$headers.filter('[colspan="1"]') ) // ie8 fix
+								.filter('[data-column="' + i + '"]:last');
+							ch = c.headers[i];
+							// get column parser
+							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';
+							if (!p) {
+								p = detectParserForColumn(table, rows, -1, i);
+							}
+							if (c.debug) {
+								parsersDebug += "column:" + i + "; parser:" + p.id + "; string:" + c.strings[i] + '; empty: ' + c.empties[i] + "\n";
+							}
+							list.push(p);
 						}
-						list.push(p);
 					}
+					j += (list.length) ? len : 1;
 				}
 				if (c.debug) {
-					log(parsersDebug);
+					log(parsersDebug ? parsersDebug : "No parsers detected");
 					benchmark("Completed detecting parsers", time);
 				}
 				c.parsers = list;
@@ -261,72 +267,87 @@
 
 			/* utils */
 			function buildCache(table) {
-				var b = table.tBodies,
-				tc = table.config,
-				totalRows,
-				totalCells,
-				parsers = tc.parsers,
-				t, v, i, j, k, c, cols, cacheTime, colMax = [];
-				tc.cache = {};
+				var cc, t, v, i, j, k, $row, rows, cols, cacheTime,
+					totalRows, rowData, colMax,
+					c = table.config,
+					$tb = c.$table.children('tbody'),
+				parsers = c.parsers;
+				c.cache = {};
 				// if no parsers found, return - it's an empty table.
 				if (!parsers) {
-					return tc.debug ? log('Warning: *Empty table!* Not building a cache') : '';
+					return c.debug ? log('Warning: *Empty table!* Not building a cache') : '';
 				}
-				if (tc.debug) {
+				if (c.debug) {
 					cacheTime = new Date();
 				}
 				// processing icon
-				if (tc.showProcessing) {
+				if (c.showProcessing) {
 					ts.isProcessing(table, true);
 				}
-				for (k = 0; k < b.length; k++) {
-					tc.cache[k] = { row: [], normalized: [] };
+				for (k = 0; k < $tb.length; k++) {
+					colMax = []; // column max value per tbody
+					cc = c.cache[k] = {
+						normalized: [] // array of normalized row data; last entry contains "rowData" above
+						// colMax: #   // added at the end
+					};
+
 					// ignore tbodies with class name from c.cssInfoBlock
-					if (!$(b[k]).hasClass(tc.cssInfoBlock)) {
-						totalRows = (b[k] && b[k].rows.length) || 0;
-						totalCells = (b[k].rows[0] && b[k].rows[0].cells.length) || 0;
+					if (!$tb.eq(k).hasClass(c.cssInfoBlock)) {
+						totalRows = ($tb[k] && $tb[k].rows.length) || 0;
 						for (i = 0; i < totalRows; ++i) {
+							rowData = {
+								// order: original row order #
+								// $row : jQuery Object[]
+								child: [] // child row text (filter widget)
+							};
 							/** Add the table data to main data array */
-							c = $(b[k].rows[i]);
+							$row = $($tb[k].rows[i]);
+							rows = [ new Array(c.columns) ];
 							cols = [];
 							// if this is a child row, add it to the last row's children and continue to the next row
 							// ignore child row class, if it is the first row
-							if (c.hasClass(tc.cssChildRow) && i !== 0) {
-								tc.cache[k].row[tc.cache[k].row.length - 1] = tc.cache[k].row[tc.cache[k].row.length - 1].add(c);
+							if ($row.hasClass(c.cssChildRow) && i !== 0) {
+								t = cc.normalized.length - 1;
+								cc.normalized[t][c.columns].$row = cc.normalized[t][c.columns].$row.add($row);
 								// add "hasChild" class name to parent row
-								if (!c.prev().hasClass(tc.cssChildRow)) {
-									c.prev().addClass(ts.css.cssHasChild);
+								if (!$row.prev().hasClass(c.cssChildRow)) {
+									$row.prev().addClass(ts.css.cssHasChild);
 								}
+								// save child row content (un-parsed!)
+								rowData.child[t] = $.trim( $row[0].textContent || $row[0].innerText || $row.text() || "" );
 								// go to the next for loop
 								continue;
 							}
-							tc.cache[k].row.push(c);
-							for (j = 0; j < totalCells; ++j) {
+							rowData.$row = $row;
+							rowData.order = i; // add original row position to rowCache
+							for (j = 0; j < c.columns; ++j) {
 								if (typeof parsers[j] === 'undefined') {
-									if (tc.debug) {
-										log('No parser found for cell:', c[0].cells[j], 'does it have a header?');
+									if (c.debug) {
+										log('No parser found for cell:', $row[0].cells[j], 'does it have a header?');
 									}
 									continue;
 								}
-								t = getElementText(table, c[0].cells[j], j);
+								t = getElementText(table, $row[0].cells[j], j);
 								// allow parsing if the string is empty, previously parsing would change it to zero,
 								// in case the parser needs to extract data from the table cell attributes
-								v = parsers[j].format(t, table, c[0].cells[j], j);
+								v = parsers[j].format(t, table, $row[0].cells[j], j);
 								cols.push(v);
 								if ((parsers[j].type || '').toLowerCase() === "numeric") {
-									colMax[j] = Math.max(Math.abs(v) || 0, colMax[j] || 0); // determine column max value (ignore sign)
+									// determine column max value (ignore sign)
+									colMax[j] = Math.max(Math.abs(v) || 0, colMax[j] || 0);
 								}
 							}
-							cols.push(tc.cache[k].normalized.length); // add position for rowCache
-							tc.cache[k].normalized.push(cols);
+							// ensure rowData is always in the same location (after the last column)
+							cols[c.columns] = rowData;
+							cc.normalized.push(cols);
 						}
-						tc.cache[k].colMax = colMax;
+						cc.colMax = colMax;
 					}
 				}
-				if (tc.showProcessing) {
+				if (c.showProcessing) {
 					ts.isProcessing(table); // remove processing icon
 				}
-				if (tc.debug) {
+				if (c.debug) {
 					benchmark("Building cache for " + totalRows + " rows", cacheTime);
 				}
 			}
@@ -337,11 +358,11 @@
 					wo = c.widgetOptions,
 					b = table.tBodies,
 					rows = [],
-					c2 = c.cache,
-					r, n, totalRows, checkCell, $bk, $tb,
-					i, j, k, l, pos, appendTime;
+					cc = c.cache,
+					n, totalRows, $bk, $tb,
+					i, k, appendTime;
 				// empty table - fixes #206/#346
-				if (isEmptyObject(c2)) {
+				if (isEmptyObject(cc)) {
 					// run pager appender in case the table was just emptied
 					return c.appender ? c.appender(table, rows) :
 						table.isUpdating ? c.$table.trigger("updateComplete", table) : ''; // Fixes #532
@@ -354,19 +375,13 @@
 					if ($bk.length && !$bk.hasClass(c.cssInfoBlock)) {
 						// get tbody
 						$tb = ts.processTbody(table, $bk, true);
-						r = c2[k].row;
-						n = c2[k].normalized;
+						n = cc[k].normalized;
 						totalRows = n.length;
-						checkCell = totalRows ? (n[0].length - 1) : 0;
 						for (i = 0; i < totalRows; i++) {
-							pos = n[i][checkCell];
-							rows.push(r[pos]);
+							rows.push(n[i][c.columns].$row);
 							// removeRows used by the pager plugin; don't render if using ajax - fixes #411
 							if (!c.appender || (c.pager && (!c.pager.removeRows || !wo.pager_removeRows) && !c.pager.ajax)) {
-								l = r[pos].length;
-								for (j = 0; j < l; j++) {
-									$tb.append(r[pos][j]);
-								}
+								$tb.append(n[i][c.columns].$row);
 							}
 						}
 						// restore tbody
@@ -386,52 +401,6 @@
 				}
 			}
 
-			// computeTableHeaderCellIndexes from:
-			// http://www.javascripttoolbox.com/lib/table/examples.php
-			// http://www.javascripttoolbox.com/temp/table_cellindex.html
-			function computeThIndexes(t) {
-				var matrix = [],
-				lookup = {},
-				cols = 0, // determine the number of columns
-				trs = $(t).children('thead, tfoot').children('tr'), // children tr in tfoot - see issue #196 & #547
-				i, j, k, l, c, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow;
-				for (i = 0; i < trs.length; i++) {
-					cells = trs[i].cells;
-					for (j = 0; j < cells.length; j++) {
-						c = cells[j];
-						rowIndex = c.parentNode.rowIndex;
-						cellId = rowIndex + "-" + $(c).index();
-						rowSpan = c.rowSpan || 1;
-						colSpan = c.colSpan || 1;
-						if (typeof(matrix[rowIndex]) === "undefined") {
-							matrix[rowIndex] = [];
-						}
-						// Find first available column in the first row
-						for (k = 0; k < matrix[rowIndex].length + 1; k++) {
-							if (typeof(matrix[rowIndex][k]) === "undefined") {
-								firstAvailCol = k;
-								break;
-							}
-						}
-						lookup[cellId] = firstAvailCol;
-						cols = Math.max(firstAvailCol, cols);
-						// add data-column
-						$(c).attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex
-						for (k = rowIndex; k < rowIndex + rowSpan; k++) {
-							if (typeof(matrix[k]) === "undefined") {
-								matrix[k] = [];
-							}
-							matrixrow = matrix[k];
-							for (l = firstAvailCol; l < firstAvailCol + colSpan; l++) {
-								matrixrow[l] = "x";
-							}
-						}
-					}
-				}
-				// may not be accurate if # header columns !== # tbody columns
-				t.config.columns = cols + 1; // add one because it's a zero-based index
-			}
-
 			function formatSortingOrder(v) {
 				// look for "d" in "desc" order; return true
 				return (/^d/i.test(v) || v === 1);
@@ -446,7 +415,8 @@
 				if (c.debug) {
 					time = new Date();
 				}
-				computeThIndexes(table);
+				// children tr in tfoot - see issue #196 & #547
+				c.columns = ts.computeColumnIndex( c.$table.children('thead, tfoot').children('tr') );
 				// add icon if cssIcon option exists
 				i = c.cssIcon ? '<i class="' + ( c.cssIcon === ts.css.icon ? ts.css.icon : c.cssIcon + ' ' + ts.css.icon ) + '"></i>' : '';
 				c.$headers = $(table).find(c.selectorHeaders).each(function(index) {
@@ -701,8 +671,8 @@
 
 			// sort multiple columns
 			function multisort(table) { /*jshint loopfunc:true */
-				var i, k, num, col, colMax, cache, lc,
-					order, orgOrderCol, sortTime, sort, x, y,
+				var i, k, num, col, sortTime, colMax,
+					cache, order, sort, x, y,
 					dir = 0,
 					c = table.config,
 					cts = c.textSorter || '',
@@ -716,8 +686,7 @@
 				for (k = 0; k < bl; k++) {
 					colMax = c.cache[k].colMax;
 					cache = c.cache[k].normalized;
-					lc = cache.length;
-					orgOrderCol = (cache && cache[0]) ? cache[0].length - 1 : 0;
+
 					cache.sort(function(a, b) {
 						// cache is undefined here in IE, so don't use it!
 						for (i = 0; i < l; i++) {
@@ -727,7 +696,7 @@
 							dir = order === 0;
 
 							if (c.sortStable && a[col] === b[col] && l === 1) {
-								return a[orgOrderCol] - b[orgOrderCol];
+								return a[c.columns].order - b[c.columns].order;
 							}
 
 							// fallback to natural sort since it is more robust
@@ -761,7 +730,7 @@
 							}
 							if (sort) { return sort; }
 						}
-						return a[orgOrderCol] - b[orgOrderCol];
+						return a[c.columns].order - b[c.columns].order;
 					});
 				}
 				if (c.debug) { benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time", sortTime); }
@@ -772,7 +741,7 @@
 				if (table.isUpdating) {
 					$table.trigger('updateComplete');
 				}
-				if (typeof callback === "function") {
+				if ($.isFunction(callback)) {
 					callback($table[0]);
 				}
 			}
@@ -786,8 +755,8 @@
 						resortComplete($table, callback);
 					}, true]);
 				} else {
-					$table.trigger('applyWidgets');
 					resortComplete($table, callback);
+					ts.applyWidget($table[0], false);
 				}
 			}
 
@@ -797,12 +766,15 @@
 				// apply easy methods that trigger bound events
 				$table
 				.unbind('sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave '.split(' ').join(c.namespace + ' '))
-				.bind("sortReset" + c.namespace, function(e){
+				.bind("sortReset" + c.namespace, function(e, callback){
 					e.stopPropagation();
 					c.sortList = [];
 					setHeadersCss(table);
 					multisort(table);
 					appendToTable(table);
+					if ($.isFunction(callback)) {
+						callback(table);
+					}
 				})
 				.bind("updateAll" + c.namespace, function(e, resort, callback){
 					e.stopPropagation();
@@ -826,20 +798,24 @@
 					table.isUpdating = true;
 					$table.find(c.selectorRemove).remove();
 					// get position from the dom
-					var l, row, icell,
+					var v, row, icell,
 					$tb = $table.find('tbody'),
+					$cell = $(cell),
 					// update cache - format: function(s, table, cell, cellIndex)
 					// no closest in jQuery v1.2.6 - tbdy = $tb.index( $(cell).closest('tbody') ),$row = $(cell).closest('tr');
-					tbdy = $tb.index( $(cell).parents('tbody').filter(':first') ),
-					$row = $(cell).parents('tr').filter(':first');
-					cell = $(cell)[0]; // in case cell is a jQuery object
+					tbdy = $tb.index( $cell.parents('tbody').filter(':first') ),
+					$row = $cell.parents('tr').filter(':first');
+					cell = $cell[0]; // in case cell is a jQuery object
 					// 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).index();
-						l = c.cache[tbdy].normalized[row].length - 1;
-						c.cache[tbdy].row[ c.cache[tbdy].normalized[row][l] ] = $row;
-						c.cache[tbdy].normalized[row][icell] = c.parsers[icell].format( getElementText(table, cell, icell), table, cell, icell );
+						icell = $cell.index();
+						c.cache[tbdy].normalized[row][c.columns].$row = $row;
+						v = c.cache[tbdy].normalized[row][icell] = c.parsers[icell].format( getElementText(table, cell, icell), table, cell, icell );
+						if ((c.parsers[icell].type || '').toLowerCase() === "numeric") {
+							// update column max value (ignore sign)
+							c.cache[tbdy].colMax[icell] = Math.max(Math.abs(v) || 0, c.cache[tbdy].colMax[icell] || 0);
+						}
 						checkResort($table, resort, callback);
 					}
 				})
@@ -851,26 +827,34 @@
 						updateHeader(table);
 						commonUpdate(table, resort, callback);
 					} else {
-						var i, j,
+						var i, j, l, rowData, cells,
 						rows = $row.filter('tr').length,
-						dat = [], l = $row[0].cells.length,
 						tbdy = $table.find('tbody').index( $row.parents('tbody').filter(':first') );
 						// fixes adding rows to an empty table - see issue #179
-						if (!c.parsers) {
+						if (!(c.parsers && c.parsers.length)) {
 							buildParserCache(table);
 						}
 						// add each row
 						for (i = 0; i < rows; i++) {
+							l = $row[i].cells.length;
+							cells = [];
+							rowData = {
+								child: [],
+								$row : $row.eq(i),
+								order: c.cache[tbdy].normalized.length
+							};
 							// add each cell
 							for (j = 0; j < l; j++) {
-								dat[j] = c.parsers[j].format( getElementText(table, $row[i].cells[j], j), table, $row[i].cells[j], j );
+								cells[j] = c.parsers[j].format( getElementText(table, $row[i].cells[j], j), table, $row[i].cells[j], j );
+								if ((c.parsers[j].type || '').toLowerCase() === "numeric") {
+									// update column max value (ignore sign)
+									c.cache[tbdy].colMax[j] = Math.max(Math.abs(cells[j]) || 0, c.cache[tbdy].colMax[j] || 0);
+								}
 							}
-							// add the row index to the end
-							dat.push(c.cache[tbdy].row.length);
+							// add the row data to the end
+							cells.push(rowData);
 							// update cache
-							c.cache[tbdy].row.push([$row[i]]);
-							c.cache[tbdy].normalized.push(dat);
-							dat = [];
+							c.cache[tbdy].normalized.push(cells);
 						}
 						// resort using current settings
 						checkResort($table, resort, callback);
@@ -893,28 +877,27 @@
 					// sort the table and append it to the dom
 					multisort(table);
 					appendToTable(table, init);
-					$table
-						.trigger("sortEnd", this)
-						.trigger('applyWidgets');
-					if (typeof callback === "function") {
+					$table.trigger("sortEnd", this);
+					ts.applyWidget(table);
+					if ($.isFunction(callback)) {
 						callback(table);
 					}
 				})
 				.bind("appendCache" + c.namespace, function(e, callback, init) {
 					e.stopPropagation();
 					appendToTable(table, init);
-					if (typeof callback === "function") {
+					if ($.isFunction(callback)) {
 						callback(table);
 					}
 				})
 				.bind("updateCache" + c.namespace, function(e, callback){
 					// rebuild parsers
-					if (!c.parsers) {
+					if (!(c.parsers && c.parsers.length)) {
 						buildParserCache(table);
 					}
 					// rebuild the cache map
 					buildCache(table);
-					if (typeof callback === "function") {
+					if ($.isFunction(callback)) {
 						callback(table);
 					}
 				})
@@ -972,8 +955,6 @@
 				$.data(table, "tablesorter", c);
 				if (c.debug) { $.data( table, 'startoveralltimer', new Date()); }
 
-				// constants
-				c.supportsTextContent = $('<span>x</span>')[0].textContent === 'x';
 				// removing this in version 3 (only supports jQuery 1.7+)
 				c.supportsDataObject = (function(version) {
 					version[0] = parseInt(version[0], 10);
@@ -1005,6 +986,8 @@
 					c.$table.attr('aria-labelledby', 'theCaption');
 				}
 				c.widgetInit = {}; // keep a list of initialized widgets
+				// change textExtraction via data-attribute
+				c.textExtraction = c.$table.attr('data-text-extraction') || c.textExtraction || 'basic';
 				// build headers
 				buildHeaders(table);
 				// fixate columns if the users supplies the fixedWidth option
@@ -1034,7 +1017,9 @@
 					setHeadersCss(table);
 					if (c.initWidgets) {
 						// apply widget format
-						ts.applyWidget(table);
+						setTimeout(function(){
+							ts.applyWidget(table, false);
+						}, 0);
 					}
 				}
 
@@ -1057,6 +1042,53 @@
 				if (typeof c.initialized === 'function') { c.initialized(table); }
 			};
 
+
+			// computeTableHeaderCellIndexes from:
+			// http://www.javascripttoolbox.com/lib/table/examples.php
+			// http://www.javascripttoolbox.com/temp/table_cellindex.html
+			ts.computeColumnIndex = function(trs) {
+				var matrix = [],
+				lookup = {},
+				cols = 0, // determine the number of columns
+				i, j, k, l, $cell, cell, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow;
+				for (i = 0; i < trs.length; i++) {
+					cells = trs[i].cells;
+					for (j = 0; j < cells.length; j++) {
+						cell = cells[j];
+						$cell = $(cell);
+						rowIndex = cell.parentNode.rowIndex;
+						cellId = rowIndex + "-" + $cell.index();
+						rowSpan = cell.rowSpan || 1;
+						colSpan = cell.colSpan || 1;
+						if (typeof(matrix[rowIndex]) === "undefined") {
+							matrix[rowIndex] = [];
+						}
+						// Find first available column in the first row
+						for (k = 0; k < matrix[rowIndex].length + 1; k++) {
+							if (typeof(matrix[rowIndex][k]) === "undefined") {
+								firstAvailCol = k;
+								break;
+							}
+						}
+						lookup[cellId] = firstAvailCol;
+						cols = Math.max(firstAvailCol, cols);
+						// add data-column
+						$cell.attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex
+						for (k = rowIndex; k < rowIndex + rowSpan; k++) {
+							if (typeof(matrix[k]) === "undefined") {
+								matrix[k] = [];
+							}
+							matrixrow = matrix[k];
+							for (l = firstAvailCol; l < firstAvailCol + colSpan; l++) {
+								matrixrow[l] = "x";
+							}
+						}
+					}
+				}
+				// may not be accurate if # header columns !== # tbody columns
+				return cols + 1; // add one because it's a zero-based index
+			};
+
 			// *** Process table ***
 			// add processing indicator
 			ts.isProcessing = function(table, toggle, $ths) {
@@ -1186,6 +1218,7 @@
 				$t.toggleClass(ts.css.table + ' ' + c.tableClass + ' tablesorter-' + c.theme, removeClasses === false);
 				// clear flag in case the plugin is initialized again
 				table.hasInitialized = false;
+				delete table.config.cache;
 				if (typeof callback === 'function') {
 					callback(table);
 				}
@@ -1387,8 +1420,11 @@
 					wo = c.widgetOptions,
 					widgets = [],
 					time, w, wd;
+				// prevent numerous consecutive widget applications
+				if (init !== false && table.hasInitialized && (table.isApplyingWidgets || table.isUpdating)) { return; }
 				if (c.debug) { time = new Date(); }
 				if (c.widgets.length) {
+					table.isApplyingWidgets = true;
 					// ensure unique widget ids
 					c.widgets = $.grep(c.widgets, function(v, k){
 						return $.inArray(v, c.widgets) === k;
@@ -1424,6 +1460,9 @@
 						}
 					});
 				}
+				setTimeout(function(){
+					table.isApplyingWidgets = false;
+				}, 0);
 				if (c.debug) {
 					w = c.widgets.length;
 					benchmark("Completed " + (init === true ? "initializing " : "applying ") + w + " widget" + (w !== 1 ? "s" : ""), time);