jquery-tablesorter 1.11.2 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67ead0cc7ee473fc13eba000fc6fa881e1f5055
-  data.tar.gz: a35b216de9c3d6374d1e23fbcf902ed14ecc3530
+  metadata.gz: 65ae3cb21c44ee0f6bfee2c97b57b137ae72b4eb
+  data.tar.gz: 8497edb9c98963bd4645d158c8b161467646d23a
 SHA512:
-  metadata.gz: 3ad77cc7413bd4780c15d580097503bc60844b9ab05cebe4a27ced3f8d4f387c27efcd09ef4160b8c818eda24a3729fee1d0dbe9fce28173c0fecd7fd322a5d0
-  data.tar.gz: 41a29044a40b804f5c2c18950a7855e3cb7f353df1333739f4d964dba51e1a26a67366b49b67c10a4b2d050557e3775d5db03817333acc97684e7525b1bcbd16
+  metadata.gz: 297953c27301fe09470785ac076576f262ed73f4c8847a2b8da5d0485e9f4bd629755b586021d5ca11a859972a950825cf0f16306de247ddedd0e30e09f1e51a
+  data.tar.gz: 9c2d2ee68462a3c05b1a35c9294bd0fd4c2d22daf20949aed52dc1d37e133ea4f4b541f0cb7fa4d6503d6fa7132605de69597b798dc65865c212b0376c8c0234

data/README.md

@@ -4,9 +4,9 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.16.3 (4/30/2014), [documentation]
+Current tablesorter version: 2.17.0 (5/22/2014), [documentation]
 
-Any issue associate with the js/css files, please report to [Mottie's fork].
+Any issue associated with the js/css files, please report to [Mottie's fork].
 
 ## Installation
 

data/lib/jquery-tablesorter/version.rb

@@ -1,3 +1,3 @@
 module JqueryTablesorter
-  VERSION = '1.11.2'
+  VERSION = '1.12.0'
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 4/23/2014 (v2.16.0)
+ * updated 5/22/2014 (v2.17.0)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -289,7 +289,7 @@
 						exception === 'timeout' ? 'Time out error' :
 						exception === 'abort' ? 'Ajax Request aborted' :
 						'Uncaught error: ' + xhr.statusText + ' [' + xhr.status + ']' );
-					c.$tbodies.eq(0).empty();
+					c.$tbodies.eq(0).detach();
 					p.totalRows = 0;
 				} else {
 					// process ajax object
@@ -311,7 +311,7 @@
 					if (d instanceof jQuery) {
 						if (p.processAjaxOnInit) {
 							// append jQuery object
-							c.$tbodies.eq(0).empty().append(d);
+							c.$tbodies.eq(0).detach().append(d);
 						}
 					} else if (l) {
 						// build table from array
@@ -726,6 +726,11 @@
 					})
 					.bind('update updateRows updateAll addRows '.split(' ').join('.pager '), function(e){
 						e.stopPropagation();
+						fixHeight(table, p);
+						var $rows = c.$tbodies.eq(0).children();
+						p.totalRows = $rows.length - ( p.countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
+						p.totalPages = Math.ceil( p.totalRows / p.size );
+						updatePageDisplay(table, p);
 						hideRows(table, p);
 					})
 					.bind('pageSize.pager', function(e,v){

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.16.3 - Client-side table sorting with ease!
+* TableSorter 2.17.0 - 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.16.3";
+			ts.version = "2.17.0";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -167,7 +167,7 @@
 
 			function getElementText(table, node, cellIndex) {
 				if (!node) { return ""; }
-				var c = table.config,
+				var te, c = table.config,
 					t = c.textExtraction || '',
 					text = "";
 				if (t === "basic") {
@@ -176,8 +176,8 @@
 				} else {
 					if (typeof(t) === "function") {
 						text = t(node, table, cellIndex);
-					} else if (typeof(t) === "object" && t.hasOwnProperty(cellIndex)) {
-						text = t[cellIndex](node, table, cellIndex);
+					} else if (typeof (te = ts.getColumnData( table, t, cellIndex )) === 'function') {
+						text = te(node, table, cellIndex);
 					} else {
 						// previous "simple" method
 						text = node.textContent || node.innerText || $(node).text() || "";
@@ -219,7 +219,7 @@
 				var c = table.config,
 					// update table bodies in case we start with an empty table
 					tb = c.$tbodies = c.$table.children('tbody:not(.' + c.cssInfoBlock + ')'),
-					rows, list, l, i, h, ch, p, time, indx,
+					rows, list, l, i, h, ch, p, time,
 					j = 0,
 					parsersDebug = "",
 					len = tb.length;
@@ -233,16 +233,11 @@
 				while (j < len) {
 					rows = tb[j].rows;
 					if (rows[j]) {
-						l = rows[j].cells.length;
+						l = c.columns; // rows[j].cells.length;
 						for (i = 0; i < l; i++) {
-							// tons of thanks to AnthonyM1229 for working out the following selector (issue #74) to make this work in IE8!
-							// More fixes to this selector to work properly in iOS and jQuery 1.8+ (issue #132 & #174)
-							h = c.$headers.filter(':not([colspan])');
-							h = h.add( c.$headers.filter('[colspan="1"]') ) // ie8 fix
-								.filter('[data-column="' + i + '"]:last');
-							// get headers option corrected index
-							indx = c.$headers.index(h);
-							ch = c.headers[indx];
+							h = c.$headers.filter('[data-column="' + i + '"]:last');
+							// get column indexed table cell
+							ch = ts.getColumnData( table, c.headers, i );
 							// get column parser
 							p = ts.getParserById( ts.getData(h, ch, 'sorter') );
 							// empty cells behaviour - keeping emptyToBottom for backwards compatibility
@@ -421,10 +416,12 @@
 				c.columns = ts.computeColumnIndex( c.$table.children('thead, tfoot').children('tr') );
 				// add icon if cssIcon option exists
 				i = c.cssIcon ? '<i class="' + ( c.cssIcon === ts.css.icon ? ts.css.icon : c.cssIcon + ' ' + ts.css.icon ) + '"></i>' : '';
-				c.$headers = $(table).find(c.selectorHeaders).each(function(index) {
+				c.$headers.each(function(index) {
 					$t = $(this);
-					ch = c.headers[index];
-					c.headerContent[index] = $(this).html(); // save original header content
+					// make sure to get header cell & not column indexed cell
+					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) {
@@ -473,10 +470,11 @@
 			}
 
 			function updateHeader(table) {
-				var s, $th, c = table.config;
+				var s, $th,
+					c = table.config;
 				c.$headers.each(function(index, th){
 					$th = $(th);
-					s = ts.getData( th, c.headers[index], 'sorter' ) === 'false';
+					s = ts.getData( th, ts.getColumnData( table, c.headers, index, true ), 'sorter' ) === 'false';
 					th.sortDisabled = s;
 					$th[ s ? 'addClass' : 'removeClass' ]('sorter-false').attr('aria-disabled', '' + s);
 					// aria-controls - requires table ID
@@ -546,19 +544,46 @@
 				}
 			}
 
-			function updateHeaderSortCount(table, list, triggered) {
-				var s, t, o, c = table.config,
+			function updateHeaderSortCount(table, list) {
+				var s, t, o, col, primary,
+					c = table.config,
 					sl = list || c.sortList;
 				c.sortList = [];
 				$.each(sl, function(i,v){
 					// ensure all sortList values are numeric - fixes #127
-					s = [ parseInt(v[0], 10), parseInt(v[1], 10) ];
+					col = parseInt(v[0], 10);
 					// make sure header exists
-					o = c.$headers.filter('[data-column="' + s[0] + '"]:last')[0];
+					o = c.$headers.filter('[data-column="' + col + '"]:last')[0];
 					if (o) { // prevents error if sorton array is wrong
+						// o.count = o.count + 1;
+						t = ('' + v[1]).match(/^(1|d|s|o|n)/);
+						t = t ? t[0] : '';
+						// 0/(a)sc (default), 1/(d)esc, (s)ame, (o)pposite, (n)ext
+						switch(t) {
+							case '1': case 'd': // descending
+								t = 1;
+								break;
+							case 's': // same direction (as primary column)
+								// if primary sort is set to "s", make it ascending
+								t = primary || 0;
+								break;
+							case 'o':
+								s = o.order[(primary || 0) % (c.sortReset ? 3 : 2)];
+								// opposite of primary column; but resets if primary resets
+								t = s === 0 ? 1 : s === 1 ? 0 : 2;
+								break;
+							case 'n':
+								o.count = o.count + 1;
+								t = o.order[(o.count) % (c.sortReset ? 3 : 2)];
+								break;
+							default: // ascending
+								t = 0;
+								break;
+						}
+						primary = i === 0 ? t : primary;
+						s = [ col, parseInt(t, 10) || 0 ];
 						c.sortList.push(s);
 						t = $.inArray(s[1], o.order); // fixes issue #167
-						if (triggered) { o.count = o.count + 1; }
 						o.count = t >= 0 ? t : s[1] % (c.sortReset ? 3 : 2);
 					}
 				});
@@ -872,7 +897,7 @@
 					e.stopPropagation();
 					$table.trigger("sortStart", this);
 					// update header count index
-					updateHeaderSortCount(table, list, true);
+					updateHeaderSortCount(table, list);
 					// set css for headers
 					setHeadersCss(table);
 					// fixes #346
@@ -921,6 +946,16 @@
 				.bind("destroy" + c.namespace, function(e, c, cb){
 					e.stopPropagation();
 					ts.destroy(table, c, cb);
+				})
+				.bind("resetToLoadState" + c.namespace, function(e){
+					// remove all widgets
+					ts.refreshWidgets(table, true, true);
+					// restore original settings; this clears out current settings, but does not clear
+					// values saved to storage.
+					c = $.extend(true, ts.defaults, c.originalSettings);
+					table.hasInitialized = false;
+					// setup the entire table again
+					ts.setup( table, c );
 				});
 			}
 
@@ -930,6 +965,8 @@
 					var table = this,
 						// merge & extend config options
 						c = $.extend(true, {}, ts.defaults, settings);
+						// save initial settings
+						c.originalSettings = settings;
 					// create a table from data (build table widget)
 					if (!table.hasInitialized && ts.buildTable && this.tagName !== 'TABLE') {
 						// return the table (in case the original target is the table's container)
@@ -973,6 +1010,7 @@
 				c.$table = $table
 					.addClass(ts.css.table + ' ' + c.tableClass + k)
 					.attr({ role : 'grid'});
+				c.$headers = $(table).find(c.selectorHeaders);
 
 				// give the table a unique id, which will be used in namespace binding
 				if (!c.namespace) {
@@ -1050,6 +1088,31 @@
 				if (typeof c.initialized === 'function') { c.initialized(table); }
 			};
 
+			ts.getColumnData = function(table, obj, indx, getCell){
+				if (typeof obj === 'undefined' || obj === null) { return; }
+				table = $(table)[0];
+				var result, $h, k,
+					c = table.config;
+				if (obj[indx]) {
+					return getCell ? obj[indx] : obj[c.$headers.index( c.$headers.filter('[data-column="' + indx + '"]:last') )];
+				}
+				for (k in obj) {
+					if (typeof k === 'string') {
+						if (getCell) {
+							// get header cell
+							$h = c.$headers.eq(indx).filter(k);
+						} else {
+							// get column indexed cell
+							$h = c.$headers.filter('[data-column="' + indx + '"]:last').filter(k);
+						}
+						if ($h.length) {
+							return obj[k];
+						}
+					}
+				}
+				return result;
+			};
+
 			// computeTableHeaderCellIndexes from:
 			// http://www.javascripttoolbox.com/lib/table/examples.php
 			// http://www.javascripttoolbox.com/temp/table_cellindex.html
@@ -1136,7 +1199,7 @@
 			};
 
 			ts.clearTableBody = function(table) {
-				$(table)[0].config.$tbodies.empty();
+				$(table)[0].config.$tbodies.detach();
 			};
 
 			ts.bindEvents = function(table, $headers, core){
@@ -1217,7 +1280,7 @@
 				// disable tablesorter
 				$t
 					.removeData('tablesorter')
-					.unbind('sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd '.split(' ').join(c.namespace + ' '));
+					.unbind('sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd resetToLoadState '.split(' ').join(c.namespace + ' '));
 				c.$headers.add($f)
 					.removeClass( [ts.css.header, c.cssHeader, c.cssAsc, c.cssDesc, ts.css.sortAsc, ts.css.sortDesc, ts.css.sortNone].join(' ') )
 					.removeAttr('data-column')
@@ -1403,6 +1466,8 @@
 			};
 
 			ts.getParserById = function(name) {
+				/*jshint eqeqeq:false */
+				if (name == 'false') { return false; }
 				var i, l = ts.parsers.length;
 				for (i = 0; i < l; i++) {
 					if (ts.parsers[i].id.toLowerCase() === (name.toString()).toLowerCase()) {
@@ -1678,7 +1743,7 @@
 			if (s) {
 				var c = table.config,
 					ci = c.$headers.filter('[data-column=' + cellIndex + ']:last'),
-					format = ci.length && ci[0].dateFormat || ts.getData( ci, c.headers[cellIndex], 'dateFormat') || c.dateFormat;
+					format = ci.length && ci[0].dateFormat || ts.getData( ci, ts.getColumnData( table, c.headers, cellIndex ), 'dateFormat') || c.dateFormat;
 				s = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/"); // escaped - because JSHint in Firefox was showing it as an error
 				if (format === "mmddyyyy") {
 					s = s.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$1/$2");

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.16+ widgets - updated 4/30/2014 (v2.16.3)
+/*! tableSorter 2.16+ widgets - updated 5/22/2014 (v2.17.0)
  *
  * Column Styles
  * Column Filters
@@ -438,16 +438,18 @@ ts.filter = {
 					query = ts.formatFloat( iFilter.replace(ts.filter.regex.operators, ''), table ),
 					parser = c.parsers[index],
 					savedSearch = query;
-					// parse filter value in case we're comparing numbers (dates)
+				// parse filter value in case we're comparing numbers (dates)
 				if (parsed[index] || parser.type === 'numeric') {
-					cachedValue = parser.format( '' + iFilter.replace(ts.filter.regex.operators, ''), table, c.$headers.eq(index), index );
-					query = ( typeof query === "number" && cachedValue !== '' && !isNaN(cachedValue) ) ? cachedValue : query;
+					result = parser.format( $.trim('' + iFilter.replace(ts.filter.regex.operators, '')), table, [], index );
+					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) && cached ? cached :
+				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 );
+
 				if ( />/.test(iFilter) ) { result = />=/.test(iFilter) ? cachedValue >= query : cachedValue > query; }
 				if ( /</.test(iFilter) ) { result = /<=/.test(iFilter) ? cachedValue <= query : cachedValue < query; }
 				// keep showing all rows if nothing follows the operator
@@ -476,8 +478,8 @@ ts.filter = {
 		},
 		// Look for an AND or && operator (logical and)
 		and : function( filter, iFilter, exact, iExact ) {
-			if ( /\s+(AND|&&)\s+/g.test(filter) ) {
-				var query = iFilter.split( /(?:\s+(?:and|&&)\s+)/g ),
+			if ( ts.filter.regex.andTest.test(filter) ) {
+				var query = iFilter.split( ts.filter.regex.andSplit ),
 					result = iExact.search( $.trim(query[0]) ) >= 0,
 					indx = query.length - 1;
 				while (result && indx) {
@@ -490,10 +492,11 @@ ts.filter = {
 		},
 		// Look for a range (using " to " or " - ") - see issue #166; thanks matzhu!
 		range : function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
-			if ( /\s+(-|to)\s+/.test(iFilter) ) {
+			if ( ts.filter.regex.toTest.test(iFilter) ) {
 				var result, tmp,
 					c = table.config,
-					query = iFilter.split(/(?: - | to )/), // make sure the dash is for a range and not indicating a negative number
+					// make sure the dash is for a range and not indicating a negative number
+					query = iFilter.split( ts.filter.regex.toSplit ),
 					range1 = ts.formatFloat(query[0].replace(ts.filter.regex.nondigit, ''), table),
 					range2 = ts.formatFloat(query[1].replace(ts.filter.regex.nondigit, ''), table);
 					// parse filter value in case we're comparing numbers (dates)
@@ -513,9 +516,9 @@ ts.filter = {
 		},
 		// Look for wild card: ? = single, * = multiple, or | = logical OR
 		wild : function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed, rowArray ) {
-			if ( /[\?|\*]/.test(iFilter) || /\s+OR\s+/i.test(filter) ) {
+			if ( /[\?|\*]/.test(iFilter) || ts.filter.regex.orReplace.test(filter) ) {
 				var c = table.config,
-					query = iFilter.replace(/\s+OR\s+/gi,"|");
+					query = iFilter.replace(ts.filter.regex.orReplace, "|");
 				// 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 + ')$';
@@ -545,14 +548,30 @@ ts.filter = {
 		}
 	},
 	init: function(table, c, wo) {
-		var options, string, $header, column, filters, time;
+		// filter language options
+		ts.language = $.extend(true, {}, {
+			to  : 'to',
+			or  : 'or',
+			and : 'and'
+		}, ts.language);
+
+		var options, string, $header, column, filters, time, fxn,
+			regex = ts.filter.regex;
 		if (c.debug) {
 			time = new Date();
 		}
 		c.$table.addClass('hasFilters');
 
-		ts.filter.regex.child = new RegExp(c.cssChildRow);
-		ts.filter.regex.filtered = new RegExp(wo.filter_filteredRow);
+		$.extend( regex, {
+			child : new RegExp(c.cssChildRow),
+			filtered : new RegExp(wo.filter_filteredRow),
+			alreadyFiltered : new RegExp('(\\s+(' + ts.language.or + '|-|' + ts.language.to + ')\\s+)', 'i'),
+			toTest : new RegExp('\\s+(-|' + ts.language.to + ')\\s+', 'i'),
+			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')
+		});
 
 		// don't build filter row if columnFilters is false or all columns are set to "filter-false" - issue #156
 		if (wo.filter_columnFilters !== false && c.$headers.filter('.filter-false').length !== c.$headers.length) {
@@ -576,6 +595,7 @@ ts.filter = {
 				if (/(update|add)/.test(event.type) && event.type !== "updateComplete") {
 					// force a new search since content has changed
 					c.lastCombinedFilter = null;
+					c.lastSearch = [];
 				}
 				// pass true (skipFirst) to prevent the tablesorter.setFilters function from skipping the first input
 				// ensures all inputs are updated when a search is triggered on the table $('table').trigger('search', [...]);
@@ -602,16 +622,16 @@ ts.filter = {
 			}
 		}
 		if (wo.filter_functions) {
-			// column = column # (string)
-			for (column in wo.filter_functions) {
-				if (wo.filter_functions.hasOwnProperty(column) && typeof column === 'string') {
+			for (column = 0; column < c.columns; column++) {
+				fxn = ts.getColumnData( table, wo.filter_functions, column );
+				if (fxn) {
 					$header = c.$headers.filter('[data-column="' + column + '"]:last');
 					options = '';
-					if (wo.filter_functions[column] === true && !$header.hasClass('filter-false')) {
+					if (fxn === true && !$header.hasClass('filter-false')) {
 						ts.filter.buildSelect(table, column);
-					} else if (typeof column === 'string' && !$header.hasClass('filter-false')) {
+					} else if (typeof fxn === 'object' && !$header.hasClass('filter-false')) {
 						// add custom drop down list
-						for (string in wo.filter_functions[column]) {
+						for (string in fxn) {
 							if (typeof string === 'string') {
 								options += options === '' ?
 									'<option value="">' + ($header.data('placeholder') || $header.attr('data-placeholder') || wo.filter_placeholder.select || '') + '</option>' : '';
@@ -683,7 +703,7 @@ ts.filter = {
 		return filters;
 	},
 	buildRow: function(table, c, wo) {
-		var column, $header, buildSelect, disabled, name,
+		var column, $header, buildSelect, disabled, name, ffxn,
 			// c.columns defined in computeThIndexes()
 			columns = c.columns,
 			buildFilter = '<tr class="' + ts.css.filterRow + '">';
@@ -696,22 +716,18 @@ ts.filter = {
 			disabled = false;
 			// assuming last cell of a column is the main column
 			$header = c.$headers.filter('[data-column="' + column + '"]:last');
-			buildSelect = (wo.filter_functions && wo.filter_functions[column] && typeof wo.filter_functions[column] !== 'function') ||
+			ffxn = ts.getColumnData( table, wo.filter_functions, column );
+			buildSelect = (wo.filter_functions && ffxn && typeof ffxn !== "function" ) ||
 				$header.hasClass('filter-select');
 			// get data from jQuery data, metadata, headers option or header class name
-			if (ts.getData) {
-				// get data from jQuery data, metadata, headers option or header class name
-				disabled = ts.getData($header[0], c.headers[column], 'filter') === 'false';
-			} else {
-				// only class names and header options - keep this for compatibility with tablesorter v2.0.5
-				disabled = (c.headers[column] && c.headers[column].hasOwnProperty('filter') && c.headers[column].filter === false) ||
-					$header.hasClass('filter-false');
-			}
+			disabled = ts.getData($header[0], ts.getColumnData( table, c.headers, column ), 'filter') === 'false';
+
 			if (buildSelect) {
 				buildFilter = $('<select>').appendTo( c.$filters.eq(column) );
 			} else {
-				if (wo.filter_formatter && $.isFunction(wo.filter_formatter[column])) {
-					buildFilter = wo.filter_formatter[column]( c.$filters.eq(column), column );
+				ffxn = ts.getColumnData( table, wo.filter_formatter, column );
+				if (ffxn) {
+					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');
@@ -761,7 +777,7 @@ ts.filter = {
 		$el
 		// use data attribute instead of jQuery data since the head is cloned without including the data/binding
 		.attr('data-lastSearchTime', new Date().getTime())
-		.unbind('keyup search change '.split(' ').join(c.namespace + 'filter '))
+		.unbind('keypress keyup search change '.split(' ').join(c.namespace + 'filter '))
 		// include change for select - fixes #473
 		.bind('keyup search change '.split(' ').join(c.namespace + 'filter '), function(event) {
 			$(this).attr('data-lastSearchTime', new Date().getTime());
@@ -774,8 +790,14 @@ ts.filter = {
 				( event.which >= 37 && event.which <= 40 ) || (event.which !== 13 && wo.filter_liveSearch === false) ) ) ) {
 					return;
 			}
-			// true flag tells getFilters to skip newest timed input
-			ts.filter.searching( table, true, true );
+			// change event = no delay; last true flag tells getFilters to skip newest timed input
+			ts.filter.searching( table, event.type !== 'change', true );
+		})
+		.bind('keypress.' + c.namespace + 'filter', function(event){
+			if (event.which === 13) {
+				event.preventDefault();
+				$(this).blur();
+			}
 		});
 		c.$table.bind('filterReset', function(){
 			$el.val('');
@@ -787,6 +809,8 @@ ts.filter = {
 			filterArray = $.isArray(filter),
 			filters = (filterArray) ? filter : ts.getFilters(table, true),
 			combinedFilters = (filters || []).join(''); // combined filter values
+		// prevent errors if delay init is set
+		if ($.isEmptyObject(c.cache)) { return; }
 		// add filter array back into inputs
 		if (filterArray) {
 			ts.setFilters( table, filters, false, skipFirst !== true );
@@ -802,6 +826,7 @@ ts.filter = {
 		} else if (filter === false) {
 			// force filter refresh
 			c.lastCombinedFilter = null;
+			c.lastSearch = [];
 		}
 		c.$table.trigger('filterStart', [filters]);
 		if (c.showProcessing) {
@@ -856,8 +881,9 @@ ts.filter = {
 		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,
-			anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache,
+			notFiltered, searchFiltered, filterMatched, showRow, time, val, indx,
+			anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache, fxn,
+			regex = ts.filter.regex,
 			c = table.config,
 			wo = c.widgetOptions,
 			columns = c.columns,
@@ -868,7 +894,7 @@ ts.filter = {
 			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'), c.headers[columnIndex], '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(); }
@@ -879,26 +905,34 @@ ts.filter = {
 			// $rows = $tbody.children('tr').not(c.selectorRemove);
 			columnIndex = c.columns;
 			// convert stored rows into a jQuery object
-			$rows = true ? $( $.map(c.cache[tbodyIndex].normalized, function(el){ return el[columnIndex].$row.get(); }) ) : $tbody.children('tr').not(c.selectorRemove);
-			len = $rows.length;
+			$rows = $( $.map(c.cache[tbodyIndex].normalized, function(el){ return el[columnIndex].$row.get(); }) );
+
 			if (combinedFilters === '' || wo.filter_serversideFiltering) {
 				$rows.removeClass(wo.filter_filteredRow).not('.' + c.cssChildRow).show();
 			} else {
+				// filter out child rows
+				$rows = $rows.not('.' + c.cssChildRow);
+				len = $rows.length;
 				// optimize searching only through already filtered rows - see #313
 				searchFiltered = true;
 				lastSearch = c.lastSearch || c.$table.data('lastSearch') || [];
-				$.each(filters, function(indx, val) {
+				for (indx = 0; indx < columnIndex; indx++) {
+					val = filters[indx] || '';
+					// break out of loop if we've already determined not to search filtered rows
+					if (!searchFiltered) { indx = columnIndex; }
 					// search already filtered rows if...
-					searchFiltered = searchFiltered &&
-						// there are changes from beginning of filter
-						(val || '').indexOf(lastSearch[indx]) === 0 &&
-						// if there is not a logical "or" in the string
-						!/(\s+or\s+|\|)/g.test(val || '') &&
-						// if we are not doing exact matches
-						!/[=\"]/.test(lastSearch[indx]) &&
+					searchFiltered = searchFiltered && lastSearch.length &&
+						// there are no changes from beginning of filter
+						val.indexOf(lastSearch[indx] || '') === 0 &&
+						// if there is NOT a logical "or", or range ("to" or "-") in the string
+						!regex.alreadyFiltered.test(val) &&
+						// if we are not doing exact matches, using "|" (logical or) or not "!"
+						!/[=\"\|!]/.test(val) &&
+						// don't search only filtered if the value is negative ('> -10' => '> -100' will ignore hidden rows)
+						!(/(>=?\s*-\d)/.test(val) || /(<=?\s*\d)/.test(val)) && 
 						// if filtering using a select without a "filter-match" class (exact match) - fixes #593
-						!( val !== '' && wo.filter_functions && wo.filter_functions[indx] === true && !c.$headers.filter('[data-column="' + indx + '"]:last').hasClass('filter-match') );
-				});
+						!( val !== '' && c.$filters && c.$filters.eq(indx).find('select').length && !c.$headers.filter('[data-column="' + indx + '"]:last').hasClass('filter-match') );
+				}
 				notFiltered = $rows.not('.' + wo.filter_filteredRow).length;
 				// can't search when all rows are hidden - this happens when looking for exact matches
 				if (searchFiltered && notFiltered === 0) { searchFiltered = false; }
@@ -917,7 +951,7 @@ ts.filter = {
 				for (rowIndex = 0; rowIndex < len; rowIndex++) {
 					childRow = $rows[rowIndex].className;
 					// skip child rows & already filtered rows
-					if ( ts.filter.regex.child.test(childRow) || (searchFiltered && ts.filter.regex.filtered.test(childRow)) ) { continue; }
+					if ( regex.child.test(childRow) || (searchFiltered && regex.filtered.test(childRow)) ) { continue; }
 					showRow = true;
 					// *** nextAll/nextUntil not supported by Zepto! ***
 					childRow = $rows.eq(rowIndex).nextUntil('tr:not(.' + c.cssChildRow + ')');
@@ -973,24 +1007,25 @@ ts.filter = {
 								exact = $.trim($cells.eq(columnIndex).text());
 								exact = c.sortLocaleCompare ? ts.replaceAccents(exact) : exact; // issue #405
 							}
-							iExact = !ts.filter.regex.type.test(typeof exact) && wo.filter_ignoreCase ? exact.toLocaleLowerCase() : exact;
+							iExact = !regex.type.test(typeof exact) && wo.filter_ignoreCase ? exact.toLocaleLowerCase() : exact;
 							result = showRow; // if showRow is true, show that row
 
 							// 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];
-							if (wo.filter_functions && wo.filter_functions[columnIndex]) {
-								if (wo.filter_functions[columnIndex] === true) {
+							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;
-								} else if (typeof wo.filter_functions[columnIndex] === 'function') {
+								} else if (typeof fxn === 'function') {
 									// filter callback( exact cell content, parser normalized content, filter input value, column index, jQuery row object )
-									result = wo.filter_functions[columnIndex](exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
-								} else if (typeof wo.filter_functions[columnIndex][filters[columnIndex]] === 'function') {
+									result = fxn(exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
+								} else if (typeof fxn[filters[columnIndex]] === 'function') {
 									// selector option function
-									result = wo.filter_functions[columnIndex][filters[columnIndex]](exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
+									result = fxn[filters[columnIndex]](exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
 								}
 							} else {
 								filterMatched = null;
@@ -1044,15 +1079,16 @@ ts.filter = {
 			wo = c.widgetOptions,
 			parsed = [],
 			arry = false,
-			source = wo.filter_selectSource;
+			source = wo.filter_selectSource,
+			fxn = $.isFunction(source) ? true : ts.getColumnData( table, source, column );
 
 		// filter select source option
-		if ($.isFunction(source)) {
+		if (fxn === true) {
 			// OVERALL source
 			arry = source(table, column, onlyAvail);
-		} else if ($.type(source) === 'object' && source.hasOwnProperty(column)) {
+		} else if ($.type(source) === 'object' && fxn) {
 			// custom select source function for a SPECIFIC COLUMN
-			arry = source[column](table, column, onlyAvail);
+			arry = fxn(table, column, onlyAvail);
 		}
 		if (arry === false) {
 			// fall back to original method
@@ -1159,6 +1195,8 @@ ts.filter = {
 			$filters = $filters && $filters.length ? $filters.add(wo.filter_$externalFilters) : wo.filter_$externalFilters;
 		}
 		$filters.filter('select[data-column="' + column + '"]')[ updating ? 'html' : 'append' ](options);
+		if (!wo.filter_functions) { wo.filter_functions = {}; }
+		wo.filter_functions[column] = true;
 	},
 	buildDefault: function(table, updating) {
 		var columnIndex, $header,
@@ -1169,10 +1207,7 @@ ts.filter = {
 		for (columnIndex = 0; columnIndex < columns; columnIndex++) {
 			$header = c.$headers.filter('[data-column="' + columnIndex + '"]:last');
 			// look for the filter-select class; build/update it if found
-			if (($header.hasClass('filter-select') || wo.filter_functions && wo.filter_functions[columnIndex] === true) &&
-				!$header.hasClass('filter-false')) {
-				if (!wo.filter_functions) { wo.filter_functions = {}; }
-				wo.filter_functions[columnIndex] = true; // make sure this select gets processed by filter_functions
+			if (($header.hasClass('filter-select') || ts.getColumnData( table, wo.filter_functions, columnIndex ) === true) && !$header.hasClass('filter-false')) {
 				ts.filter.buildSelect(table, columnIndex, updating, $header.hasClass(wo.filter_onlyAvail));
 			}
 		}
@@ -1244,6 +1279,7 @@ ts.setFilters = function(table, filter, apply, skipFirst) {
 	if (c && apply) {
 		// ensure new set filters are applied, even if the search is the same
 		c.lastCombinedFilter = null;
+		c.lastSearch = [];
 		ts.filter.searching(c.$table[0], filter, skipFirst);
 		c.$table.trigger('filterFomatterUpdate');
 	}
@@ -1475,7 +1511,7 @@ ts.addWidget({
 			var canResize,
 				$column = $(this);
 			column = $column.attr('data-column');
-			canResize = ts.getData( $column, c.headers[column], 'resizable') === "false";
+			canResize = ts.getData( $column, ts.getColumnData( table, c.headers, column ), 'resizable') === "false";
 			$rows.children().filter('[data-column="' + column + '"]')[canResize ? 'addClass' : 'removeClass']('resizable-false');
 		});
 		// add wrapper inside each cell to allow for positioning of the resizable target block