jquery-tablesorter 1.19.4 → 1.20.0

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-columnSelector.js

@@ -230,7 +230,7 @@
 			tsColSel.adjustColspans( c, wo );
 			// trigger columnUpdate if auto is true (it gets skipped in updateCols()
 			if (colSel.auto) {
-				c.$table.trigger(wo.columnSelector_updated);
+				c.$table.triggerHandler(wo.columnSelector_updated);
 			}
 		},
 		addSelectors: function( prefix, column ) {
@@ -318,7 +318,7 @@
 				ts.storage( c.$table[0], 'tablesorter-columnSelector', colSel.states );
 			}
 			tsColSel.adjustColspans( c, wo );
-			c.$table.trigger(wo.columnSelector_updated);
+			c.$table.triggerHandler(wo.columnSelector_updated);
 		},
 
 		setUpColspan: function(c, wo) {

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-editable.js

@@ -1,4 +1,4 @@
-/*! Widget: editable - updated 10/31/2015 (v2.24.0) *//*
+/*! Widget: editable - updated 12/13/2015 (v2.25.0) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -222,17 +222,20 @@
 								.data( 'before', valid )
 								.data( 'original', valid )
 								.trigger( 'change' );
-							$.tablesorter.updateCell( c, $this.closest( 'td' ), false, function() {
-								if ( wo.editable_autoResort ) {
-									setTimeout( function() {
-										$.tablesorter.sortOn( c, c.sortList, function() {
-											tse.editComplete( c, wo, c.$table.data( 'contentFocused' ), true );
-										}, true );
-									}, 10 );
-								} else {
-									tse.editComplete( c, wo, c.$table.data( 'contentFocused' ) );
-								}
-							});
+							// prevent error if table was destroyed - see #1099
+							if ( c.table.hasInitialized ) {
+								$.tablesorter.updateCell( c, $this.closest( 'td' ), false, function() {
+									if ( wo.editable_autoResort ) {
+										setTimeout( function() {
+											$.tablesorter.sortOn( c, c.sortList, function() {
+												tse.editComplete( c, wo, c.$table.data( 'contentFocused' ), true );
+											}, true );
+										}, 10 );
+									} else {
+										tse.editComplete( c, wo, c.$table.data( 'contentFocused' ) );
+									}
+								});
+							}
 							return false;
 						}
 					} else if ( !valid && e.type !== 'keydown' ) {

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-filter-type-insideRange.js

@@ -1,4 +1,4 @@
-/*! Widget: filter, insideRange filter type - updated 11/22/2015 (v2.24.6) */
+/*! Widget: filter, insideRange filter type - updated 12/10/2015 (v2.25.0) */
 ;(function($){
 	'use strict';
 
@@ -15,14 +15,15 @@
 		};
 
 	ts.filter.types.insideRange = function( c, data ) {
-		if ( isDigit.test( data.iFilter ) && range.test( data.iExact ) ) {
+		// don't look for an inside range if "any" match is enabled... multiple "-" really screw things up
+		if ( !data.anyMatch && isDigit.test( data.iFilter ) && range.test( data.iExact ) ) {
 			var t, val, low, high,
 				index = data.index,
 				cell = data.$cells[ index ],
 				parts = data.iExact.split( range ),
-				format = c.parsers[data.index].format;
-			// the cell does not contain a range
-			if ( parts && parts.length < 2 ) {
+				format = c.parsers[data.index] && c.parsers[data.index].format;
+			// the cell does not contain a range or the parser isn't defined
+			if ( parts && parts.length < 2 || typeof format !== 'function' ) {
 				return null;
 			}
 			// format each side part of the range using the assigned parser

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-filter.js

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 11/10/2015 (v2.24.4) *//*
+/*! Widget: filter - updated 12/13/2015 (v2.25.0) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -208,7 +208,7 @@
 						table = c.table,
 						parsed = data.parsed[ data.index ],
 						query = ts.formatFloat( data.iFilter.replace( tsfRegex.operators, '' ), table ),
-						parser = c.parsers[ data.index ],
+						parser = c.parsers[ data.index ] || {},
 						savedSearch = query;
 					// parse filter value in case we're comparing numbers ( dates )
 					if ( parsed || parser.type === 'numeric' ) {
@@ -348,6 +348,7 @@
 
 			var options, string, txt, $header, column, filters, val, fxn, noSelect;
 			c.$table.addClass( 'hasFilters' );
+			c.lastSearch = [];
 
 			// define timers so using clearTimeout won't cause an undefined error
 			wo.filter_searchTimer = null;
@@ -430,7 +431,7 @@
 				if ( wo.filter_reset instanceof $ ) {
 					// reset contains a jQuery object, bind to it
 					wo.filter_reset.click( function() {
-						c.$table.trigger( 'filterReset' );
+						c.$table.triggerHandler( 'filterReset' );
 					});
 				} else if ( $( wo.filter_reset ).length ) {
 					// reset is a jQuery selector, use event delegation
@@ -438,7 +439,7 @@
 						.undelegate( wo.filter_reset, 'click' + c.namespace + 'filter' )
 						.delegate( wo.filter_reset, 'click' + c.namespace + 'filter', function() {
 							// trigger a reset event, so other functions ( filter_formatter ) know when to reset
-							c.$table.trigger( 'filterReset' );
+							c.$table.triggerHandler( 'filterReset' );
 						});
 				}
 			}
@@ -540,7 +541,7 @@
 						ts.setFilters( table, filters, true );
 					}
 				}
-				c.$table.trigger( 'filterFomatterUpdate' );
+				c.$table.triggerHandler( 'filterFomatterUpdate' );
 				// trigger init after setTimeout to prevent multiple filterStart/End/Init triggers
 				setTimeout( function() {
 					if ( !wo.filter_initialized ) {
@@ -550,7 +551,7 @@
 			});
 			// if filter widget is added after pager has initialized; then set filter init flag
 			if ( c.pager && c.pager.initialized && !wo.filter_initialized ) {
-				c.$table.trigger( 'filterFomatterUpdate' );
+				c.$table.triggerHandler( 'filterFomatterUpdate' );
 				setTimeout( function() {
 					tsf.filterInitComplete( c );
 				}, 100 );
@@ -573,7 +574,7 @@
 				count = 0,
 				completed = function() {
 					wo.filter_initialized = true;
-					c.$table.trigger( 'filterInit', c );
+					c.$table.triggerHandler( 'filterInit', c );
 					tsf.findRows( c.table, c.$table.data( 'lastSearch' ) || [] );
 				};
 			if ( $.isEmptyObject( wo.filter_formatter ) ) {
@@ -628,7 +629,7 @@
 				for ( indx = 0; indx <= c.columns; indx++ ) {
 					// include data-column='all' external filters
 					col = indx === c.columns ? 'all' : indx;
-					filters[indx] = $filters
+					filters[ indx ] = $filters
 						.filter( '[data-column="' + col + '"]' )
 						.attr( wo.filter_defaultAttrib ) || filters[indx] || '';
 				}
@@ -650,11 +651,12 @@
 				buildFilter = '<tr role="row" class="' + tscss.filterRow + ' ' + c.cssIgnoreRow + '">';
 			for ( column = 0; column < columns; column++ ) {
 				if ( c.$headerIndexed[ column ].length ) {
-					buildFilter += '<td data-column="' + column + '"';
 					// account for entire column set with colspan. See #1047
 					tmp = c.$headerIndexed[ column ] && c.$headerIndexed[ column ][0].colSpan || 0;
 					if ( tmp > 1 ) {
-						buildFilter += ' colspan="' + tmp + '"';
+						buildFilter += '<td data-column="' + column + '-' + ( column + tmp - 1 ) + '" colspan="' + tmp + '"';
+					} else {
+						buildFilter += '<td data-column="' + column + '"';
 					}
 					if ( arry ) {
 						buildFilter += ( cellFilter[ column ] ? ' class="' + cellFilter[ column ] + '"' : '' );
@@ -673,7 +675,8 @@
 				// assuming last cell of a column is the main column
 				$header = c.$headerIndexed[ column ];
 				if ( $header && $header.length ) {
-					$filter = c.$filters.filter( '[data-column="' + column + '"]' );
+					// $filter = c.$filters.filter( '[data-column="' + column + '"]' );
+					$filter = tsf.getColumnElm( c, c.$filters, column );
 					ffxn = ts.getColumnData( table, wo.filter_functions, column );
 					makeSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
 						$header.hasClass( 'filter-select' );
@@ -713,7 +716,8 @@
 						name = ( $.isArray( wo.filter_cssFilter ) ?
 							( typeof wo.filter_cssFilter[column] !== 'undefined' ? wo.filter_cssFilter[column] || '' : '' ) :
 							wo.filter_cssFilter ) || '';
-						buildFilter.addClass( tscss.filter + ' ' + name ).attr( 'data-column', column );
+						// copy data-column from table cell (it will include colspan)
+						buildFilter.addClass( tscss.filter + ' ' + name ).attr( 'data-column', $filter.attr( 'data-column' ) );
 						if ( disabled ) {
 							buildFilter.attr( 'placeholder', '' ).addClass( tscss.filterDisabled )[0].disabled = true;
 						}
@@ -821,7 +825,7 @@
 				// show/hide filter row as needed
 				c.$table
 					.find( '.' + tscss.filterRow )
-					.trigger( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
+					.triggerHandler( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
 			}
 			// return if the last search is the same; but filter === false when updating the search
 			// see example-widget-filter.html filter toggle buttons
@@ -832,6 +836,8 @@
 				c.lastCombinedFilter = null;
 				c.lastSearch = [];
 			}
+			// define filter inside it is false
+			filters = filters || [];
 			// convert filters to strings - see #1070
 			filters = Array.prototype.map ?
 				filters.map( String ) :
@@ -839,7 +845,7 @@
 				filters.join( '\u0000' ).split( '\u0000' );
 
 			if ( wo.filter_initialized ) {
-				c.$table.trigger( 'filterStart', [ filters ] );
+				c.$table.triggerHandler( 'filterStart', [ filters ] );
 			}
 			if ( c.showProcessing ) {
 				// give it time for the processing icon to kick in
@@ -920,22 +926,18 @@
 			}
 			return $input || $();
 		},
-		multipleColumns: function( c, $input ) {
+		findRange: function( c, val, ignoreRanges ) {
 			// look for multiple columns '1-3,4-6,8' in data-column
 			var temp, ranges, range, start, end, singles, i, indx, len,
-				wo = c.widgetOptions,
-				// only target 'all' column inputs on initialization
-				// & don't target 'all' column inputs if they don't exist
-				targets = wo.filter_initialized || !$input.filter( wo.filter_anyColumnSelector ).length,
-				columns = [],
-				val = $.trim( tsf.getLatestSearch( $input ).attr( 'data-column' ) || '' );
-			if ( /^[0-9]+$/.test(val)) {
-				return parseInt( val, 10 );
+				columns = [];
+			if ( /^[0-9]+$/.test( val ) ) {
+				// always return an array
+				return [ parseInt( val, 10 ) ];
 			}
 			// process column range
-			if ( targets && /-/.test( val ) ) {
+			if ( !ignoreRanges && /-/.test( val ) ) {
 				ranges = val.match( /(\d+)\s*-\s*(\d+)/g );
-				len = ranges.length;
+				len = ranges ? ranges.length : 0;
 				for ( indx = 0; indx < len; indx++ ) {
 					range = ranges[indx].split( /\s*-\s*/ );
 					start = parseInt( range[0], 10 ) || 0;
@@ -954,7 +956,7 @@
 				}
 			}
 			// process single columns
-			if ( targets && /,/.test( val ) ) {
+			if ( !ignoreRanges && /,/.test( val ) ) {
 				singles = val.split( /\s*,\s*/ );
 				len = singles.length;
 				for ( i = 0; i < len; i++ ) {
@@ -974,6 +976,23 @@
 			}
 			return columns;
 		},
+		getColumnElm: function( c, $elements, column ) {
+			// data-column may contain multiple columns '1-3,5-6,8'
+			// replaces: c.$filters.filter( '[data-column="' + column + '"]' );
+			return $elements.filter( function() {
+				var cols = tsf.findRange( c, $( this ).attr( 'data-column' ) );
+				return $.inArray( column, cols ) > -1;
+			});
+		},
+		multipleColumns: function( c, $input ) {
+			// look for multiple columns '1-3,4-6,8' in data-column
+			var wo = c.widgetOptions,
+				// only target 'all' column inputs on initialization
+				// & don't target 'all' column inputs if they don't exist
+				targets = wo.filter_initialized || !$input.filter( wo.filter_anyColumnSelector ).length,
+				val = $.trim( tsf.getLatestSearch( $input ).attr( 'data-column' ) || '' );
+			return tsf.findRange( c, val, !targets );
+		},
 		processTypes: function( c, data, vars ) {
 			var ffxn,
 				filterMatched = null,
@@ -1087,6 +1106,11 @@
 						data.filter = ts.replaceAccents( data.filter );
 					}
 
+					// replace column specific default filters - see #1088
+					if ( wo.filter_defaultFilter && tsfRegex.iQuery.test( vars.defaultColFilter[ columnIndex ] ) ) {
+						data.filter = tsf.defaultFilter( data.filter, vars.defaultColFilter[ columnIndex ] );
+					}
+
 					// data.iFilter = case insensitive ( if wo.filter_ignoreCase is true ),
 					// data.filter = case sensitive
 					data.iFilter = wo.filter_ignoreCase ? ( data.filter || '' ).toLowerCase() : data.filter;
@@ -1375,7 +1399,8 @@
 				console.log( 'Completed filter widget search' + ts.benchmark(time) );
 			}
 			if ( wo.filter_initialized ) {
-				c.$table.trigger( 'filterEnd', c );
+				c.$table.triggerHandler( 'filterBeforeEnd', c );
+				c.$table.triggerHandler( 'filterEnd', c );
 			}
 			setTimeout( function() {
 				ts.applyWidget( c.table ); // make sure zebra widget is applied
@@ -1740,7 +1765,7 @@
 			c.lastCombinedFilter = null;
 			c.lastSearch = [];
 			tsf.searching( c.table, filter, skipFirst );
-			c.$table.trigger( 'filterFomatterUpdate' );
+			c.$table.triggerHandler( 'filterFomatterUpdate' );
 		}
 		return !!valid;
 	};

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-grouping.js

@@ -123,7 +123,7 @@
 				tsg.findColumnGroups( c, wo, data );
 				tsg.processHeaders( c, wo, data );
 
-				c.$table.trigger(wo.group_complete);
+				c.$table.triggerHandler(wo.group_complete);
 			}
 		},
 

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-math.js

@@ -1,4 +1,4 @@
-/*! Widget: math - updated 11/22/2015 (v2.24.6) *//*
+/*! Widget: math - updated 12/13/2015 (v2.25.0) *//*
 * Requires tablesorter v2.16+ and jQuery 1.7+
 * by Rob Garrison
 */
@@ -22,37 +22,36 @@
 			// name = function returning invalid results
 			// errorIndex = math.error index with an explanation of the error
 			console.log( name, math.error[ errorIndex ] );
-			return c && c.widgetOptions.math_none || 'none'; // text for cell
+			return c && c.widgetOptions.math_none || ''; // text for cell
 		},
 
-		events : ( 'tablesorter-initialized update updateAll updateRows addRows updateCell ' +
-			'filterReset filterEnd ' ).split(' ').join('.tsmath '),
+		events : ( 'tablesorter-initialized update updateAll updateRows addRows updateCell filterReset ' )
+			.split(' ').join('.tsmath '),
 
 		processText : function( c, $cell ) {
-			var txt = $cell.attr( c.textAttribute );
-			if ( typeof txt === 'undefined' ) {
-				txt = $cell[0].textContent || $cell.text();
-			}
+			var txt = ts.getElementText( c, $cell, math.getCellIndex( $cell ) );
 			txt = ts.formatFloat( txt.replace( /[^\w,. \-()]/g, '' ), c.table ) || 0;
 			// isNaN('') => false
 			return isNaN( txt ) ? 0 : txt;
 		},
 
 		// get all of the row numerical values in an arry
-		getRow : function( c, $el ) {
+		getRow : function( c, $el, hasFilter ) {
 			var $cells,
 				wo = c.widgetOptions,
 				arry = [],
 				$row = $el.closest( 'tr' ),
-				isFiltered = $row.hasClass( wo.filter_filteredRow || 'filtered' ),
-				hasFilter = wo.math_rowFilter;
+				isFiltered = $row.hasClass( wo.filter_filteredRow || 'filtered' );
 			if ( hasFilter ) {
 				$row = $row.filter( hasFilter );
 			}
-			if ( !isFiltered || hasFilter ) {
+			if ( hasFilter || !isFiltered ) {
 				$cells = $row.children().not( '[' + wo.math_dataAttrib + '=ignore]' );
 				if ( wo.math_ignore.length ) {
-					$cells = $cells.not( '[data-column=' + wo.math_ignore.join( '],[data-column=' ) + ']' );
+					$cells = $cells.filter( function( indx ) {
+						// using $.inArray is not optimal (needed for IE8)
+						return $.inArray( math.getCellIndex( $( this ) ), wo.math_ignore ) === -1;
+					});
 				}
 				arry = $cells.not( $el ).map( function() {
 					return math.processText( c, $( this ) );
@@ -62,31 +61,38 @@
 		},
 
 		// get all of the column numerical values in an arry
-		getColumn : function( c, $el, type ) {
+		getColumn : function( c, $el, type, hasFilter ) {
 			var index, $t, $tr, len, $mathRows, mathAbove,
-				arry = [],
 				wo = c.widgetOptions,
-				hasFilter = wo.math_rowFilter,
+				arry = [],
+				$row = $el.closest( 'tr' ),
 				mathAttr = wo.math_dataAttrib,
+				mathIgnore = '[' + mathAttr + '=ignore]',
 				filtered = wo.filter_filteredRow || 'filtered',
-				cIndex = parseInt( $el.attr( 'data-column' ), 10 ),
+				cIndex = math.getCellIndex( $el ),
+				// get all rows to keep row indexing
 				$rows = c.$table.children( 'tbody' ).children(),
-				$row = $el.closest( 'tr' );
-			// make sure tfoot rows are AFTER the tbody rows
-			// $rows.add( c.$table.children( 'tfoot' ).children() );
+				mathAttrs = [
+					'[' + mathAttr + '^=above]',
+					'[' + mathAttr + '^=below]',
+					'[' + mathAttr + '^=col]',
+					'[' + mathAttr + '^=all]'
+				];
 			if ( type === 'above' ) {
 				len = $rows.index( $row );
 				index = len;
 				while ( index >= 0 ) {
 					$tr = $rows.eq( index );
+					mathAbove = $tr.children().filter( mathAttrs[0] ).length;
 					if ( hasFilter ) {
-						$tr = $tr.filter( wo.math_rowFilter );
+						$tr = $tr.filter( hasFilter );
 					}
-					$t = $tr.children().filter( '[data-column=' + cIndex + ']' );
-					mathAbove = $t.filter( '[' + mathAttr + '^=above]' ).length;
+					$t = $tr.children().filter( function( indx ) {
+						return math.getCellIndex( $( this ) ) === cIndex;
+					});
 					// ignore filtered rows & rows with data-math="ignore" (and starting row)
-					if ( ( ( !$tr.hasClass( filtered ) || hasFilter ) &&
-							$tr.not( '[' + mathAttr + '=ignore]' ).length &&
+					if ( ( ( hasFilter || !$tr.hasClass( filtered ) ) &&
+							$tr.not( mathIgnore ).length &&
 							index !== len ) ||
 							mathAbove && index !== len ) {
 						// stop calculating 'above', when encountering another 'above'
@@ -103,31 +109,34 @@
 				// index + 1 to ignore starting node
 				for ( index = $rows.index( $row ) + 1; index < len; index++ ) {
 					$tr = $rows.eq( index );
+					if ( $tr.children().filter( mathAttrs[1] ).length ) {
+						break;
+					}
 					if ( hasFilter ) {
 						$tr = $tr.filter( hasFilter );
 					}
-					$t = $tr.children().filter( '[data-column=' + cIndex + ']' );
-					if ( $t.filter( '[' + mathAttr + '^=below]' ).length ) {
-						break;
-					}
-					if ( ( !$tr.hasClass( filtered ) || hasFilter ) &&
-							$tr.not( '[' + mathAttr + '=ignore]' ).length &&
-							$t.length ) {
+					$t = $tr.children().filter( function( indx ) {
+						return math.getCellIndex( $( this ) ) === cIndex;
+					});
+					if ( ( hasFilter || !$tr.hasClass( filtered ) ) &&
+						$tr.not( mathIgnore ).length &&
+						$t.length ) {
 						arry.push( math.processText( c, $t ) );
 					}
 				}
-
 			} else {
-				$mathRows = $rows.not( '[' + mathAttr + '=ignore]' );
+				$mathRows = $rows.not( mathIgnore );
 				len = $mathRows.length;
 				for ( index = 0; index < len; index++ ) {
 					$tr = $mathRows.eq( index );
 					if ( hasFilter ) {
 						$tr = $tr.filter( hasFilter );
 					}
-					$t = $tr.children().filter( '[data-column=' + cIndex + ']' );
-					if ( ( !$tr.hasClass( filtered ) || hasFilter ) &&
-						$t.not( '[' + mathAttr + '^=above],[' + mathAttr + '^=below],[' + mathAttr + '^=col]' ).length &&
+					$t = $tr.children().filter( function( indx ) {
+						return math.getCellIndex( $( this ) ) === cIndex;
+					});
+					if ( ( hasFilter || !$tr.hasClass( filtered ) ) &&
+						$t.not( mathAttrs.join( ',' ) ).length &&
 						!$t.is( $el ) ) {
 						arry.push( math.processText( c, $t ) );
 					}
@@ -137,27 +146,27 @@
 		},
 
 		// get all of the column numerical values in an arry
-		getAll : function( c ) {
+		getAll : function( c, hasFilter ) {
 			var $t, col, $row, rowIndex, rowLen, $cells, cellIndex, cellLen,
 				arry = [],
 				wo = c.widgetOptions,
 				mathAttr = wo.math_dataAttrib,
+				mathIgnore = '[' + mathAttr + '=ignore]',
 				filtered = wo.filter_filteredRow || 'filtered',
-				hasFilter = wo.filter_rowFilter,
-				$rows = c.$table.children( 'tbody' ).children().not( '[' + mathAttr + '=ignore]' );
+				$rows = c.$table.children( 'tbody' ).children().not( mathIgnore );
 			rowLen = $rows.length;
 			for ( rowIndex = 0; rowIndex < rowLen; rowIndex++ ) {
 				$row = $rows.eq( rowIndex );
 				if ( hasFilter ) {
 					$row = $row.filter( hasFilter );
 				}
-				if ( !$row.hasClass( filtered ) || hasFilter ) {
-					$cells = $row.children().not( '[' + mathAttr + '=ignore]' );
+				if ( hasFilter || !$row.hasClass( filtered ) ) {
+					$cells = $row.children().not( mathIgnore );
 					cellLen = $cells.length;
 					// $row.children().each(function(){
 					for ( cellIndex = 0; cellIndex < cellLen; cellIndex++ ) {
 						$t = $cells.eq( cellIndex );
-						col = parseInt( $t.attr( 'data-column' ), 10);
+						col = math.getCellIndex( $t );
 						if ( !$t.filter( '[' + mathAttr + ']' ).length && $.inArray( col, wo.math_ignore ) < 0 ) {
 							arry.push( math.processText( c, $t ) );
 						}
@@ -170,17 +179,48 @@
 		setColumnIndexes : function( c ) {
 			c.$table.after( '<div id="_tablesorter_table_placeholder"></div>' );
 			// detach table from DOM to speed up column indexing
-			var $table = c.$table.detach();
-			ts.computeColumnIndex( $table.children( 'tbody' ).children() );
+			var $table = c.$table.detach(),
+				last = 1,
+				// only target rows with a colspan or rows included in a rowspan
+				$rows = $table.children( 'tbody' ).children().filter( function() {
+					var cells, indx, len,
+						$this = $( this ),
+						include = $this.children( '[colspan]' ).length > 0;
+					if ( last > 1 ) {
+						last--;
+						include = true;
+					} else if ( last < 1 ) {
+						last = 1;
+					}
+					if ( $this.children( '[rowspan]' ).length > 0 ) {
+						cells = this.cells;
+						// find max rowspan (in case more than one cell has a rowspan)
+						for ( indx = 0; indx < cells.length; indx++ ) {
+							last = Math.max( cells[ indx ].rowSpan, last );
+						}
+					}
+					return include;
+				});
+			// pass `c` (table.config) to computeColumnIndex so it won't add a data-column
+			// to every tbody cell, just the ones where the .cellIndex property doesn't match
+			// the calculated cell index - hopefully fixes the lag issue in #1048
+			ts.computeColumnIndex( $rows, c );
 			$( '#_tablesorter_table_placeholder' )
 				.after( $table )
 				.remove();
 		},
 
+		getCellIndex : function( $cell ) {
+			var indx = $cell.attr( 'data-column' );
+			return typeof indx === 'undefined' ? $cell[0].cellIndex : parseInt( indx, 10 );
+		},
+
 		recalculate : function(c, wo, init) {
 			if ( c && ( !wo.math_isUpdating || init ) ) {
 
-				var undef, time, mathAttr, $mathCells;
+				var undef, time, mathAttr, $mathCells, indx, len,
+					changed = false,
+					filters = {};
 				if ( c.debug ) {
 					time = new Date();
 				}
@@ -196,7 +236,7 @@
 				// all non-info tbody cells
 				mathAttr = wo.math_dataAttrib;
 				$mathCells = c.$tbodies.children( 'tr' ).children( '[' + mathAttr + ']' );
-				math.mathType( c, $mathCells, wo.math_priority );
+				changed = math.mathType( c, $mathCells, wo.math_priority ) || changed;
 
 				// only info tbody cells
 				$mathCells = c.$table
@@ -207,20 +247,33 @@
 
 				// find the 'all' total
 				$mathCells = c.$table.children().children( 'tr' ).children( '[' + mathAttr + '^=all]' );
-				math.mathType( c, $mathCells, [ 'all' ] );
+				len = $mathCells.length;
+				// get math filter, if any
+				// hasFilter = $row.attr( mathAttr + '-filter' ) || wo.math_rowFilter;
+				$mathCells.each( function( indx, cell ) {
+					var $cell = $( cell ),
+						filter = $mathCells.eq( indx ).attr( mathAttr + '-filter' ) || wo.math_rowFilter;
+					filters[ filter ] = filters[ filter ] ? filters[ filter ].add( $cell ) : $cell;
+				});
+				$.each( filters, function( hasFilter, $cells ) {
+					changed = math.mathType( c, $cells, [ 'all' ], hasFilter ) || changed;
+				});
 
-				wo.math_isUpdating = true;
-				if ( c.debug ) {
-					console[ console.group ? 'group' : 'log' ]( 'Math widget triggering an update after recalculation' );
-				}
+				// trigger an update only if cells inside the tbody changed
+				if ( changed ) {
+					wo.math_isUpdating = true;
+					if ( c.debug ) {
+						console[ console.group ? 'group' : 'log' ]( 'Math widget triggering an update after recalculation' );
+					}
 
-				// update internal cache
-				ts.update( c, undef, function(){
-					math.updateComplete( c );
-				});
+					// update internal cache
+					ts.update( c, undef, function(){
+						math.updateComplete( c );
+					});
 
-				if ( c.debug ) {
-					console.log( 'Math widget update completed' + ts.benchmark( time ) );
+					if ( c.debug ) {
+						console.log( 'Math widget update completed' + ts.benchmark( time ) );
+					}
 				}
 			}
 		},
@@ -231,23 +284,25 @@
 			wo.math_isUpdating = false;
 		},
 
-		mathType : function( c, $cells, priority ) {
+		mathType : function( c, $cells, priority, hasFilter ) {
 			if ( $cells.length ) {
-				var formula, result, $el, arry, getAll, $targetCells, index, len,
+				var getAll,
+					changed = false,
 					wo = c.widgetOptions,
 					mathAttr = wo.math_dataAttrib,
 					equations = ts.equations;
 				if ( priority[0] === 'all' ) {
-					// no need to get all cells more than once
-					getAll = math.getAll( c );
+					// mathType is called multiple times if more than one "hasFilter" is used
+					getAll = math.getAll( c, hasFilter );
 				}
 				if (c.debug) {
 					console[ console.group ? 'group' : 'log' ]( 'Tablesorter Math widget recalculation' );
 				}
 				// $.each is okay here... only 4 priorities
 				$.each( priority, function( i, type ) {
-					$targetCells = $cells.filter( '[' + mathAttr + '^=' + type + ']' );
-					len = $targetCells.length;
+					var index, arry, formula, result, $el,
+						$targetCells = $cells.filter( '[' + mathAttr + '^=' + type + ']' ),
+						len = $targetCells.length;
 					if ( len ) {
 						if (c.debug) {
 							console[ console.group ? 'group' : 'log' ]( type );
@@ -258,39 +313,58 @@
 							if ( $el.parent().hasClass( wo.filter_filteredRow || 'filtered' ) ) {
 								continue;
 							}
+							hasFilter = $el.attr( mathAttr + '-filter' ) || wo.math_rowFilter;
 							formula = ( $el.attr( mathAttr ) || '' ).replace( type + '-', '' );
-							arry = ( type === 'row' ) ? math.getRow( c, $el ) :
-								( type === 'all' ) ? getAll : math.getColumn( c, $el, type );
+							arry = ( type === 'row' ) ? math.getRow( c, $el, hasFilter ) :
+								( type === 'all' ) ? getAll : math.getColumn( c, $el, type, hasFilter );
 							if ( equations[ formula ] ) {
 								if ( arry.length ) {
 									result = equations[ formula ]( arry, c );
 									if ( c.debug ) {
-										console.log( $el.attr( mathAttr ), arry, '=', result );
+										console.log( $el.attr( mathAttr ), hasFilter ? '("' + hasFilter + '")' : '', arry, '=', result );
 									}
 								} else {
 									// mean will return a divide by zero error, everything else shows an undefined error
 									result = math.invalid( c, formula, formula === 'mean' ? 0 : 'undef' );
 								}
-								math.output( $el, wo, result, arry );
+								changed = math.output( $el, c, result, arry ) || changed;
 							}
 						}
 						if ( c.debug && console.groupEnd ) { console.groupEnd(); }
 					}
 				});
 				if ( c.debug && console.groupEnd ) { console.groupEnd(); }
+				return changed;
 			}
+			return false;
 		},
 
-		output : function( $cell, wo, value, arry ) {
+		output : function( $cell, c, value, arry ) {
 			// get mask from cell data-attribute: data-math-mask="#,##0.00"
-			var mask = $cell.attr( 'data-' + wo.math_data + '-mask' ) || wo.math_mask,
+			var $el,
+				wo = c.widgetOptions,
+				changed = false,
+				prev = $cell.html(),
+				mask = $cell.attr( 'data-' + wo.math_data + '-mask' ) || wo.math_mask,
 				result = ts.formatMask( mask, value, wo.math_wrapPrefix, wo.math_wrapSuffix );
 			if ( typeof wo.math_complete === 'function' ) {
 				result = wo.math_complete( $cell, wo, result, value, arry );
 			}
 			if ( result !== false ) {
+				changed = prev !== result;
 				$cell.html( result );
 			}
+			// check if in a regular tbody, otherwise don't pass a changed flag
+			// to prevent unnecessary updating of the table cache
+			if ( changed ) {
+				$el = $cell.closest( 'tbody' );
+				// content was changed in a tfoot, info-only tbody or the resulting tbody is in a nested table
+				// then don't signal a change
+				if ( !$el.length || $el.hasClass( c.cssInfoBlock ) || $el.parent()[0] !== c.table ) {
+					return false;
+				}
+			}
+			return changed;
 		}
 
 	};
@@ -525,20 +599,24 @@
 		},
 		init : function( table, thisWidget, c, wo ) {
 			// filterEnd fires after updateComplete
-			var update = ts.hasWidget( table, 'filter' ) ? 'filterEnd' : 'updateComplete';
+			var update = ( ts.hasWidget( table, 'filter' ) ? 'filterEnd' : 'updateComplete' ) + '.tsmath';
+			// filterEnd is when the pager hides rows... so bind to pagerComplete
+			math.events += ( ts.hasWidget( table, 'pager' ) ? 'pagerComplete' : 'filterEnd' ) + '.tsmath ';
 			c.$table
-				.off( ( math.events + ' updateComplete.tsmath ' + wo.math_event ).replace( /\s+/g, ' ' ) )
-				.on( math.events + ' ' + wo.math_event, function( e ) {
+				.off( ( math.events + 'updateComplete.tsmath ' + wo.math_event ).replace( /\s+/g, ' ' ) )
+				.on( math.events + wo.math_event, function( e ) {
+					if ( !this.hasInitialized ) { return; }
 					var init = e.type === 'tablesorter-initialized';
 					if ( !wo.math_isUpdating || init ) {
-						if ( !/filter/.test( e.type ) ) {
+						// don't setColumnIndexes on init here, or it gets done twice
+						if ( !/filter/.test( e.type ) && !init ) {
 							// redo data-column indexes on update
-							math.setColumnIndexes( c ) ;
+							math.setColumnIndexes( c );
 						}
 						math.recalculate( c, wo, init );
 					}
 				})
-				.on( update + '.tsmath', function() {
+				.on( update, function() {
 					setTimeout( function(){
 						math.updateComplete( c );
 					}, 40 );