jquery-tablesorter 1.18.5 → 1.19.0

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-globalize.js

@@ -1,24 +1,35 @@
-/*! Parser: jQuery Globalize - updated 5/17/2015 (v2.22.0) */
+/*! Parser: jQuery Globalize - updated 11/2/2015 (v2.24.1) */
 /* Extract localized data using jQuery's Globalize parsers; set
- Globalize.locale( 'xx' ) prior to initializing tablesorter! */
-/*jshint jquery:true */
+ Globalize.locale( 'xx' ) in the globalize settings */
+/*jshint jquery:true, newcap: false */
 /*global Globalize:false */
 ;( function( $ ) {
 	'use strict';
 
 	/*! jQuery Globalize date parser (https://github.com/jquery/globalize#date-module) */
-	/* demo: http://jsfiddle.net/Mottie/0j18Lw8r/ */
 	$.tablesorter.addParser({
 		id: 'globalize-date',
 		is: function () {
 			return false;
 		},
 		format: function ( str, table, cell, cellIndex ) {
-			var c = table.config,
-			// add options to 'config.globalize' for all columns --> globalize : { skeleton: 'GyMMMd' }
-			// or per column by using the column index --> globalize : { 0 : { datetime: 'medium' } }
-			options = c.globalize && ( c.globalize[ cellIndex ] || c.globalize ) || {},
-			date = Globalize && Globalize.dateParser ? Globalize.dateParser( options )( str ) :
+			var globalize, date,
+				c = table.config,
+				// add options to 'config.globalize' for all columns --> globalize : { skeleton: 'GyMMMd' }
+				// or per column by using the column index --> globalize : { 0 : { datetime: 'medium' } }
+				options = c.globalize && ( c.globalize[ cellIndex ] || c.globalize ) || {};
+			if ( Globalize ) {
+				globalize = typeof options.Globalize === 'object' ?
+					// initialized Globalize object
+					options.Globalize :
+					// Globalize initialized from "lang" option
+					Globalize( options.lang || 'en' );
+				if ( !options.Globalize ) {
+					// cache the object
+					options.Globalize = globalize;
+				}
+			}
+			date = globalize && globalize.dateParser ? globalize.dateParser( options )( str ) :
 				str ? new Date( str ) : str;
 			return date instanceof Date && isFinite( date ) ? date.getTime() : str;
 		},
@@ -26,18 +37,29 @@
 	});
 
 	/*! jQuery Globalize number parser (https://github.com/jquery/globalize#number-module) */
-	/* demo: http://jsfiddle.net/Mottie/0j18Lw8r/ */
 	$.tablesorter.addParser({
 		id: 'globalize-number',
 		is: function () {
 			return false;
 		},
 		format: function ( str, table, cell, cellIndex ) {
-			var c = table.config,
-			// add options to 'config.globalize' for all columns --> globalize : { skeleton: 'GyMMMd' }
-			// or per column by using the column index --> globalize : { 0 : { datetime: 'medium' } }
-			options = c.globalize && ( c.globalize[ cellIndex ] || c.globalize ) || {},
-			num = Globalize && Globalize.numberParser ? Globalize.numberParser( options )( str ) :
+			var globalize, num,
+				c = table.config,
+				// add options to 'config.globalize' for all columns --> globalize : { skeleton: 'GyMMMd' }
+				// or per column by using the column index --> globalize : { 0 : { datetime: 'medium' } }
+				options = c.globalize && ( c.globalize[ cellIndex ] || c.globalize ) || {};
+			if ( Globalize ) {
+				globalize = typeof options.Globalize === 'object' ?
+					// initialized Globalize object
+					options.Globalize :
+					// Globalize initialized from "lang" option
+					Globalize( options.lang || 'en' );
+				if ( !options.Globalize ) {
+					// cache the object
+					options.Globalize = globalize;
+				}
+			}
+			num = globalize && globalize.numberParser ? globalize.numberParser( options )( str ) :
 				str ? $.tablesorter.formatFloat( ( str || '' ).replace( /[^\w,. \-()]/g, '' ), table ) : str;
 			return str && typeof num === 'number' ? num : str;
 		},

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-input-select.js

@@ -1,4 +1,4 @@
-/*! Parser: input & select - updated 8/17/2015 (v2.23.0) *//*
+/*! Parser: input & select - updated 10/31/2015 (v2.24.0) *//*
  * for jQuery 1.7+ & tablesorter 2.7.11+
  * Demo: http://mottie.github.com/tablesorter/docs/example-widget-grouping.html
  */
@@ -175,12 +175,12 @@
 						return;
 					}
 					// ignore change event if nothing changed
-					if ( val !== $target.data( 'ts-original-value' ) || event.target.type === 'checkbox' ) {
+					if ( c && val !== $target.data( 'ts-original-value' ) || event.target.type === 'checkbox' ) {
 						$target.data( 'ts-original-value', val );
 						// pass undefined resort value so it falls back to config.resort setting
-						$table.trigger( 'updateCell', [ $cell, undef, function() {
+						$.tablesorter.updateCell( c, $cell, undef, function() {
 							updateServer( event, $table, $target );
-						} ]);
+						});
 					}
 				}
 			});

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

@@ -1,4 +1,4 @@
-/* Widget: chart (beta) - updated 2/7/2015 (v2.19.0) *//*
+/* Widget: chart (beta) - updated 10/31/2015 (v2.24.0) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  */
 /*jshint browser:true, jquery:true, unused:false */
@@ -213,7 +213,7 @@
 					}
 
 					if (value !== false) {
-						if ( /s/i.test( '' + wo.chart_layout[row.length] ) ) {
+						if ( /s/i.test( '' + wo.chart_layout[indx] ) ) {
 							row.push( value );
 							chart_series[objIndex].data.push( value );
 							chart_dataset[objIndex].data.push( value );

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

@@ -1,4 +1,4 @@
-/* Widget: columnSelector (responsive table widget) - updated 8/23/2015 (v2.23.2) *//*
+/* Widget: columnSelector (responsive table widget) - updated 10/31/2015 (v2.24.0) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Justin Hallett & Rob Garrison
  */
@@ -35,6 +35,7 @@
 			colSel.$breakpoints = $('<style></style>').prop('disabled', true).appendTo('head');
 
 			colSel.isInitializing = true;
+			tsColSel.setUpColspan(c, wo);
 			tsColSel.setupSelector(c, wo);
 
 			if (wo.columnSelector_mediaquery) {
@@ -103,10 +104,11 @@
 				tsColSel.updateBreakpoints(c, wo);
 				tsColSel.updateCols(c, wo);
 			}
+			tsColSel.adjustColspans( c, wo );
 		},
 
 		setupSelector: function(c, wo) {
-			var name,
+			var index, name, $header, priority, col, colId,
 				colSel = c.selector,
 				$container = colSel.$container,
 				useStorage = wo.columnSelector_saveColumns && ts.storage,
@@ -121,18 +123,19 @@
 			colSel.$wrapper = [];
 			colSel.$checkbox = [];
 			// populate the selector container
-			c.$table.children('thead').find('tr:first th', c.table).each(function() {
-				var $this = $(this),
-					// if no data-priority is assigned, default to 1, but don't remove it from the selector list
-					priority = $this.attr(wo.columnSelector_priority) || 1,
-					colId = $this.attr('data-column'),
-					state = ts.getData(this, c.headers[colId], 'columnSelector');
+			for ( index = 0; index < c.columns; index++ ) {
+				$header = c.$headerIndexed[ index ];
+				// if no data-priority is assigned, default to 1, but don't remove it from the selector list
+				priority = $header.attr(wo.columnSelector_priority) || 1;
+				colId = $header.attr('data-column');
+				col = ts.getColumnData( c.table, c.headers, colId );
+				state = ts.getData( $header, col, 'columnSelector');
 
 				// if this column not hidable at all
 				// include getData check (includes 'columnSelector-false' class, data attribute, etc)
 				if ( isNaN(priority) && priority.length > 0 || state === 'disable' ||
 					( wo.columnSelector_columns[colId] && wo.columnSelector_columns[colId] === 'disable') ) {
-					return true; // goto next
+					continue; // goto next
 				}
 
 				// set default state; storage takes priority
@@ -142,7 +145,7 @@
 				colSel.$column[colId] = $(this);
 
 				// set default col title
-				name = $this.attr(wo.columnSelector_name) || $this.text();
+				name = $header.attr(wo.columnSelector_name) || $header.text();
 				if ($container.length) {
 					colSel.$wrapper[colId] = $(wo.columnSelector_layout.replace(/\{name\}/g, name)).appendTo($container);
 					colSel.$checkbox[colId] = colSel.$wrapper[colId]
@@ -152,15 +155,17 @@
 						.toggleClass( wo.columnSelector_cssChecked, colSel.states[colId] )
 						.prop('checked', colSel.states[colId])
 						.on('change', function(){
-							colSel.states[colId] = this.checked;
+							// ensure states is accurate
+							var colId = $(this).attr('data-column');
+							c.selector.states[colId] = this.checked;
 							tsColSel.updateCols(c, wo);
 						}).change();
 				}
-			});
+			}
 
 		},
 
-		setupBreakpoints: function(c, wo){
+		setupBreakpoints: function(c, wo) {
 			var colSel = c.selector;
 
 			// add responsive breakpoints
@@ -222,14 +227,25 @@
 			if (wo.columnSelector_saveColumns && ts.storage) {
 				ts.storage( c.$table[0], 'tablesorter-columnSelector-auto', { auto : colSel.auto } );
 			}
+			tsColSel.adjustColspans( c, wo );
 			// trigger columnUpdate if auto is true (it gets skipped in updateCols()
 			if (colSel.auto) {
 				c.$table.trigger(wo.columnSelector_updated);
 			}
 		},
-
+		addSelectors: function( prefix, column ) {
+			var array = [],
+				temp = ' col:nth-child(' + column + ')';
+			array.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
+			temp = ' tr th:nth-child(' + column + ')';
+			array.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
+			temp = ' tr td:nth-child(' + column + ')';
+			array.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
+			return array;
+		},
 		updateBreakpoints: function(c, wo) {
-			var priority, column, breaks, temp,
+			var priority, col, column, breaks,
+				isHidden = [],
 				colSel = c.selector,
 				prefix = c.namespace + 'columnselector',
 				mediaAll = [],
@@ -239,19 +255,27 @@
 				colSel.$style.prop('disabled', false);
 				return;
 			}
-
+			if (wo.columnSelector_mediaqueryHidden) {
+				// add columns to be hidden; even when "auto" is set - see #964
+				for ( column = 0; column < c.columns; column++ ) {
+					col = ts.getColumnData( c.table, c.headers, column );
+					isHidden[ column + 1 ] = ts.getData( c.$headerIndexed[ column ], col, 'columnSelector' ) === 'false';
+					if ( isHidden[ column + 1 ] ) {
+						// hide columnSelector false column (in auto mode)
+						mediaAll = mediaAll.concat( tsColSel.addSelectors( prefix, column + 1 ) );
+					}
+				}
+			}
 			// only 6 breakpoints (same as jQuery Mobile)
 			for (priority = 0; priority < 6; priority++){
 				/*jshint loopfunc:true */
 				breaks = [];
 				c.$headers.filter('[' + wo.columnSelector_priority + '=' + (priority + 1) + ']').each(function(){
 					column = parseInt($(this).attr('data-column'), 10) + 1;
-					temp = ' col:nth-child(' + column + ')';
-					breaks.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
-					temp = ' tr th:nth-child(' + column + ')';
-					breaks.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
-					temp = ' tr td:nth-child(' + column + ')';
-					breaks.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
+					// don't reveal columnSelector false columns
+					if ( !isHidden[ column ] ) {
+						breaks = breaks.concat( tsColSel.addSelectors( prefix, column ) );
+					}
 				});
 				if (breaks.length) {
 					mediaAll = mediaAll.concat( breaks );
@@ -269,24 +293,18 @@
 					.html( tsColSel.queryAll.replace(/\[columns\]/g, mediaAll.join(',')) + breakpts );
 			}
 		},
-
 		updateCols: function(c, wo) {
 			if (wo.columnSelector_mediaquery && c.selector.auto || c.selector.isInitializing) {
 				return;
 			}
-			var column, temp,
+			var column,
 				colSel = c.selector,
 				styles = [],
 				prefix = c.namespace + 'columnselector';
 			colSel.$container.find('input[data-column]').filter('[data-column!="auto"]').each(function(){
 				if (!this.checked) {
 					column = parseInt( $(this).attr('data-column'), 10 ) + 1;
-					temp = ' col:nth-child(' + column + ')';
-					styles.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
-					temp = ' tr th:nth-child(' + column + ')';
-					styles.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
-					temp = ' tr td:nth-child(' + column + ')';
-					styles.push(prefix + temp + ',' + prefix + '_extra_table' + temp);
+					styles = styles.concat( tsColSel.addSelectors( prefix, column ) );
 				}
 				$(this).toggleClass( wo.columnSelector_cssChecked, this.checked );
 			});
@@ -299,9 +317,71 @@
 			if (wo.columnSelector_saveColumns && ts.storage) {
 				ts.storage( c.$table[0], 'tablesorter-columnSelector', colSel.states );
 			}
+			tsColSel.adjustColspans( c, wo );
 			c.$table.trigger(wo.columnSelector_updated);
 		},
 
+		setUpColspan: function(c, wo) {
+			var index, span, nspace,
+				$window = $( window ),
+				hasSpans = false,
+				$cells = c.$table
+					.add( $(c.namespace + '_extra_table') )
+					.children('thead, tfoot')
+					.children('tr')
+					.children('th, td'),
+				len = $cells.length;
+			for ( index = 0; index < len; index++ ) {
+				span = $cells[ index ].colSpan;
+				if ( span > 1 ) {
+					hasSpans = true;
+					$cells.eq( index )
+						.addClass( c.namespace.slice( 1 ) + 'columnselectorHasSpan' )
+						.attr( 'data-col-span', span );
+				}
+			}
+			// only add resize end if using media queries
+			if ( hasSpans && wo.columnSelector_mediaquery ) {
+				nspace = c.namespace.slice( 1 ) + 'columnselector';
+				// Setup window.resizeEnd event
+				$window
+					.off( nspace )
+					.on( 'resize' + nspace, ts.window_resize )
+					.on( 'resizeEnd' + nspace, function() {
+						// IE calls resize when you modify content, so we have to unbind the resize event
+						// so we don't end up with an infinite loop. we can rebind after we're done.
+						$window.off( 'resize' + nspace, ts.window_resize );
+						tsColSel.adjustColspans( c, wo );
+						$window.on( 'resize' + nspace, ts.window_resize );
+					});
+			}
+		},
+		adjustColspans: function(c, wo) {
+			var index, cols, col, span, end,
+				colSel = c.selector,
+				autoModeOn = colSel.auto,
+				$colspans = $( c.namespace + 'columnselectorHasSpan' ),
+				len = $colspans.length;
+			if ( len ) {
+				for ( index = 0; index < len; index++ ) {
+					col = parseInt( $colspans.eq(index).attr('data-column'), 10 );
+					span = parseInt( $colspans.eq(index).attr('data-col-span'), 10 );
+					end = col + span;
+					for ( cols = col; cols < end; cols++ ) {
+						if ( !autoModeOn && colSel.states[ cols ] === false ||
+							autoModeOn && c.$headerIndexed[ cols ] && !c.$headerIndexed[ cols ].is(':visible') ) {
+							span--;
+						}
+					}
+					if ( span ) {
+						$colspans.eq(index).show()[0].colSpan = span;
+					} else {
+						$colspans.eq(index).hide();
+					}
+				}
+			}
+		},
+
 		attachTo : function(table, elm) {
 			table = $(table)[0];
 			var colSel, wo, indx,
@@ -336,6 +416,16 @@
 
 	};
 
+	/* Add window resizeEnd event (also used by scroller widget) */
+	ts.window_resize = function() {
+		if ( ts.timer_resize ) {
+			clearTimeout( ts.timer_resize );
+		}
+		ts.timer_resize = setTimeout( function() {
+			$( window ).trigger( 'resizeEnd' );
+		}, 250 );
+	};
+
 	ts.addWidget({
 		id: 'columnSelector',
 		priority: 10,
@@ -360,6 +450,8 @@
 			columnSelector_mediaqueryName: 'Auto: ',
 			// breakpoints checkbox initial setting
 			columnSelector_mediaqueryState: true,
+			// hide columnSelector false columns while in auto mode
+			columnSelector_mediaqueryHidden: false,
 			// responsive table hides columns with priority 1-6 at these breakpoints
 			// see http://view.jquerymobile.com/1.3.2/dist/demos/widgets/table-column-toggle/#Applyingapresetbreakpoint
 			// *** set to false to disable ***

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

@@ -1,4 +1,4 @@
-/*! Widget: editable - updated 8/17/2015 (v2.23.0) *//*
+/*! Widget: editable - updated 10/31/2015 (v2.24.0) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -193,7 +193,9 @@
 					}
 					if ( e.which === 27 ) {
 						// user cancelled
-						$this.html( $this.data( 'original' ) ).trigger( 'blur' + namespace );
+						$this
+							.html( $this.data( 'original' ) )
+							.trigger( 'blur' + namespace );
 						c.$table.data( 'contentFocused', false );
 						c.table.isUpdating = false;
 						return false;
@@ -220,17 +222,17 @@
 								.data( 'before', valid )
 								.data( 'original', valid )
 								.trigger( 'change' );
-							c.$table.trigger( 'updateCell', [ $this.closest( 'td' ), false, function() {
+							$.tablesorter.updateCell( c, $this.closest( 'td' ), false, function() {
 								if ( wo.editable_autoResort ) {
 									setTimeout( function() {
-										c.$table.trigger( 'sorton', [ c.sortList, function() {
+										$.tablesorter.sortOn( c, c.sortList, function() {
 											tse.editComplete( c, wo, c.$table.data( 'contentFocused' ), true );
-										}, 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.js

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 10/4/2015 (v2.23.5) *//*
+/*! Widget: filter - updated 10/31/2015 (v2.24.0) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -567,8 +567,9 @@
 		// $cell parameter, but not the config, is passed to the filter_formatters,
 		// so we have to work with it instead
 		formatterUpdated: function( $cell, column ) {
-			var wo = $cell.closest( 'table' )[0].config.widgetOptions;
-			if ( !wo.filter_initialized ) {
+			// prevent error if $cell is undefined - see #1056
+			var wo = $cell && $cell.closest( 'table' )[0].config.widgetOptions;
+			if ( wo && !wo.filter_initialized ) {
 				// add updates by column since this function
 				// may be called numerous times before initialization
 				wo.filter_formatterInit[ column ] = 1;
@@ -605,6 +606,16 @@
 				}
 			}
 		},
+		// encode or decode filters for storage; see #1026
+		processFilters: function( filters, encode ) {
+			var indx,
+				mode = encode ? encodeURIComponent : decodeURIComponent,
+				len = filters.length;
+			for ( indx = 0; indx < len; indx++ ) {
+				filters[ indx ] = mode( filters[ indx ] );
+			}
+			return filters;
+		},
 		setDefaults: function( table, c, wo ) {
 			var isArray, saved, indx, col, $filters,
 				// get current ( default ) filters
@@ -614,7 +625,7 @@
 				isArray = $.isArray( saved );
 				// make sure we're not just getting an empty array
 				if ( !( isArray && saved.join( '' ) === '' || !isArray ) ) {
-					filters = saved;
+					filters = tsf.processFilters( saved );
 				}
 			}
 			// if no filters saved, then check default settings
@@ -637,71 +648,81 @@
 			return parsed ? c.parsers[column].format( filter, c.table, [], column ) : filter;
 		},
 		buildRow: function( table, c, wo ) {
-			var col, column, $header, makeSelect, disabled, name, ffxn, tmp,
+			var $filter, col, column, $header, makeSelect, disabled, name, ffxn, tmp,
 				// c.columns defined in computeThIndexes()
 				cellFilter = wo.filter_cellFilter,
 				columns = c.columns,
 				arry = $.isArray( cellFilter ),
 				buildFilter = '<tr role="row" class="' + tscss.filterRow + ' ' + c.cssIgnoreRow + '">';
 			for ( column = 0; column < columns; column++ ) {
-				buildFilter += '<td';
-				if ( arry ) {
-					buildFilter += ( cellFilter[ column ] ? ' class="' + cellFilter[ column ] + '"' : '' );
-				} else {
-					buildFilter += ( cellFilter !== '' ? ' class="' + cellFilter + '"' : '' );
+				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 + '"';
+					}
+					if ( arry ) {
+						buildFilter += ( cellFilter[ column ] ? ' class="' + cellFilter[ column ] + '"' : '' );
+					} else {
+						buildFilter += ( cellFilter !== '' ? ' class="' + cellFilter + '"' : '' );
+					}
+					buildFilter += '></td>';
 				}
-				buildFilter += '></td>';
 			}
 			c.$filters = $( buildFilter += '</tr>' )
 				.appendTo( c.$table.children( 'thead' ).eq( 0 ) )
-				.find( 'td' );
+				.children( 'td' );
 			// build each filter input
 			for ( column = 0; column < columns; column++ ) {
 				disabled = false;
 				// assuming last cell of a column is the main column
 				$header = c.$headerIndexed[ column ];
-				ffxn = ts.getColumnData( table, wo.filter_functions, column );
-				makeSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
-					$header.hasClass( 'filter-select' );
-				// get data from jQuery data, metadata, headers option or header class name
-				col = ts.getColumnData( table, c.headers, column );
-				disabled = ts.getData( $header[0], col, 'filter' ) === 'false' ||
-					ts.getData( $header[0], col, 'parser' ) === 'false';
+				if ( $header && $header.length ) {
+					$filter = c.$filters.filter( '[data-column="' + column + '"]' );
+					ffxn = ts.getColumnData( table, wo.filter_functions, column );
+					makeSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
+						$header.hasClass( 'filter-select' );
+					// get data from jQuery data, metadata, headers option or header class name
+					col = ts.getColumnData( table, c.headers, column );
+					disabled = ts.getData( $header[0], col, 'filter' ) === 'false' ||
+						ts.getData( $header[0], col, 'parser' ) === 'false';
 
-				if ( makeSelect ) {
-					buildFilter = $( '<select>' ).appendTo( c.$filters.eq( column ) );
-				} else {
-					ffxn = ts.getColumnData( table, wo.filter_formatter, column );
-					if ( ffxn ) {
-						wo.filter_formatterCount++;
-						buildFilter = ffxn( c.$filters.eq( column ), column );
-						// no element returned, so lets go find it
-						if ( buildFilter && buildFilter.length === 0 ) {
-							buildFilter = c.$filters.eq( column ).children( 'input' );
+					if ( makeSelect ) {
+						buildFilter = $( '<select>' ).appendTo( $filter );
+					} else {
+						ffxn = ts.getColumnData( table, wo.filter_formatter, column );
+						if ( ffxn ) {
+							wo.filter_formatterCount++;
+							buildFilter = ffxn( $filter, column );
+							// no element returned, so lets go find it
+							if ( buildFilter && buildFilter.length === 0 ) {
+								buildFilter = $filter.children( 'input' );
+							}
+							// element not in DOM, so lets attach it
+							if ( buildFilter && ( buildFilter.parent().length === 0 ||
+								( buildFilter.parent().length && buildFilter.parent()[0] !== $filter[0] ) ) ) {
+								$filter.append( buildFilter );
+							}
+						} else {
+							buildFilter = $( '<input type="search">' ).appendTo( $filter );
 						}
-						// element not in DOM, so lets attach it
-						if ( buildFilter && ( buildFilter.parent().length === 0 ||
-							( buildFilter.parent().length && buildFilter.parent()[0] !== c.$filters[column] ) ) ) {
-							c.$filters.eq( column ).append( buildFilter );
+						if ( buildFilter ) {
+							tmp = $header.data( 'placeholder' ) ||
+								$header.attr( 'data-placeholder' ) ||
+								wo.filter_placeholder.search || '';
+							buildFilter.attr( 'placeholder', tmp );
 						}
-					} else {
-						buildFilter = $( '<input type="search">' ).appendTo( c.$filters.eq( column ) );
 					}
 					if ( buildFilter ) {
-						tmp = $header.data( 'placeholder' ) ||
-							$header.attr( 'data-placeholder' ) ||
-							wo.filter_placeholder.search || '';
-						buildFilter.attr( 'placeholder', tmp );
-					}
-				}
-				if ( buildFilter ) {
-					// add filter class name
-					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 );
-					if ( disabled ) {
-						buildFilter.attr( 'placeholder', '' ).addClass( tscss.filterDisabled )[0].disabled = true;
+						// add filter class name
+						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 );
+						if ( disabled ) {
+							buildFilter.attr( 'placeholder', '' ).addClass( tscss.filterDisabled )[0].disabled = true;
+						}
 					}
 				}
 			}
@@ -791,9 +812,9 @@
 			if ( $.isEmptyObject( c.cache ) ) {
 				// update cache if delayInit set & pager has initialized ( after user initiates a search )
 				if ( c.delayInit && c.pager && c.pager.initialized ) {
-					c.$table.trigger( 'updateCache', [ function() {
+					ts.updateCache( c, function() {
 						tsf.checkFilters( table, false, skipFirst );
-					} ] );
+					});
 				}
 				return;
 			}
@@ -831,10 +852,10 @@
 				return false;
 			}
 		},
-		hideFilters: function( c ) {
-			var timer;
-			c.$table
-				.find( '.' + tscss.filterRow )
+		hideFilters: function( c, $table ) {
+			var timer,
+				$row = ( $table || c.$table ).find( '.' + tscss.filterRow ).addClass( tscss.filterRowHide );
+			$row
 				.bind( 'mouseenter mouseleave', function( e ) {
 					// save event object - http://bugs.jquery.com/ticket/12140
 					var event = e,
@@ -1251,7 +1272,7 @@
 								// ( '> -10' => '> -100' will ignore hidden rows )
 								!( regex.isNeg1.test( val ) || regex.isNeg2.test( val ) ) &&
 								// if filtering using a select without a 'filter-match' class ( exact match ) - fixes #593
-								!( val !== '' && c.$filters && c.$filters.eq( indx ).find( 'select' ).length &&
+								!( val !== '' && c.$filters && c.$filters.filter( '[data-column="' + indx + '"]' ).find( 'select' ).length &&
 									!c.$headerIndexed[indx].hasClass( 'filter-match' ) );
 						}
 					}
@@ -1358,7 +1379,7 @@
 			c.lastSearch = storedFilters;
 			c.$table.data( 'lastSearch', storedFilters );
 			if ( wo.filter_saveFilters && ts.storage ) {
-				ts.storage( table, 'tablesorter-filters', storedFilters );
+				ts.storage( table, 'tablesorter-filters', tsf.processFilters( storedFilters, true ) );
 			}
 			if ( c.debug ) {
 				console.log( 'Completed filter widget search' + ts.benchmark(time) );
@@ -1367,7 +1388,7 @@
 				c.$table.trigger( 'filterEnd', c );
 			}
 			setTimeout( function() {
-				c.$table.trigger( 'applyWidgets' ); // make sure zebra widget is applied
+				ts.applyWidget( c.table ); // make sure zebra widget is applied
 			}, 0 );
 		},
 		getOptionSource: function( table, column, onlyAvail ) {