jquery-tablesorter 1.10.10 → 1.11.0

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

@@ -0,0 +1,134 @@
+/*! Filter widget formatter functions - updated 4/22/2014 (v2.16.1-beta)
+ * requires: jQuery 1.7.2+, tableSorter 2.16+, filter widget 2.16+ and select2 v3.4.6+ plugin
+ */
+/*jshint browser:true, jquery:true, unused:false */
+/*global jQuery: false */
+;(function($){
+"use strict";
+
+var ts = $.tablesorter || {};
+ts.filterFormatter = ts.filterFormatter || {};
+
+/************************\
+ Select2 Filter Formatter
+\************************/
+ts.filterFormatter.select2 = function($cell, indx, select2Def) {
+	var o = $.extend({
+		// select2 filter formatter options
+		cellText : '', // Text (wrapped in a label element)
+		match : true, // adds "filter-match" to header
+		// include ANY select2 options below
+		multiple : true,
+		width : '100%'
+
+	}, select2Def ),
+	arry, data,
+	c = $cell.closest('table')[0].config,
+	wo = c.widgetOptions,
+	// Add a hidden input to hold the range values
+	$input = $('<input class="filter" type="hidden">')
+	.appendTo($cell)
+	// hidden filter update namespace trigger by filter widget
+	.bind('change' + c.namespace + 'filter', function(){
+		var val = this.value;
+		val = val.replace(/[/()$]/g, '').split('|');
+		updateSelect2(val);
+	}),
+	$header = c.$headers.filter('[data-column="' + indx + '"]:last'),
+	onlyAvail = $header.hasClass(wo.filter_onlyAvail),
+	$shcell = [],
+	match = o.match ? '' : '$',
+
+	// this function updates the hidden input and adds the current values to the header cell text
+	updateSelect2 = function(v, notrigger) {
+		v = typeof v === "undefined" || v === '' ? $cell.find('.select2').select2('val') || o.value || '' : v || '';
+		$input
+		// add equal to the beginning, so we filter exact numbers
+		.val( $.isArray(v) && v.length ? '/(' + (v || []).join(match + '|') + match + ')/' : '' )
+		.trigger( notrigger ? '' : 'search' ).end()
+		.find('.select2').select2('val', v);
+		// update sticky header cell
+		if ($shcell.length) {
+			$shcell
+			.find('.select2').select2('val', v);
+		}
+	},
+
+	// get options from table cell content or filter_selectSource (v2.16)
+	updateOptions = function(){
+		data = [];
+		arry = ts.filter.getOptionSource(c.$table[0], indx, onlyAvail) || [];
+		// build select2 data option
+		$.each(arry, function(i,v){
+			data.push({id: v, text: v});
+		});
+		o.data = data;
+	};
+
+	// get filter-match class from option
+	$header.toggleClass('filter-match', o.match);
+	if (o.cellText) {
+		$cell.prepend('<label>' + o.cellText + '</label>');
+	}
+
+	// don't add default in table options if either ajax or
+	// data options are already defined
+	if (!(o.ajax && !$.isEmptyObject(o.ajax)) && !o.data) {
+		updateOptions();
+		if (onlyAvail) {
+			c.$table.bind('filterEnd', function(){
+				updateOptions();
+				$cell.add($shcell).find('.select2').select2(o);
+			});
+		}
+	}
+
+	// add a select2 hidden input!
+	$('<input class="select2 select2-' + indx + '" type="hidden" />')
+	.val(o.value)
+	.appendTo($cell)
+	.select2(o)
+	.bind('change', function(){
+		updateSelect2();
+	});
+
+	// update select2 from filter hidden input, in case of saved filters
+	c.$table.bind('filterFomatterUpdate', function(){
+		// value = '/(x$|y$)/' => 'x,y'
+		var val = c.$table.data('lastSearch')[indx] || '';
+		val = val.replace(/[/()$]/g, '').split('|');
+		$cell.find('.select2').select2('val', val);
+		updateSelect2(val, true);
+	});
+
+	// has sticky headers?
+	c.$table.bind('stickyHeadersInit', function(){
+		$shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty();
+		// add a select2!
+		$('<input class="select2 select2-' + indx + '" type="hidden">')
+		.val(o.value)
+		.appendTo($shcell)
+		.select2(o)
+		.bind('change', function(){
+			$cell.find('.select2').select2('val', $shcell.find('.select2').select2('val') );
+			updateSelect2();
+		});
+		if (o.cellText) {
+			$shcell.prepend('<label>' + o.cellText + '</label>');
+		}
+
+	});
+
+	// on reset
+	c.$table.bind('filterReset', function(){
+		$cell.find('.select2').select2('val', o.value || '');
+		setTimeout(function(){
+			updateSelect2();
+		}, 0);
+	});
+
+	updateSelect2();
+	return $input;
+};
+
+})(jQuery);

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

@@ -1,4 +1,4 @@
-/*! Filter widget formatter functions - updated 3/12/2014 (v2.15.9)
+/*! Filter widget formatter functions - updated 4/23/2014 (v2.16.0)
  * requires: tableSorter 2.15+ and jQuery 1.4.3+
  *
  * uiSpinner (jQuery UI spinner)
@@ -20,6 +20,7 @@ var ts = $.tablesorter || {},
 // compare option selector class name (jQuery selector)
 compareSelect = '.compare-select',
 
+
 tsff = ts.filterFormatter = {
 
 	addCompare: function($cell, indx, options){
@@ -87,7 +88,7 @@ tsff = ts.filterFormatter = {
 				v = ui && ui.value && ts.formatFloat((ui.value + '').replace(/[><=]/g,'')) ||
 					$cell.find('.spinner').val() || o.value,
 				compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
-				searchType = ui && typeof ui.delayed === 'boolean' ? ui.delayed : c.$table[0].hasInitialized ? o.delayed : true;
+				searchType = ui && typeof ui.delayed === 'boolean' ? ui.delayed : c.$table[0].hasInitialized ? o.delayed || '' : true;
 			if (o.addToggle) {
 				chkd = $cell.find('.toggle').is(':checked');
 			}
@@ -244,7 +245,7 @@ tsff = ts.filterFormatter = {
 				val = o.compare ? v : v === o.min ? o.allText : v,
 				compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
 				result = compare + val,
-				searchType = ui && typeof ui.delayed === 'boolean' ? ui.delayed : c.$table[0].hasInitialized ? o.delayed : true;
+				searchType = ui && typeof ui.delayed === 'boolean' ? ui.delayed : c.$table[0].hasInitialized ? o.delayed || '' : true;
 			if (o.valueToHeader) {
 				// add range indication to the header cell above!
 				$cell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(' (' + result + ')');
@@ -391,7 +392,7 @@ tsff = ts.filterFormatter = {
 				result = val[0] + ' - ' + val[1],
 				// make range an empty string if entire range is covered so the filter row will hide (if set)
 				range = val[0] === o.min && val[1] === o.max ? '' : result,
-				searchType = ui && typeof ui.delayed === 'boolean' ? ui.delayed : c.$table[0].hasInitialized ? o.delayed : true;
+				searchType = ui && typeof ui.delayed === 'boolean' ? ui.delayed : c.$table[0].hasInitialized ? o.delayed || '': true;
 			if (o.valueToHeader) {
 				// add range indication to the header cell above (if not using the css method)!
 				$cell.closest('thead').find('th[data-column=' + indx + ']').find('.currange').html(' (' + result + ')');
@@ -511,12 +512,12 @@ tsff = ts.filterFormatter = {
 		t, $shcell = [],
 
 		// this function updates the hidden input
-		date1Compare = function(v, notrigger) {
+		date1Compare = function(notrigger) {
 			var date, query,
-				getdate = v || $date.datepicker('getDate') || '',
+				getdate = $date.datepicker('getDate') || '',
 				compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
-				searchType = c.$table[0].hasInitialized ? o.delayed : true;
-			$date.datepicker('setDate', getdate === '' ? o.defaultDate || '' : getdate);
+				searchType = c.$table[0].hasInitialized ? o.delayed || '': true;
+			$date.datepicker('setDate', getdate === '' ? '' : getdate);
 			if (getdate === '') { notrigger = false; }
 			date = $date.datepicker('getDate');
 			query = date ? ( o.endOfDay && /<=/.test(compare) ? date.setHours(23, 59, 59) : date.getTime() ) || '' : '';
@@ -539,7 +540,7 @@ tsff = ts.filterFormatter = {
 
 		// Add date range picker
 		t = '<input type="text" class="date date' + indx + '" placeholder="' +
-			($hdr.data('placeholder') || $hdr.attr('data-placeholder') || '') + '" />';
+			($hdr.data('placeholder') || $hdr.attr('data-placeholder') || c.widgetOptions.filter_placeholder.search || '') + '" />';
 		$date = $(t).appendTo($cell);
 
 		// add callbacks; preserve added callbacks
@@ -556,7 +557,7 @@ tsff = ts.filterFormatter = {
 			if ($.isArray(o.compare)) {
 				$cell.add($shcell).find(compareSelect).val( o.compare[ o.selected || 0 ] );
 			}
-			$cell.add($shcell).find('.date').val(o.defaultDate).datepicker('setDate', '');
+			$cell.add($shcell).find('.date').val(o.defaultDate).datepicker('setDate', o.defaultDate);
 			setTimeout(function(){
 				date1Compare();
 			}, 0);
@@ -568,15 +569,17 @@ tsff = ts.filterFormatter = {
 			if (/\s+-\s+/.test(v)) {
 				// date range found; assume an exact match on one day
 				$cell.find(compareSelect).val('=');
-				num = new Date ( Number( v.split(/\s+-\s+/)[0] ) );
+				num = v.split(/\s+-\s+/)[0];
 				$date.datepicker( 'setDate', num );
 			} else {
 				num = (tsff.updateCompare($cell, $input, o)[1]).toString() || '';
 				// differeniate 1388556000000 from 1/1/2014 using \d{5} regex
-				num = num !== '' ? new Date( /\d{5}/g.test(num) ? Number(num) : num ) || '' : '';
+				num = num !== '' ? /\d{5}/g.test(num) ? Number(num) : num || '' : '';
 			}
 			$cell.add($shcell).find('.date').datepicker( 'setDate', num );
-			date1Compare(num, true);
+			setTimeout(function(){
+				date1Compare(true);
+			}, 0);
 		});
 
 		if (o.compare) {
@@ -628,8 +631,11 @@ tsff = ts.filterFormatter = {
 			changeYear : true,
 			numberOfMonths : 1
 		}, defDate),
-		t, closeTo, closeFrom, $shcell = [],
+		t, closeDate, $shcell = [],
 		c = $cell.closest('table')[0].config,
+		validDate = function(d){
+			return d instanceof Date && isFinite(d);
+		},
 		// Add a hidden input to hold the range values
 		$input = $('<input class="dateRange" type="hidden">')
 			.appendTo($cell)
@@ -639,69 +645,60 @@ tsff = ts.filterFormatter = {
 				if (v.match(' - ')) {
 					v = v.split(' - ');
 					$cell.find('.dateTo').val(v[1]);
-					closeFrom(v[0]);
+					closeDate(v[0]);
 				} else if (v.match('>=')) {
-					closeFrom( v.replace('>=', '') );
+					closeDate( v.replace('>=', '') );
 				} else if (v.match('<=')) {
-					closeTo( v.replace('<=', '') );
+					closeDate( v.replace('<=', '') );
 				}
-			});
+			}),
 
 		// make sure we're using parsed dates in the search
-		$cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed');
+		$hdr = $cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed');
 		// Add date range picker
-		t = '<label>' + o.textFrom + '</label><input type="text" class="dateFrom" /><label>' + o.textTo + '</label><input type="text" class="dateTo" />';
+		t = '<label>' + o.textFrom + '</label><input type="text" class="dateFrom" placeholder="' +
+			($hdr.data('placeholderFrom') || $hdr.attr('data-placeholder-from') || c.widgetOptions.filter_placeholder.from || '') + '" />' +
+			'<label>' + o.textTo + '</label><input type="text" class="dateTo" placeholder="' +
+			($hdr.data('placeholderTo') || $hdr.attr('data-placeholder-to') || c.widgetOptions.filter_placeholder.to || '') + '" />';
 		$(t).appendTo($cell);
 
 		// add callbacks; preserve added callbacks
 		o.oldonClose = o.onClose;
 
-		var localfrom = o.defaultDate = o.from || o.defaultDate;
-
-		closeFrom = o.onClose = function( selectedDate, ui ) {
+		closeDate = o.onClose = function( selectedDate, ui ) {
 			var range,
-				from = new Date( $cell.find('.dateFrom').datepicker('getDate') ).getTime() || '',
-				to = $cell.find('.dateTo').datepicker('getDate') || '';
-			to = to ? ( o.endOfDay ? to.setHours(23, 59, 59) : to.getTime() ) || '' : '';
+				from = $cell.find('.dateFrom').datepicker('getDate'),
+				to = $cell.find('.dateTo').datepicker('getDate');
+			from = validDate(from) ? from.getTime() : '';
+			to = validDate(to) ? ( o.endOfDay ? to.setHours(23, 59, 59) : to.getTime() ) || '' : '';
 			range = from ? ( to ? from + ' - ' + to : '>=' + from ) : (to ? '<=' + to : '');
-			$cell
+			$cell.add( $shcell )
 				.find('.dateRange').val(range)
-				.trigger('search').end()
-				.find('.dateTo').datepicker('option', 'minDate', selectedDate ).end()
-				.find('.dateFrom').val(selectedDate);
-
-			// update sticky header cell
-			if ($shcell.length) {
-				$shcell
-					.find('.dateTo').datepicker('option', 'minDate', selectedDate ).end()
-					.find('.dateFrom').val(selectedDate);
+				.trigger('search');
+			// date picker needs date objects
+			from = from ? new Date(from) : '';
+			to = to ? new Date(to) : '';
+
+			if (/<=/.test(range)) {
+				$cell.add( $shcell )
+					.find('.dateFrom').datepicker('option', 'maxDate', to ).end()
+					.find('.dateTo').datepicker('option', 'minDate', null).datepicker('setDate', to);
+			} else if (/>=/.test(range)) {
+				$cell.add( $shcell )
+					.find('.dateFrom').datepicker('option', 'maxDate', null).datepicker('setDate', from).end()
+					.find('.dateTo').datepicker('option', 'minDate', from );
+			} else {
+				$cell.add( $shcell )
+					.find('.dateFrom').datepicker('option', 'maxDate', null).datepicker('setDate', from ).end()
+					.find('.dateTo').datepicker('option', 'minDate', null).datepicker('setDate', to);
 			}
+
 			if (typeof o.oldonClose === 'function') { o.oldonClose(selectedDate, ui); }
 		};
 
+		o.defaultDate = o.from || '';
 		$cell.find('.dateFrom').datepicker(o);
-
 		o.defaultDate = o.to || '+7d'; // set to date +7 days from today (if not defined)
-		closeTo = o.onClose = function( selectedDate, ui ) {
-			var range,
-				from = new Date( $cell.find('.dateFrom').datepicker('getDate') ).getTime() || '',
-				to = $cell.find('.dateTo').datepicker('getDate') || '';
-			to = to ? ( o.endOfDay ? to.setHours(23, 59, 59) : to.getTime() ) || '' : '';
-			range = from ? ( to ? from + ' - ' + to : '>=' + from ) : (to ? '<=' + to : '');
-			$cell
-				.find('.dateRange').val(range)
-				.trigger('search').end()
-				.find('.dateFrom').datepicker('option', 'maxDate', selectedDate ).end()
-				.find('.dateTo').val(selectedDate);
-
-			// update sticky header cell
-			if ($shcell.length) {
-				$shcell
-					.find('.dateFrom').datepicker('option', 'maxDate', selectedDate ).end()
-					.find('.dateTo').val(selectedDate);
-			}
-			if (typeof o.oldonClose === 'function') { o.oldonClose(selectedDate, ui); }
-		};
 		$cell.find('.dateTo').datepicker(o);
 
 		// update date compare from hidden input, in case of saved filters
@@ -709,7 +706,6 @@ tsff = ts.filterFormatter = {
 			var val = $input.val() || '',
 				from = '',
 				to = '';
-
 			// date range
 			if (/\s+-\s+/.test(val)){
 				val = val.split(/\s+-\s+/) || [];
@@ -717,14 +713,17 @@ tsff = ts.filterFormatter = {
 				to = val[1] || '';
 			} else if (/>=/.test(val)) {
 				// greater than date (to date empty)
-				from = new Date(Number( val.replace(/>=/, '') )) || '';
+				from = val.replace(/>=/, '') || '';
 			} else if (/<=/.test(val)) {
 				// less than date (from date empty)
-				to = new Date(Number( val.replace(/<=/, '') )) || '';
+				to = val.replace(/<=/, '') || '';
 			}
 			$cell.add($shcell).find('.dateFrom').datepicker('setDate', from);
 			$cell.add($shcell).find('.dateTo').datepicker('setDate', to);
-			closeTo(to);
+			// give datepicker time to process
+			setTimeout(function(){
+				closeDate();
+			}, 0);
 		});
 
 		// has sticky headers?
@@ -733,18 +732,21 @@ tsff = ts.filterFormatter = {
 			$shcell.append(t);
 
 			// add a jQuery datepicker!
-			o.onClose = closeTo;
+			o.defaultDate = o.from || '';
+			$shcell.find('.dateFrom').datepicker(o);
+
+			o.defaultDate = o.to || '+7d';
 			$shcell.find('.dateTo').datepicker(o);
 
-			o.defaultDate = localfrom;
-			o.onClose = closeFrom;
-			$shcell.find('.dateFrom').datepicker(o);
 		});
 
 		// on reset
 		$cell.closest('table').bind('filterReset', function(){
 			$cell.add($shcell).find('.dateFrom').val('').datepicker('setDate', o.from );
 			$cell.add($shcell).find('.dateTo').val('').datepicker('setDate', o.to );
+			setTimeout(function(){
+				closeDate();
+			}, 0);
 		});
 
 		// return the hidden input so the filter widget has a reference to it
@@ -781,7 +783,7 @@ tsff = ts.filterFormatter = {
 			var chkd = o.addToggle ? $cell.find('.toggle').is(':checked') : true,
 				v = $cell.find('.number').val(),
 				compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
-				searchType = c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) : true;
+				searchType = c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) || '' : true;
 			$input
 				// add equal to the beginning, so we filter exact numbers
 				.val( !o.addToggle || chkd ? (compare ? compare : o.exactMatch ? '=' : '') + v : '' )
@@ -913,7 +915,7 @@ tsff = ts.filterFormatter = {
 			v = ( typeof v === "undefined" ? $input.val() : v ).toString().replace(/[<>=]/g,'') || o.value;
 			var compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
 				t = ' (' + (compare ? compare + v : v == o.min ? o.allText : v) + ')',
-				searchType =  c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) : true;
+				searchType =  c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) || '' : true;
 			$cell.find('input[type=hidden]')
 				// add equal to the beginning, so we filter exact numbers
 				.val( ( compare ? compare + v : ( v == o.min ? '' : ( o.exactMatch ? '=' : '' ) + v ) ) )

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.15+ widgets - updated 4/3/2014 (v2.15.13)
+/*! tableSorter 2.16+ widgets - updated 4/23/2014 (v2.16.0)
  *
  * Column Styles
  * Column Filters
@@ -360,9 +360,11 @@ ts.addWidget({
 		filter_ignoreCase    : true,  // if true, make all searches case-insensitive
 		filter_liveSearch    : true,  // if true, search column content while the user types (with a delay)
 		filter_onlyAvail     : 'filter-onlyAvail', // a header with a select dropdown & this class name will only show available (visible) options within the drop down
+		filter_placeholder   : { search : '', select : '' }, // default placeholder text (overridden by any header "data-placeholder" setting)
 		filter_reset         : null,  // jQuery selector string of an element used to reset the filters
 		filter_saveFilters   : false, // Use the $.tablesorter.storage utility to save the most recent filters
 		filter_searchDelay   : 300,   // typing delay in milliseconds before starting a search
+		filter_selectSource  : null,  // include a function to return an array of values to be added to the column filter select
 		filter_startsWith    : false, // if true, filter start from the beginning of the cell contents
 		filter_useParsedData : false, // filter all data using parsed content
 		filter_serversideFiltering : false, // if true, server-side filtering should be performed because client-side filtering will be disabled, but the ui and events will still be used.
@@ -584,12 +586,20 @@ ts.filter = {
 
 		// reset button/link
 		if (wo.filter_reset) {
-			$(document)
-			.undelegate(wo.filter_reset, 'click.tsfilter')
-			.delegate(wo.filter_reset, 'click.tsfilter', function() {
-				// trigger a reset event, so other functions (filterFormatter) know when to reset
-				c.$table.trigger('filterReset');
-			});
+			if (wo.filter_reset instanceof $) {
+				// reset contains a jQuery object, bind to it
+				wo.filter_reset.click(function(){
+					c.$table.trigger('filterReset');
+				});
+			} else if ($(wo.filter_reset).length) {
+				// reset is a jQuery selector, use event delegation
+				$(document)
+				.undelegate(wo.filter_reset, 'click.tsfilter')
+				.delegate(wo.filter_reset, 'click.tsfilter', function() {
+					// trigger a reset event, so other functions (filterFormatter) know when to reset
+					c.$table.trigger('filterReset');
+				});
+			}
 		}
 		if (wo.filter_functions) {
 			// column = column # (string)
@@ -604,7 +614,7 @@ ts.filter = {
 						for (string in wo.filter_functions[column]) {
 							if (typeof string === 'string') {
 								options += options === '' ?
-									'<option value="">' + ($header.data('placeholder') || $header.attr('data-placeholder') ||  '') + '</option>' : '';
+									'<option value="">' + ($header.data('placeholder') || $header.attr('data-placeholder') || wo.filter_placeholder.select || '') + '</option>' : '';
 								options += '<option value="' + string + '">' + string + '</option>';
 							}
 						}
@@ -715,7 +725,7 @@ ts.filter = {
 					buildFilter = $('<input type="search">').appendTo( c.$filters.eq(column) );
 				}
 				if (buildFilter) {
-					buildFilter.attr('placeholder', $header.data('placeholder') || $header.attr('data-placeholder') || '');
+					buildFilter.attr('placeholder', $header.data('placeholder') || $header.attr('data-placeholder') || wo.filter_placeholder.search || '');
 				}
 			}
 			if (buildFilter) {
@@ -725,7 +735,7 @@ ts.filter = {
 					wo.filter_cssFilter ) || '';
 				buildFilter.addClass( ts.css.filter + ' ' + name ).attr('data-column', column);
 				if (disabled) {
-					buildFilter.addClass('disabled')[0].disabled = true; // disabled!
+					buildFilter.attr('placeholder', '').addClass('disabled')[0].disabled = true; // disabled!
 				}
 			}
 		}
@@ -753,7 +763,7 @@ ts.filter = {
 		.attr('data-lastSearchTime', new Date().getTime())
 		.unbind('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, filters) {
+		.bind('keyup search change '.split(' ').join(c.namespace + 'filter '), function(event) {
 			$(this).attr('data-lastSearchTime', new Date().getTime());
 			// emulate what webkit does.... escape clears the filter
 			if (event.which === 27) {
@@ -865,20 +875,23 @@ ts.filter = {
 			if ($tbodies.eq(tbodyIndex).hasClass(c.cssInfoBlock || ts.css.info)) { continue; } // ignore info blocks, issue #264
 			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true);
 			// skip child rows & widget added (removable) rows - fixes #448 thanks to @hempel!
-			$rows = $tbody.children('tr').not(c.selectorRemove);
+			// $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;
 			if (combinedFilters === '' || wo.filter_serversideFiltering) {
-				$tbody.children().removeClass(wo.filter_filteredRow).not('.' + c.cssChildRow).show();
+				$rows.removeClass(wo.filter_filteredRow).not('.' + c.cssChildRow).show();
 			} else {
 				// optimize searching only through already filtered rows - see #313
 				searchFiltered = true;
 				lastSearch = c.lastSearch || c.$table.data('lastSearch') || [];
 				$.each(filters, function(indx, val) {
 					// check for changes from beginning of filter; but ignore if there is a logical "or" in the string
-					searchFiltered = (val || '').indexOf(lastSearch[indx] || '') === 0 && searchFiltered && !/(\s+or\s+|\|)/g.test(val || '');
+					searchFiltered = (val || '').indexOf(lastSearch[indx]) === 0 && searchFiltered && !/(\s+or\s+|\|)/g.test(val || '');
 				});
 				// can't search when all rows are hidden - this happens when looking for exact matches
-				if (searchFiltered && $rows.filter(':visible').length === 0) { searchFiltered = false; }
+				if (searchFiltered && $rows.not('.' + wo.filter_filteredRow).length === 0) { searchFiltered = false; }
 				if ((wo.filter_$anyMatch && wo.filter_$anyMatch.length) || filters[c.columns]) {
 					anyMatch = wo.filter_$anyMatch && wo.filter_$anyMatch.val() || filters[c.columns] || '';
 					if (c.sortLocaleCompare) {
@@ -887,7 +900,6 @@ ts.filter = {
 					}
 					iAnyMatch = anyMatch.toLowerCase();
 				}
-
 				// loop through the rows
 				cacheIndex = 0;
 				for (rowIndex = 0; rowIndex < len; rowIndex++) {
@@ -902,7 +914,7 @@ ts.filter = {
 					// checked here so the option can be changed dynamically
 					childRowText = (childRow.length && wo.filter_childRows) ? childRow.text() : '';
 					childRowText = wo.filter_ignoreCase ? childRowText.toLocaleLowerCase() : childRowText;
-					$cells = $rows.eq(rowIndex).children('td');
+					$cells = $rows.eq(rowIndex).children();
 
 					if (anyMatch) {
 						rowArray = $cells.map(function(i){
@@ -919,7 +931,7 @@ ts.filter = {
 						}).get();
 						rowText = rowArray.join(' ');
 						iRowText = rowText.toLowerCase();
-						rowCache = c.cache[tbodyIndex].normalized[cacheIndex].join(' ');
+						rowCache = c.cache[tbodyIndex].normalized[cacheIndex].slice(0,-1).join(' ');
 						filterMatched = null;
 						$.each(ts.filter.types, function(type, typeFunction) {
 							if ($.inArray(type, anyMatchNotAllowedTypes) < 0) {
@@ -1010,47 +1022,80 @@ ts.filter = {
 		if (c.debug) {
 			ts.benchmark("Completed filter widget search", time);
 		}
-		c.$table.trigger('applyWidgets'); // make sure zebra widget is applied
 		c.$table.trigger('filterEnd');
+		setTimeout(function(){
+			c.$table.trigger('applyWidgets'); // make sure zebra widget is applied
+		}, 0);
 	},
-	buildSelect: function(table, column, updating, onlyavail) {
-		if (!table.config.cache || $.isEmptyObject(table.config.cache)) { return; }
-		column = parseInt(column, 10);
-		var indx, rowIndex, tbodyIndex, len, currentValue, txt, $filters,
-			c = table.config,
+	getOptionSource: function(table, column, onlyAvail) {
+		var c = table.config,
 			wo = c.widgetOptions,
-			$tbodies = c.$tbodies,
-			arry = [],
-			node = c.$headers.filter('[data-column="' + column + '"]:last'),
-			// t.data('placeholder') won't work in jQuery older than 1.4.3
-			options = '<option value="">' + ( node.data('placeholder') || node.attr('data-placeholder') || '' ) + '</option>';
-		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
-			len = c.cache[tbodyIndex].row.length;
-			// loop through the rows
-			for (rowIndex = 0; rowIndex < len; rowIndex++) {
-				// check if has class filtered
-				if (onlyavail && c.cache[tbodyIndex].row[rowIndex][0].className.match(wo.filter_filteredRow)) { continue; }
-				// get non-normalized cell content
-				if (wo.filter_useParsedData) {
-					arry.push( '' + c.cache[tbodyIndex].normalized[rowIndex][column] );
-				} else {
-					node = c.cache[tbodyIndex].row[rowIndex][0].cells[column];
-					if (node) {
-						arry.push( $.trim( node.textContent || node.innerText || $(node).text() ) );
-					}
-				}
-			}
+			arry = false,
+			source = wo.filter_selectSource;
+
+		// filter select source option
+		if ($.isFunction(source)) {
+			// OVERALL source
+			arry = source(table, column, onlyAvail);
+		} else if ($.type(source) === 'object' && source.hasOwnProperty(column)) {
+			// custom select source function for a SPECIFIC COLUMN
+			arry = source[column](table, column, onlyAvail);
 		}
+		if (arry === false) {
+			// fall back to original method
+			arry = ts.filter.getOptions(table, column, onlyAvail);
+		}
+
 		// get unique elements and sort the list
 		// if $.tablesorter.sortText exists (not in the original tablesorter),
 		// then natural sort the list otherwise use a basic sort
 		arry = $.grep(arry, function(value, indx) {
 			return $.inArray(value, arry) === indx;
 		});
-		arry = (ts.sortNatural) ? arry.sort(function(a, b) { return ts.sortNatural(a, b); }) : arry.sort(true);
-
-		// Get curent filter value
-		currentValue = c.$table.find('thead').find('select.' + ts.css.filter + '[data-column="' + column + '"]').val();
+		return (ts.sortNatural) ? arry.sort(function(a, b) { return ts.sortNatural(a, b); }) : arry.sort(true);
+	},
+	getOptions: function(table, column, onlyAvail) {
+		var rowIndex, tbodyIndex, len, row, cache, cell,
+			c = table.config,
+			wo = c.widgetOptions,
+			$tbodies = c.$table.children('tbody'),
+			arry = [];
+		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
+			if (!$tbodies.eq(tbodyIndex).hasClass(c.cssInfoBlock)) {
+				cache = c.cache[tbodyIndex];
+				len = c.cache[tbodyIndex].normalized.length;
+				// loop through the rows
+				for (rowIndex = 0; rowIndex < len; rowIndex++) {
+					// get cached row from cache.row (old) or row data object (new; last item in normalized array)
+					row = cache.row ? cache.row[rowIndex] : cache.normalized[rowIndex][c.columns].$row[0];
+					// check if has class filtered
+					if (onlyAvail && row.className.match(wo.filter_filteredRow)) { continue; }
+					// get non-normalized cell content
+					if (wo.filter_useParsedData) {
+						arry.push( '' + cache.normalized[rowIndex][column] );
+					} else {
+						cell = row.cells[column];
+						if (cell) {
+							arry.push( $.trim( cell.textContent || cell.innerText || $(cell).text() ) );
+						}
+					}
+				}
+			}
+		}
+		return arry;
+	},
+	buildSelect: function(table, column, updating, onlyAvail) {
+		if (!table.config.cache || $.isEmptyObject(table.config.cache)) { return; }
+		column = parseInt(column, 10);
+		var indx, txt, $filters,
+			c = table.config,
+			wo = c.widgetOptions,
+			node = c.$headers.filter('[data-column="' + column + '"]:last'),
+			// t.data('placeholder') won't work in jQuery older than 1.4.3
+			options = '<option value="">' + ( node.data('placeholder') || node.attr('data-placeholder') || wo.filter_placeholder.select || '' ) + '</option>',
+			arry = ts.filter.getOptionSource(table, column, onlyAvail),
+			// Get curent filter value
+			currentValue = c.$table.find('thead').find('select.' + ts.css.filter + '[data-column="' + column + '"]').val();
 
 		// build option list
 		for (indx = 0; indx < arry.length; indx++) {
@@ -1150,7 +1195,8 @@ 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.$table.trigger('search', [filter, false]).trigger('filterFomatterUpdate');
+		ts.filter.searching(c.$table[0], filter, skipFirst);
+		c.$table.trigger('filterFomatterUpdate');
 	}
 	return !!valid;
 };
@@ -1235,7 +1281,8 @@ ts.addWidget({
 		if ($stickyTable.attr('id')) { $stickyTable[0].id += wo.stickyHeaders_cloneId; }
 		// clear out cloned table, except for sticky header
 		// include caption & filter row (fixes #126 & #249) - don't remove cells to get correct cell indexing
-		$stickyTable.find('thead:gt(0), tr.sticky-false, tbody, tfoot').hide();
+		$stickyTable.find('thead:gt(0), tr.sticky-false').hide();
+		$stickyTable.find('tbody, tfoot').remove();
 		if (!wo.stickyHeaders_includeCaption) {
 			$stickyTable.find('caption').remove();
 		} else {