jquery-tablesorter 1.12.7 → 1.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c455a0bdd1d4c20268962380df23e8f5ddfb9a4
-  data.tar.gz: a7f4ee044f7c9fdd6c0cdd3e212e3c9e4937c523
+  metadata.gz: 3f537540ad9cb3ae7519f0ede00b10a967df49b5
+  data.tar.gz: 4e043ff89f30abfa0bb964799a352dbe63d61b81
 SHA512:
-  metadata.gz: a4a42e44805dc3e79d49dbfb1d9ab46331ff5c18861fb8833cf4db60566e4a2c5f75bbc71fca95267b2367fdb546482304826c05902463eb2235f5fe9c024f59
-  data.tar.gz: 33b80af01864c6858f1e9dd8c65726683be68ed68f7338fe6265a2c46765863bb5456521fa2c92baad05287087f1a0db4d979810bfc0e2ef4f4c001755387a6d
+  metadata.gz: a1ee4421ddd5364f2f8471cdfa0ca6c1a9ef3794f53721092a859236b7492e756c3a925a7e9d4e6c5bc2725d2d8ba29be917ff82c9bb85972c218090ad54bf1a
+  data.tar.gz: c71c7fd64e88115f2a3fb66a3205c050001c4da2cfed4cf0a1178a4a18932d2ede7d40cc0b43b2ae25cfa3d1ad9e21bc32880acf0ceb5f001d2887817d54a4f3

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.17.7 (8/9/2014), [documentation]
+Current tablesorter version: 2.17.8 (9/15/2014), [documentation]
 
 Any issue associated 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.12.7'
+  VERSION = '1.12.8'
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 8/1/2014 (v2.17.6)
+ * updated 9/15/2014 (v2.17.8)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -58,13 +58,16 @@
 			// 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
+			// 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,
 
+			// Number of options to include in the pager number selector
+			maxOptionSize: 20,
+
 			// Save pager page & size if the storage script is loaded (requires $.tablesorter.storage in jquery.tablesorter.widgets.js)
 			savePages: true,
 
@@ -186,10 +189,37 @@
 					if ( p.$goto.length ) {
 						t = '';
 						pg = Math.min( p.totalPages, p.filteredPages );
-						for ( i = 1; i <= pg; i++ ) {
-							t += '<option>' + i + '</option>';
+						// Filter the options page number link array if it's larger than 'maxOptionSize'
+						// as large page set links will slow the browser on large dom inserts
+						var skip_set_size = Math.floor(pg / p.maxOptionSize),
+						large_collection = pg > p.maxOptionSize,
+						current_page = p.page + 1,
+						start_page = 1,
+						end_page = pg,
+						option_pages = [];
+						//construct default options pages array
+						var option_pages_start_page = (large_collection && current_page == 1) ? skip_set_size : 1;
+						for (i = option_pages_start_page; i <= pg;) {
+ 							option_pages.push(i);
+							i = large_collection ? i + skip_set_size : i++;
+ 						}
+						if (large_collection) {
+							var central_focus_size = Math.floor(p.maxOptionSize / 2) - 1,
+							lower_focus_window = Math.abs(Math.floor(current_page - central_focus_size/2)),
+							focus_option_pages = [];
+							start_page = Math.min(current_page, lower_focus_window);
+							end_page = start_page + central_focus_size;
+							//construct an array to get a focus set around the current page
+							for (i = start_page; i <= end_page ; i++) focus_option_pages.push(i);
+							var insert_index = Math.floor(option_pages.length / 2) - Math.floor(focus_option_pages.length / 2);
+							Array.prototype.splice.apply(option_pages, [ insert_index, focus_option_pages.length ].concat(focus_option_pages));
+							option_pages.sort(function sortNumber(a,b) { return a - b; });
+						}
+						for ( i = 0; i < option_pages.length; i++) {
+							t += '<option>' + option_pages[i] + '</option>';
 						}
-						p.$goto.html(t).val( p.page + 1 );
+						p.$goto[0].innerHTML = t;
+						p.$goto[0].value = current_page;
 					}
 					// rebind startRow/page inputs
 					$out.find('.ts-startRow, .ts-page').unbind('change').bind('change', function(){
@@ -532,9 +562,8 @@
 			}
 			updatePageDisplay(table, p);
 			if ( !p.isDisabled ) { fixHeight(table, p); }
-			$t.trigger('applyWidgets');
 			if (table.isUpdating) {
-				$t.trigger("updateComplete", table);
+				$t.trigger('updateComplete', [ table, true ]);
 			}
 		},
 
@@ -553,6 +582,7 @@
 					.removeAttr('aria-describedby')
 					.find('tr.pagerSavedHeightSpacer').remove();
 				renderTable(table, table.config.rowsCopy, p);
+				$(table).trigger('applyWidgets');
 				if (table.config.debug) {
 					ts.log('pager disabled');
 				}
@@ -621,7 +651,7 @@
 					.trigger('pageMoved', p)
 					.trigger('applyWidgets');
 				if (table.isUpdating) {
-					$t.trigger('updateComplete');
+					$t.trigger('updateComplete', [ table, true ]);
 				}
 			}
 		},
@@ -751,7 +781,7 @@
 				p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.replace(/^(\w+\.)/g,'') + '|' + c.cssChildRow + ')');
 
 				$t
-					.unbind('filterStart filterEnd sortEnd disable enable destroy update updateRows updateAll addRows pageSize '.split(' ').join('.pager '))
+					.unbind('filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize '.split(' ').join('.pager '))
 					.bind('filterStart.pager', function(e, filters) {
 						p.currentFilters = filters;
 						// don't change page is filters are the same (pager updating, etc)
@@ -769,6 +799,7 @@
 							// update page display first, so we update p.filteredPages
 							updatePageDisplay(table, p, false);
 							moveToPage(table, p, false);
+							c.$table.trigger('applyWidgets');
 							fixHeight(table, p);
 						}
 					})
@@ -784,12 +815,18 @@
 						e.stopPropagation();
 						destroyPager(table, p);
 					})
-					.bind('update updateRows updateAll addRows '.split(' ').join('.pager '), function(e){
+					.bind('updateComplete.pager', function(e, table, triggered){
 						e.stopPropagation();
+						// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
+						if ( !table || triggered ) { return; }
 						fixHeight(table, p);
-						var $rows = c.$tbodies.eq(0).children('tr');
+						var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
 						p.totalRows = $rows.length - ( p.countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
 						p.totalPages = Math.ceil( p.totalRows / p.size );
+						if ($rows.length && c.rowsCopy && c.rowsCopy.length === 0) {
+							// make a copy of all table rows once the cache has been built
+							updateCache(table);
+						}
 						updatePageDisplay(table, p);
 						hideRows(table, p);
 					})

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.17.7 - Client-side table sorting with ease!
+* TableSorter 2.17.8 - 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.17.7";
+			ts.version = "2.17.8";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -246,9 +246,9 @@
 							p = ts.getParserById( ts.getData(h, ch, 'sorter') );
 							np = ts.getData(h, ch, 'parser') === 'false';
 							// empty cells behaviour - keeping emptyToBottom for backwards compatibility
-							c.empties[i] = ts.getData(h, ch, 'empty') || c.emptyTo || (c.emptyToBottom ? 'bottom' : 'top' );
+							c.empties[i] = ( ts.getData(h, ch, 'empty') || c.emptyTo || (c.emptyToBottom ? 'bottom' : 'top' ) ).toLowerCase();
 							// text strings behaviour in numerical sorts
-							c.strings[i] = ts.getData(h, ch, 'string') || c.stringTo || 'max';
+							c.strings[i] = ( ts.getData(h, ch, 'string') || c.stringTo || 'max' ).toLowerCase();
 							if (np) {
 								p = ts.getParserById('no-parser');
 							}
@@ -447,14 +447,16 @@
 					ch = ts.getColumnData( table, c.headers, index, true );
 					// save original header content
 					c.headerContent[index] = $(this).html();
-					// set up header template
-					t = c.headerTemplate.replace(/\{content\}/g, $(this).html()).replace(/\{icon\}/g, i);
-					if (c.onRenderTemplate) {
-						h = c.onRenderTemplate.apply($t, [index, t]);
-						if (h && typeof h === 'string') { t = h; } // only change t if something is returned
+					// if headerTemplate is empty, don't reformat the header cell
+					if ( c.headerTemplate !== '' ) {
+						// set up header template
+						t = c.headerTemplate.replace(/\{content\}/g, $(this).html()).replace(/\{icon\}/g, i);
+						if (c.onRenderTemplate) {
+							h = c.onRenderTemplate.apply($t, [index, t]);
+							if (h && typeof h === 'string') { t = h; } // only change t if something is returned
+						}
+						$(this).html('<div class="' + ts.css.headerIn + '">' + t + '</div>'); // faster than wrapInner
 					}
-					$(this).html('<div class="' + ts.css.headerIn + '">' + t + '</div>'); // faster than wrapInner
-
 					if (c.onRenderHeader) { c.onRenderHeader.apply($t, [index]); }
 					this.column = parseInt( $(this).attr('data-column'), 10);
 					this.order = formatSortingOrder( ts.getData($t, ch, 'sortInitialOrder') || c.sortInitialOrder ) ? [1,0,2] : [0,1,2];
@@ -560,14 +562,16 @@
 
 			// automatically add col group, and column sizes if set
 			function fixColumnWidth(table) {
-				if (table.config.widthFixed && $(table).find('colgroup').length === 0) {
-					var colgroup = $('<colgroup>'),
-						overallWidth = $(table).width();
+				var colgroup, overallWidth,
+					c = table.config;
+				if (c.widthFixed && c.$table.find('colgroup').length === 0) {
+					colgroup = $('<colgroup>');
+					overallWidth = $(table).width();
 					// only add col for visible columns - fixes #371
-					$(table.tBodies[0]).find("tr:first").children(":visible").each(function() {
+					$(table.tBodies).not('.' + c.cssInfoBlock).find("tr:first").children(":visible").each(function() {
 						colgroup.append($('<col>').css('width', parseInt(($(this).width()/overallWidth)*1000, 10)/10 + '%'));
 					});
-					$(table).prepend(colgroup);
+					c.$table.prepend(colgroup);
 				}
 			}
 
@@ -798,7 +802,7 @@
 			function resortComplete($table, callback){
 				var table = $table[0];
 				if (table.isUpdating) {
-					$table.trigger('updateComplete');
+					$table.trigger('updateComplete', table);
 				}
 				if ($.isFunction(callback)) {
 					callback($table[0]);
@@ -1047,7 +1051,10 @@
 					return (version[0] > 1) || (version[0] === 1 && parseInt(version[1], 10) >= 4);
 				})($.fn.jquery.split("."));
 				// digit sort text location; keeping max+/- for backwards compatibility
-				c.string = { 'max': 1, 'min': -1, 'emptyMin': 1, 'emptyMax': -1, 'zero': 0, 'none': 0, 'null': 0, 'top': true, 'bottom': false };
+				c.string = { 'max': 1, 'min': -1, 'emptymin': 1, 'emptymax': -1, 'zero': 0, 'none': 0, 'null': 0, 'top': true, 'bottom': false };
+				// ensure case insensitivity
+				c.emptyTo = c.emptyTo.toLowerCase();
+				c.stringTo = c.stringTo.toLowerCase();
 				// add table theme class only if there isn't already one there
 				if (!/tablesorter\-/.test($table.attr('class'))) {
 					k = (c.theme !== '' ? ' tablesorter-' + c.theme : '');
@@ -1761,6 +1768,7 @@
 		format: function(s) {
 			return s ? $.trim(s.replace(/(https?|ftp|file):\/\//, '')) : s;
 		},
+		parsed : true, // filter widget flag
 		type: "text"
 	});
 
@@ -1853,7 +1861,7 @@
 		id: "zebra",
 		priority: 90,
 		format: function(table, c, wo) {
-			var $tb, $tv, $tr, row, even, time, k, l,
+			var $tb, $tv, $tr, row, even, time, k,
 			child = new RegExp(c.cssChildRow, 'i'),
 			b = c.$tbodies;
 			if (c.debug) {
@@ -1861,21 +1869,18 @@
 			}
 			for (k = 0; k < b.length; k++ ) {
 				// loop through the visible rows
+				row = 0;
 				$tb = b.eq(k);
-				l = $tb.children('tr').length;
-				if (l > 1) {
-					row = 0;
-					$tv = $tb.children('tr:visible').not(c.selectorRemove);
-					// revered back to using jQuery each - strangely it's the fastest method
-					/*jshint loopfunc:true */
-					$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(wo.zebra[even ? 1 : 0]).addClass(wo.zebra[even ? 0 : 1]);
-					});
-				}
+				$tv = $tb.children('tr:visible').not(c.selectorRemove);
+				// revered back to using jQuery each - strangely it's the fastest method
+				/*jshint loopfunc:true */
+				$tv.each(function(){
+					$tr = $(this);
+					// style child rows the same way the parent row was styled
+					if (!child.test(this.className)) { row++; }
+					even = (row % 2 === 0);
+					$tr.removeClass(wo.zebra[even ? 1 : 0]).addClass(wo.zebra[even ? 0 : 1]);
+				});
 			}
 			if (c.debug) {
 				ts.benchmark("Applying Zebra widget", time);

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.16+ widgets - updated 8/9/2014 (v2.17.7)
+/*! tableSorter 2.16+ widgets - updated 9/15/2014 (v2.17.8)
  *
  * Column Styles
  * Column Filters
@@ -245,7 +245,7 @@ ts.addWidget({
 			ts.benchmark("Applying " + theme + " theme", time);
 		}
 	},
-	remove: function(table, c, wo) {
+	remove: function(table, c) {
 		var $table = c.$table,
 			theme = c.theme || 'jui',
 			themes = ts.themes[ theme ] || ts.themes.jui,
@@ -354,6 +354,8 @@ ts.addWidget({
 		filter_childRows     : false, // if true, filter includes child row content in the search
 		filter_columnFilters : true,  // if true, a filter will be added to the top of each table column
 		filter_cssFilter     : '',    // css class name added to the filter row & each input in the row (tablesorter-filter is ALWAYS added)
+		filter_defaultFilter : {},    // add a default column filter type "~{query}" to make fuzzy searches default; "{q1} AND {q2}" to make all searches use a logical AND.
+		filter_excludeFilter : {},    // filters to exclude, per column
 		filter_external      : '',    // jQuery selector string (or jQuery object) of external filters
 		filter_filteredRow   : 'filtered', // class added to filtered rows; needed by pager plugin
 		filter_formatter     : null,  // add custom filter elements to the filter row
@@ -410,24 +412,25 @@ ts.filter = {
 		type      : /undefined|number/, // check type
 		exact     : /(^[\"|\'|=]+)|([\"|\'|=]+$)/g, // exact match (allow '==')
 		nondigit  : /[^\w,. \-()]/g, // replace non-digits (from digit & currency parser)
-		operators : /[<>=]/g // replace operators
+		operators : /[<>=]/g, // replace operators
+		query     : '(q|query)' // replace filter queries
 	},
-		// function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed )
-		// filter = array of filter input values; iFilter = same array, except lowercase
-		// exact = table cell text (or parsed data if column parser enabled)
-		// iExact = same as exact, except lowercase
-		// cached = table cell text from cache, so it has been parsed
-		// index = column index; table = table element (DOM)
-		// wo = widget options (table.config.widgetOptions)
-		// parsed = array (by column) of boolean values (from filter_useParsedData or "filter-parsed" class)
+		// function( c, data ) { }
+		// c = table.config
+		// data.filter = array of filter input values; data.iFilter = same array, except lowercase
+		// data.exact = table cell text (or parsed data if column parser enabled)
+		// data.iExact = same as data.exact, except lowercase
+		// data.cache = table cell text from cache, so it has been parsed
+		// data.index = column index; table = table element (DOM)
+		// data.parsed = array (by column) of boolean values (from filter_useParsedData or "filter-parsed" class)
 	types: {
 		// Look for regex
-		regex: function( filter, iFilter, exact, iExact ) {
-			if ( ts.filter.regex.regex.test(iFilter) ) {
+		regex: function( c, data ) {
+			if ( ts.filter.regex.regex.test(data.iFilter) ) {
 				var matches,
-					regex = ts.filter.regex.regex.exec(iFilter);
+					regex = ts.filter.regex.regex.exec(data.iFilter);
 				try {
-					matches = new RegExp(regex[1], regex[2]).test( iExact );
+					matches = new RegExp(regex[1], regex[2]).test( data.iExact );
 				} catch (error) {
 					matches = false;
 				}
@@ -436,27 +439,29 @@ ts.filter = {
 			return null;
 		},
 		// Look for operators >, >=, < or <=
-		operators: function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
-			if ( /^[<>]=?/.test(iFilter) ) {
+		operators: function( c, data ) {
+			if ( /^[<>]=?/.test(data.iFilter) ) {
 				var cachedValue, result,
-					c = table.config,
-					query = ts.formatFloat( iFilter.replace(ts.filter.regex.operators, ''), table ),
+					table = c.table,
+					index = data.index,
+					parsed = data.parsed[index],
+					query = ts.formatFloat( data.iFilter.replace(ts.filter.regex.operators, ''), table ),
 					parser = c.parsers[index],
 					savedSearch = query;
 				// parse filter value in case we're comparing numbers (dates)
-				if (parsed[index] || parser.type === 'numeric') {
-					result = ts.filter.parseFilter(table, $.trim('' + iFilter.replace(ts.filter.regex.operators, '')), index, parsed[index], true);
+				if (parsed || parser.type === 'numeric') {
+					result = ts.filter.parseFilter(c, $.trim('' + data.iFilter.replace(ts.filter.regex.operators, '')), index, parsed, true);
 					query = ( typeof result === "number" && result !== '' && !isNaN(result) ) ? result : query;
 				}
 
 				// iExact may be numeric - see issue #149;
 				// check if cached is defined, because sometimes j goes out of range? (numeric columns)
-				cachedValue = ( parsed[index] || parser.type === 'numeric' ) && !isNaN(query) && typeof cached !== 'undefined' ? cached :
-					isNaN(iExact) ? ts.formatFloat( iExact.replace(ts.filter.regex.nondigit, ''), table) :
-					ts.formatFloat( iExact, table );
+				cachedValue = ( parsed || parser.type === 'numeric' ) && !isNaN(query) && typeof data.cache !== 'undefined' ? data.cache :
+					isNaN(data.iExact) ? ts.formatFloat( data.iExact.replace(ts.filter.regex.nondigit, ''), table) :
+					ts.formatFloat( data.iExact, table );
 
-				if ( />/.test(iFilter) ) { result = />=/.test(iFilter) ? cachedValue >= query : cachedValue > query; }
-				if ( /</.test(iFilter) ) { result = /<=/.test(iFilter) ? cachedValue <= query : cachedValue < query; }
+				if ( />/.test(data.iFilter) ) { result = />=/.test(data.iFilter) ? cachedValue >= query : cachedValue > query; }
+				if ( /</.test(data.iFilter) ) { result = /<=/.test(data.iFilter) ? cachedValue <= query : cachedValue < query; }
 				// keep showing all rows if nothing follows the operator
 				if ( !result && savedSearch === '' ) { result = true; }
 				return result;
@@ -464,37 +469,40 @@ ts.filter = {
 			return null;
 		},
 		// Look for a not match
-		notMatch: function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
-			if ( /^\!/.test(iFilter) ) {
-				iFilter = ts.filter.parseFilter(table, iFilter.replace('!', ''), index, parsed[index]);
-				if (ts.filter.regex.exact.test(iFilter)) {
+		notMatch: function( c, data ) {
+			if ( /^\!/.test(data.iFilter) ) {
+				var indx,
+					filter = ts.filter.parseFilter(c, data.iFilter.replace('!', ''), data.index, data.parsed[data.index]);
+				if (ts.filter.regex.exact.test(filter)) {
 					// look for exact not matches - see #628
-					iFilter = iFilter.replace(ts.filter.regex.exact, '');
-					return iFilter === '' ? true : $.trim(iFilter) !== iExact;
+					filter = filter.replace(ts.filter.regex.exact, '');
+					return filter === '' ? true : $.trim(filter) !== data.iExact;
 				} else {
-					var indx = iExact.search( $.trim(iFilter) );
-					return iFilter === '' ? true : !(wo.filter_startsWith ? indx === 0 : indx >= 0);
+					indx = data.iExact.search( $.trim(filter) );
+					return filter === '' ? true : !(c.widgetOptions.filter_startsWith ? indx === 0 : indx >= 0);
 				}
 			}
 			return null;
 		},
 		// Look for quotes or equals to get an exact match; ignore type since iExact could be numeric
-		exact: function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed, rowArray ) {
+		exact: function( c, data ) {
 			/*jshint eqeqeq:false */
-			if (ts.filter.regex.exact.test(iFilter)) {
-				var fltr = ts.filter.parseFilter(table, iFilter.replace(ts.filter.regex.exact, ''), index, parsed[index]);
-				return rowArray ? $.inArray(fltr, rowArray) >= 0 : fltr == iExact;
+			if (ts.filter.regex.exact.test(data.iFilter)) {
+				var filter = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.exact, ''), data.index, data.parsed[data.index]);
+				return data.anyMatch ? $.inArray(filter, data.rowArray) >= 0 : filter == data.iExact;
 			}
 			return null;
 		},
 		// Look for an AND or && operator (logical and)
-		and : function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
-			if ( ts.filter.regex.andTest.test(filter) ) {
-				var query = iFilter.split( ts.filter.regex.andSplit ),
-					result = iExact.search( $.trim(ts.filter.parseFilter(table, query[0], index, parsed[index])) ) >= 0,
+		and : function( c, data ) {
+			if ( ts.filter.regex.andTest.test(data.filter) ) {
+				var index = data.index,
+					parsed = data.parsed[index],
+					query = data.iFilter.split( ts.filter.regex.andSplit ),
+					result = data.iExact.search( $.trim( ts.filter.parseFilter(c, query[0], index, parsed) ) ) >= 0,
 					indx = query.length - 1;
 				while (result && indx) {
-					result = result && iExact.search( $.trim(ts.filter.parseFilter(table, query[indx], index, parsed[index])) ) >= 0;
+					result = result && data.iExact.search( $.trim( ts.filter.parseFilter(c, query[indx], index, parsed) ) ) >= 0;
 					indx--;
 				}
 				return result;
@@ -502,52 +510,55 @@ ts.filter = {
 			return null;
 		},
 		// Look for a range (using " to " or " - ") - see issue #166; thanks matzhu!
-		range : function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
-			if ( ts.filter.regex.toTest.test(iFilter) ) {
+		range : function( c, data ) {
+			if ( ts.filter.regex.toTest.test(data.iFilter) ) {
 				var result, tmp,
-					c = table.config,
+					table = c.table,
+					index = data.index,
+					parsed = data.parsed[index],
 					// make sure the dash is for a range and not indicating a negative number
-					query = iFilter.split( ts.filter.regex.toSplit ),
-					range1 = ts.formatFloat( ts.filter.parseFilter(table, query[0].replace(ts.filter.regex.nondigit, ''), index, parsed[index]), table ),
-					range2 = ts.formatFloat( ts.filter.parseFilter(table, query[1].replace(ts.filter.regex.nondigit, ''), index, parsed[index]), table );
+					query = data.iFilter.split( ts.filter.regex.toSplit ),
+					range1 = ts.formatFloat( ts.filter.parseFilter(c, query[0].replace(ts.filter.regex.nondigit, ''), index, parsed), table ),
+					range2 = ts.formatFloat( ts.filter.parseFilter(c, query[1].replace(ts.filter.regex.nondigit, ''), index, parsed), table );
 					// parse filter value in case we're comparing numbers (dates)
-				if (parsed[index] || c.parsers[index].type === 'numeric') {
+				if (parsed || c.parsers[index].type === 'numeric') {
 					result = c.parsers[index].format('' + query[0], table, c.$headers.eq(index), index);
 					range1 = (result !== '' && !isNaN(result)) ? result : range1;
 					result = c.parsers[index].format('' + query[1], table, c.$headers.eq(index), index);
 					range2 = (result !== '' && !isNaN(result)) ? result : range2;
 				}
-				result = ( parsed[index] || c.parsers[index].type === 'numeric' ) && !isNaN(range1) && !isNaN(range2) ? cached :
-					isNaN(iExact) ? ts.formatFloat( iExact.replace(ts.filter.regex.nondigit, ''), table) :
-					ts.formatFloat( iExact, table );
+				result = ( parsed || c.parsers[index].type === 'numeric' ) && !isNaN(range1) && !isNaN(range2) ? data.cache :
+					isNaN(data.iExact) ? ts.formatFloat( data.iExact.replace(ts.filter.regex.nondigit, ''), table) :
+					ts.formatFloat( data.iExact, table );
 				if (range1 > range2) { tmp = range1; range1 = range2; range2 = tmp; } // swap
 				return (result >= range1 && result <= range2) || (range1 === '' || range2 === '');
 			}
 			return null;
 		},
 		// Look for wild card: ? = single, * = multiple, or | = logical OR
-		wild : function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed, rowArray ) {
-			if ( /[\?|\*]/.test(iFilter) || ts.filter.regex.orReplace.test(filter) ) {
-				var c = table.config,
-					query = ts.filter.parseFilter(table, iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed[index]);
+		wild : function( c, data ) {
+			if ( /[\?|\*]/.test(data.iFilter) || ts.filter.regex.orReplace.test(data.filter) ) {
+				var index = data.index,
+					parsed = data.parsed[index],
+					query = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed);
 				// look for an exact match with the "or" unless the "filter-match" class is found
 				if (!c.$headers.filter('[data-column="' + index + '"]:last').hasClass('filter-match') && /\|/.test(query)) {
-					query = $.isArray(rowArray) ? '(' + query + ')' : '^(' + query + ')$';
+					query = data.anyMatch && $.isArray(data.rowArray) ? '(' + query + ')' : '^(' + query + ')$';
 				}
 				// parsing the filter may not work properly when using wildcards =/
-				return new RegExp( query.replace(/\?/g, '\\S{1}').replace(/\*/g, '\\S*') ).test(iExact);
+				return new RegExp( query.replace(/\?/g, '\\S{1}').replace(/\*/g, '\\S*') ).test(data.iExact);
 			}
 			return null;
 		},
 		// fuzzy text search; modified from https://github.com/mattyork/fuzzy (MIT license)
-		fuzzy: function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
-			if ( /^~/.test(iFilter) ) {
+		fuzzy: function( c, data ) {
+			if ( /^~/.test(data.iFilter) ) {
 				var indx,
 					patternIndx = 0,
-					len = iExact.length,
-					pattern = ts.filter.parseFilter(table, iFilter.slice(1), index, parsed[index]);
+					len = data.iExact.length,
+					pattern = ts.filter.parseFilter(c, data.iFilter.slice(1), data.index, data.parsed[data.index]);
 				for (indx = 0; indx < len; indx++) {
-					if (iExact[indx] === pattern[patternIndx]) {
+					if (data.iExact[indx] === pattern[patternIndx]) {
 						patternIndx += 1;
 					}
 				}
@@ -579,7 +590,9 @@ ts.filter = {
 		wo.filter_initTimer = null;
 		wo.filter_formatterCount = 0;
 		wo.filter_formatterInit = [];
+		wo.filter_initializing = true;
 
+		txt = '\\{' + ts.filter.regex.query + '\\}';
 		$.extend( regex, {
 			child : new RegExp(c.cssChildRow),
 			filtered : new RegExp(wo.filter_filteredRow),
@@ -588,7 +601,9 @@ ts.filter = {
 			toSplit : new RegExp('(?:\\s+(?:-|' + ts.language.to + ')\\s+)' ,'gi'),
 			andTest : new RegExp('\\s+(' + ts.language.and + '|&&)\\s+', 'i'),
 			andSplit : new RegExp('(?:\\s+(?:' + ts.language.and + '|&&)\\s+)', 'gi'),
-			orReplace : new RegExp('\\s+(' + ts.language.or + ')\\s+', 'gi')
+			orReplace : new RegExp('\\s+(' + ts.language.or + ')\\s+', 'gi'),
+			iQuery : new RegExp(txt, 'i'),
+			igQuery : new RegExp(txt, 'ig')
 		});
 
 		// don't build filter row if columnFilters is false or all columns are set to "filter-false" - issue #156
@@ -741,7 +756,13 @@ ts.filter = {
 	},
 	filterInitComplete: function(c){
 		var wo = c.widgetOptions,
-			count = 0;
+			count = 0,
+			completed = function(){
+				wo.filter_initialized = true;
+				wo.filter_initializing = false;
+				ts.filter.findRows(c.table, c.$table.data('lastSearch'), null);
+				c.$table.trigger('filterInit', c);
+			};
 		$.each( wo.filter_formatterInit, function(i, val) {
 			if (val === 1) {
 				count++;
@@ -750,17 +771,16 @@ ts.filter = {
 		clearTimeout(wo.filter_initTimer);
 		if (!wo.filter_initialized && count === wo.filter_formatterCount) {
 			// filter widget initialized
-			wo.filter_initialized = true;
-			c.$table.trigger('filterInit', c);
+			completed();
 		} else if (!wo.filter_initialized) {
 			// fall back in case a filter_formatter doesn't call
 			// $.tablesorter.filter.formatterUpdated($cell, column), and the count is off
 			wo.filter_initTimer = setTimeout(function(){
-				wo.filter_initialized = true;
-				c.$table.trigger('filterInit', c);
+				completed();
 			}, 500);
 		}
 	},
+	
 	setDefaults: function(table, c, wo) {
 		var isArray, saved, indx,
 			// get current (default) filters
@@ -780,10 +800,9 @@ ts.filter = {
 		c.$table.data('lastSearch', filters);
 		return filters;
 	},
-	parseFilter: function(table, filter, column, parsed, forceParse){
-		var c = table.config;
+	parseFilter: function(c, filter, column, parsed, forceParse){
 		return forceParse || parsed ?
-			c.parsers[column].format( filter, table, [], column ) :
+			c.parsers[column].format( filter, c.table, [], column ) :
 			filter;
 	},
 	buildRow: function(table, c, wo) {
@@ -991,26 +1010,51 @@ ts.filter = {
 				}, 200);
 			});
 	},
+	defaultFilter: function(filter, mask){
+		if (filter === '') { return filter; }
+		var regex = ts.filter.regex.iQuery,
+			maskLen = mask.match( ts.filter.regex.igQuery ).length,
+			query = maskLen > 1 ? $.trim(filter).split(/\s/) : [ $.trim(filter) ],
+			len = query.length - 1,
+			indx = 0,
+			val = mask;
+		if ( len < 1 && maskLen > 1 ) {
+			// only one "word" in query but mask has >1 slots
+			query[1] = query[0];
+		}
+		// replace all {query} with query words...
+		// if query = "Bob", then convert mask from "!{query}" to "!Bob"
+		// if query = "Bob Joe Frank", then convert mask "{q} OR {q}" to "Bob OR Joe OR Frank"
+		while (regex.test(val)) {
+			val = val.replace(regex, query[indx++] || '');
+			if (regex.test(val) && indx < len && (query[indx] || '') !== '') {
+				val = mask.replace(regex, val);
+			}
+		}
+		return val;
+	},
 	findRows: function(table, filters, combinedFilters) {
-		if (table.config.lastCombinedFilter === combinedFilters) { return; }
-		var cached, len, $rows, rowIndex, tbodyIndex, $tbody, $cells, columnIndex,
-			childRow, childRowText, exact, iExact, iFilter, lastSearch, matches, result,
-			notFiltered, searchFiltered, filterMatched, showRow, time, val, indx,
-			anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache, fxn, ffxn,
+		if (table.config.lastCombinedFilter === combinedFilters || table.config.widgetOptions.filter_initializing) { return; }
+		var len, $rows, rowIndex, tbodyIndex, $tbody, $cells, $cell, columnIndex,
+			childRow, lastSearch, hasSelect, matches, result, showRow, time, val, indx,
+			notFiltered, searchFiltered, filterMatched, excludeMatch, fxn, ffxn,
 			regex = ts.filter.regex,
 			c = table.config,
 			wo = c.widgetOptions,
-			columns = c.columns,
 			$tbodies = c.$table.children('tbody'), // target all tbodies #568
+			// data object passed to filters; anyMatch is a flag for the filters
+			data = { anyMatch: false },
 			// anyMatch really screws up with these types of filters
-			anyMatchNotAllowedTypes = [ 'range', 'notMatch',  'operators' ],
-			// parse columns after formatter, in case the class is added at that point
-			parsed = c.$headers.map(function(columnIndex) {
-				return c.parsers && c.parsers[columnIndex] && c.parsers[columnIndex].parsed ||
-					// getData won't return "parsed" if other "filter-" class names exist (e.g. <th class="filter-select filter-parsed">)
-					ts.getData && ts.getData(c.$headers.filter('[data-column="' + columnIndex + '"]:last'), ts.getColumnData( table, c.headers, columnIndex ), 'filter') === 'parsed' ||
-					$(this).hasClass('filter-parsed');
-			}).get();
+			noAnyMatch = [ 'range', 'notMatch',  'operators' ];
+
+		// parse columns after formatter, in case the class is added at that point
+		data.parsed = c.$headers.map(function(columnIndex) {
+			return c.parsers && c.parsers[columnIndex] && c.parsers[columnIndex].parsed ||
+				// getData won't return "parsed" if other "filter-" class names exist (e.g. <th class="filter-select filter-parsed">)
+				ts.getData && ts.getData(c.$headers.filter('[data-column="' + columnIndex + '"]:last'), ts.getColumnData( table, c.headers, columnIndex ), 'filter') === 'parsed' ||
+				$(this).hasClass('filter-parsed');
+		}).get();
+
 		if (c.debug) { time = new Date(); }
 		// filtered rows count
 		c.filteredRows = 0;
@@ -1060,15 +1104,25 @@ ts.filter = {
 					ts.log( "Searching through " + ( searchFiltered && notFiltered < len ? notFiltered : "all" ) + " rows" );
 				}
 				if ((wo.filter_$anyMatch && wo.filter_$anyMatch.length) || filters[c.columns]) {
-					anyMatch = wo.filter_$anyMatch && wo.filter_$anyMatch.val() || filters[c.columns] || '';
+					data.anyMatchFlag = true;
+					data.anyMatchFilter = wo.filter_$anyMatch && wo.filter_$anyMatch.val() || filters[c.columns] || '';
 					if (c.sortLocaleCompare) {
 						// replace accents
-						anyMatch = ts.replaceAccents(anyMatch);
+						data.anyMatchFilter = ts.replaceAccents(data.anyMatchFilter);
 					}
-					iAnyMatch = anyMatch.toLowerCase();
+					if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || '')) {
+						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) );
+						// clear search filtered flag because default filters are not saved to the last search
+						searchFiltered = false;
+					}
+					data.iAnyMatchFilter = data.anyMatchFilter;
 				}
+
 				// loop through the rows
 				for (rowIndex = 0; rowIndex < len; rowIndex++) {
+
+					data.cacheArray = c.cache[tbodyIndex].normalized[rowIndex];
+
 					childRow = $rows[rowIndex].className;
 					// skip child rows & already filtered rows
 					if ( regex.child.test(childRow) || (searchFiltered && regex.filtered.test(childRow)) ) { continue; }
@@ -1078,15 +1132,16 @@ ts.filter = {
 					// so, if "table.config.widgetOptions.filter_childRows" is true and there is
 					// a match anywhere in the child row, then it will make the row visible
 					// checked here so the option can be changed dynamically
-					childRowText = (childRow.length && wo.filter_childRows) ? childRow.text() : '';
-					childRowText = wo.filter_ignoreCase ? childRowText.toLocaleLowerCase() : childRowText;
+					data.childRowText = (childRow.length && wo.filter_childRows) ? childRow.text() : '';
+					data.childRowText = wo.filter_ignoreCase ? data.childRowText.toLocaleLowerCase() : data.childRowText;
 					$cells = $rows.eq(rowIndex).children();
 
-					if (anyMatch) {
-						rowArray = $cells.map(function(i){
+					if (data.anyMatchFlag) {
+						data.anyMatch = true;
+						data.rowArray = $cells.map(function(i){
 							var txt;
-							if (parsed[i]) {
-								txt = c.cache[tbodyIndex].normalized[rowIndex][i];
+							if (data.parsed[i]) {
+								txt = data.cacheArray[i];
 							} else {
 								txt = wo.filter_ignoreCase ? $(this).text().toLowerCase() : $(this).text();
 								if (c.sortLocaleCompare) {
@@ -1095,13 +1150,15 @@ ts.filter = {
 							}
 							return txt;
 						}).get();
-						rowText = rowArray.join(' ');
-						iRowText = rowText.toLowerCase();
-						rowCache = c.cache[tbodyIndex].normalized[rowIndex].slice(0,-1).join(' ');
+						data.filter = data.anyMatchFilter;
+						data.iFilter = data.iAnyMatchFilter;
+						data.exact = data.rowArray.join(' ');
+						data.iExact = data.exact.toLowerCase();
+						data.cache = data.cacheArray.slice(0,-1).join(' ');
 						filterMatched = null;
 						$.each(ts.filter.types, function(type, typeFunction) {
-							if ($.inArray(type, anyMatchNotAllowedTypes) < 0) {
-								matches = typeFunction( anyMatch, iAnyMatch, rowText, iRowText, rowCache, columns, table, wo, parsed, rowArray );
+							if ($.inArray(type, noAnyMatch) < 0) {
+								matches = typeFunction( c, data );
 								if (matches !== null) {
 									filterMatched = matches;
 									return false;
@@ -1113,30 +1170,37 @@ ts.filter = {
 						} else {
 							if (wo.filter_startsWith) {
 								showRow = false;
-								columnIndex = columns;
+								columnIndex = c.columns;
 								while (!showRow && columnIndex > 0) {
 									columnIndex--;
-									showRow = showRow || rowArray[columnIndex].indexOf(iAnyMatch) === 0;
+									showRow = showRow || data.rowArray[columnIndex].indexOf(data.iFilter) === 0;
 								}
 							} else {
-								showRow = (iRowText + childRowText).indexOf(iAnyMatch) >= 0;
+								showRow = (data.iExact + data.childRowText).indexOf(data.iFilter) >= 0;
 							}
 						}
+						data.anyMatch = false;
 					}
 
-					for (columnIndex = 0; columnIndex < columns; columnIndex++) {
+					for (columnIndex = 0; columnIndex < c.columns; columnIndex++) {
+						data.filter = filters[columnIndex];
+						data.index = columnIndex;
+
+						// filter types to exclude, per column
+						excludeMatch = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+
 						// ignore if filter is empty or disabled
-						if (filters[columnIndex]) {
-							cached = c.cache[tbodyIndex].normalized[rowIndex][columnIndex];
+						if (data.filter) {
+							data.cache = data.cacheArray[columnIndex];
 							// check if column data should be from the cell or from parsed data
-							if (wo.filter_useParsedData || parsed[columnIndex]) {
-								exact = cached;
+							if (wo.filter_useParsedData || data.parsed[columnIndex]) {
+								data.exact = data.cache;
 							} else {
 							// using older or original tablesorter
-								exact = $.trim($cells.eq(columnIndex).text());
-								exact = c.sortLocaleCompare ? ts.replaceAccents(exact) : exact; // issue #405
+								data.exact = $.trim( $cells.eq(columnIndex).text() );
+								data.exact = c.sortLocaleCompare ? ts.replaceAccents(data.exact) : data.exact; // issue #405
 							}
-							iExact = !regex.type.test(typeof exact) && wo.filter_ignoreCase ? exact.toLocaleLowerCase() : exact;
+							data.iExact = !regex.type.test(typeof data.exact) && wo.filter_ignoreCase ? data.exact.toLocaleLowerCase() : data.exact;
 							result = showRow; // if showRow is true, show that row
 
 							// in case select filter option has a different value vs text "a - z|A through Z"
@@ -1144,39 +1208,49 @@ ts.filter = {
 								c.$filters.add(c.$externalFilters).filter('[data-column="'+ columnIndex + '"]').find('select option:selected').attr('data-function-name') || '' : '';
 
 							// replace accents - see #357
-							filters[columnIndex] = c.sortLocaleCompare ? ts.replaceAccents(filters[columnIndex]) : filters[columnIndex];
-							// val = case insensitive, filters[columnIndex] = case sensitive
-							iFilter = wo.filter_ignoreCase ? (filters[columnIndex] || '').toLocaleLowerCase() : filters[columnIndex];
+							data.filter = c.sortLocaleCompare ? ts.replaceAccents(data.filter) : data.filter;
+
+							val = true;
+							if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '')) {
+								data.filter = ts.filter.defaultFilter( data.filter, ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) );
+								// val is used to indicate that a filter select is using a default filter; so we override the exact & partial matches
+								val = false;
+							}
+							// data.iFilter = case insensitive, data.filter = case sensitive
+							data.iFilter = wo.filter_ignoreCase ? (data.filter || '').toLocaleLowerCase() : data.filter;
 							fxn = ts.getColumnData( table, wo.filter_functions, columnIndex );
-							if (fxn) {
-								if (fxn === true) {
-									// default selector; no "filter-select" class
-									result = (c.$headers.filter('[data-column="' + columnIndex + '"]:last').hasClass('filter-match')) ?
-										iExact.search(iFilter) >= 0 : filters[columnIndex] === exact;
+							$cell = c.$headers.filter('[data-column="' + columnIndex + '"]:last');
+							hasSelect = $cell.hasClass('filter-select');
+							if ( fxn || ( hasSelect && val ) ) {
+								if (fxn === true || hasSelect) {
+									// default selector uses exact match unless "filter-match" class is found
+									result = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
 								} else if (typeof fxn === 'function') {
 									// filter callback( exact cell content, parser normalized content, filter input value, column index, jQuery row object )
-									result = fxn(exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
-								} else if (typeof fxn[ffxn || filters[columnIndex]] === 'function') {
+									result = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex));
+								} else if (typeof fxn[ffxn || data.filter] === 'function') {
 									// selector option function
-									result = fxn[ffxn || filters[columnIndex]](exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
+									result = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex));
 								}
 							} else {
 								filterMatched = null;
 								// cycle through the different filters
 								// filters return a boolean or null if nothing matches
 								$.each(ts.filter.types, function(type, typeFunction) {
-									matches = typeFunction( filters[columnIndex], iFilter, exact, iExact, cached, columnIndex, table, wo, parsed );
-									if (matches !== null) {
-										filterMatched = matches;
-										return false;
+									if ($.inArray(type, excludeMatch) < 0) {
+										matches = typeFunction( c, data );
+										if (matches !== null) {
+											filterMatched = matches;
+											return false;
+										}
 									}
 								});
 								if (filterMatched !== null) {
 									result = filterMatched;
 								// Look for match, and add child row data for matching
 								} else {
-									exact = (iExact + childRowText).indexOf( ts.filter.parseFilter(table, iFilter, columnIndex, parsed[columnIndex]) );
-									result = ( (!wo.filter_startsWith && exact >= 0) || (wo.filter_startsWith && exact === 0) );
+									data.exact = (data.iExact + data.childRowText).indexOf( ts.filter.parseFilter(c, data.iFilter, columnIndex, data.parsed[columnIndex]) );
+									result = ( (!wo.filter_startsWith && data.exact >= 0) || (wo.filter_startsWith && data.exact === 0) );
 								}
 							}
 							showRow = (result) ? showRow : false;
@@ -1469,7 +1543,7 @@ ts.addWidget({
 			return;
 		}
 		var $table = c.$table,
-			$attach = $(wo.stickyHeaders_attachTo),
+			$attach = $(wo.stickyHeaders_attachTo || 'window'),
 			$thead = $table.children('thead:first'),
 			$win = $attach.length ? $attach : $(window),
 			$header = $thead.children('tr').not('.sticky-false').children(),