jquery-tablesorter 1.12.4 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b3086b10974536212d92994bb1a07c53305fb0d
-  data.tar.gz: a8a53ba9dda00df5fda43382fd4996c4ef50d5cc
+  metadata.gz: d3a2967474752c48b4b2bcd5743672332758b852
+  data.tar.gz: e78a3ef07c01f2d563ee9df828b69ff6dec9d114
 SHA512:
-  metadata.gz: 54887be0d4abdfba84a5c6c01b724a34756e95618369b6078a51dbaef6afa2edafb3ee5ed5f43cea7bf67941b732db7238c2f33f62a24a8cc18c679dd7ec52ac
-  data.tar.gz: a51d74004a0ea5f3aa2fb7fe710d2f23665a5b846f0749eb3e36b232b696cbaaae150e31b8d5773d735fe2d3d56c787fda1f18328bf883bf5f9a1a82d2fe7101
+  metadata.gz: 7290bf0447e717080dd596016945d29db62e82d586c32ad329d0177eb2691ca979729bb162d31f7e707f24a181df2385febb1e26e5d5a7cc89f3c16e14683e09
+  data.tar.gz: 12387d4cfe2fa24a7ff2906002012a43afb7970fc91e432fa1caae5522e3206b3a41fb73e9acf612d526333039699ab683cc56eeb6bf01c3a5cffbc753989b9b

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.17.4 (7/4/2014), [documentation]
+Current tablesorter version: 2.17.5 (7/17/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.4'
+  VERSION = '1.12.5'
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 7/4/2014 (v2.17.4)
+ * updated 7/17/2014 (v2.17.5)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -137,15 +137,20 @@
 			t = [ (c.widgetOptions && c.widgetOptions.filter_filteredRow || 'filtered'), c.selectorRemove.replace(/^(\w+\.)/g,'') ];
 			if (p.countChildRows) { t.push(c.cssChildRow); }
 			regex = new RegExp( '(' + t.join('|') + ')' );
-			p.totalPages = Math.ceil( p.totalRows / sz ); // needed for "pageSize" method
 			if (f && !p.ajaxUrl) {
-				p.filteredRows = 0;
-				$.each(c.cache[0].normalized, function(i, el) {
-					p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
-				});
+				if ($.isEmptyObject(c.cache)) {
+					// delayInit: true so nothing is in the cache
+					p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( p.countChildRows ? '' : '.' + c.cssChildRow ).length;
+				} else {
+					p.filteredRows = 0;
+					$.each(c.cache[0].normalized, function(i, el) {
+						p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
+					});
+				}
 			} else if (!f) {
 				p.filteredRows = p.totalRows;
 			}
+			p.totalPages = Math.ceil( p.totalRows / sz ); // needed for "pageSize" method
 			c.totalRows = p.totalRows;
 			c.filteredRows = p.filteredRows;
 			p.filteredPages = Math.ceil( p.filteredRows / sz ) || 0;
@@ -292,7 +297,7 @@
 						exception === 'timeout' ? 'Time out error' :
 						exception === 'abort' ? 'Ajax Request aborted' :
 						'Uncaught error: ' + xhr.statusText + ' [' + xhr.status + ']' );
-					c.$tbodies.eq(0).children().detach();
+					c.$tbodies.eq(0).children('tr').detach();
 					p.totalRows = 0;
 				} else {
 					// process ajax object
@@ -317,7 +322,7 @@
 					if (d instanceof jQuery) {
 						if (p.processAjaxOnInit) {
 							// append jQuery object
-							c.$tbodies.eq(0).children().detach();
+							c.$tbodies.eq(0).children('tr').detach();
 							c.$tbodies.eq(0).append(d);
 						}
 					} else if (l) {
@@ -477,7 +482,13 @@
 				l = rows && rows.length || 0, // rows may be undefined
 				s = ( p.page * p.size ),
 				e = p.size;
-			if ( l < 1 ) { return; } // empty table, abort!
+			if ( l < 1 ) {
+				if (c.debug) {
+					ts.log('Pager: no rows for pager to render');
+				}
+				// empty table, abort!
+				return;
+			}
 			if ( p.page >= p.totalPages ) {
 				// lets not render the table more than once
 				moveToLastPage(table, p);
@@ -540,12 +551,32 @@
 			});
 		},
 
+		// updateCache if delayInit: true
+		updateCache = function(table) {
+			var c = table.config,
+				p = c.pager;
+			c.$table.trigger('updateCache', [ function(){
+				var i,
+					rows = [],
+					n = table.config.cache[0].normalized;
+				p.totalRows = n.length;
+				for (i = 0; i < p.totalRows; i++) {
+					rows.push(n[i][c.columns].$row);
+				}
+				c.rowsCopy = rows;
+				moveToPage(table, p, true);
+			} ]);
+		},
+
 		moveToPage = function(table, p, pageMoved) {
 			if ( p.isDisabled ) { return; }
 			var c = table.config,
 				$t = $(table),
 				l = p.last,
 				pg = Math.min( p.totalPages, p.filteredPages );
+			if ( pageMoved !== false && p.initialized && $.isEmptyObject(table.config.cache)) {
+				return updateCache(table);
+			}
 			if ( p.page < 0 ) { p.page = 0; }
 			if ( p.page > ( pg - 1 ) && pg !== 0 ) { p.page = pg - 1; }
 			// fixes issue where one currentFilter is [] and the other is ['','',''],
@@ -716,6 +747,10 @@
 					// update pager after filter widget completes
 					.bind('filterEnd.pager sortEnd.pager', function() {
 						if (p.initialized) {
+							if (c.delayInit && c.rowsCopy && c.rowsCopy.length === 0) {
+								// make sure we have a copy of all table rows once the cache has been built
+								updateCache(table);
+							}
 							// update page display first, so we update p.filteredPages
 							updatePageDisplay(table, p, false);
 							moveToPage(table, p, false);
@@ -754,7 +789,7 @@
 						e.stopPropagation();
 						p.page = (parseInt(v, 10) || 1) - 1;
 						if (p.$goto.length) { p.$goto.val(p.size); } // twice?
-						moveToPage(table, p);
+						moveToPage(table, p, true);
 						updatePageDisplay(table, p, false);
 					});
 
@@ -784,7 +819,7 @@
 						.unbind('change')
 						.bind('change', function(){
 							p.page = $(this).val() - 1;
-							moveToPage(table, p);
+							moveToPage(table, p, true);
 							updatePageDisplay(table, p, false);
 						});
 				}

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.17.4 - Client-side table sorting with ease!
+* TableSorter 2.17.5 - 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.4";
+			ts.version = "2.17.5";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -274,6 +274,7 @@
 					$tb = c.$table.children('tbody'),
 				parsers = c.parsers;
 				c.cache = {};
+				c.totalRows = 0;
 				// if no parsers found, return - it's an empty table.
 				if (!parsers) {
 					return c.debug ? log('Warning: *Empty table!* Not building a cache') : '';
@@ -343,6 +344,8 @@
 							cc.normalized.push(cols);
 						}
 						cc.colMax = colMax;
+						// total up rows, not including child rows
+						c.totalRows += cc.normalized.length;
 					}
 				}
 				if (c.showProcessing) {
@@ -1013,6 +1016,7 @@
 				if (!/tablesorter\-/.test($table.attr('class'))) {
 					k = (c.theme !== '' ? ' tablesorter-' + c.theme : '');
 				}
+				c.table = table;
 				c.$table = $table
 					.addClass(ts.css.table + ' ' + c.tableClass + k)
 					.attr({ role : 'grid'});
@@ -1043,6 +1047,8 @@
 				fixColumnWidth(table);
 				// try to auto detect column type, and store in tables config
 				buildParserCache(table);
+				// start total row count at zero
+				c.totalRows = 0;
 				// build the cache for the tbody cells
 				// delayInit will delay building the cache until the user starts a sort
 				if (!c.delayInit) { buildCache(table); }
@@ -1534,13 +1540,14 @@
 					$.each(widgets, function(i,w){
 						if (w) {
 							if (init || !(c.widgetInit[w.id])) {
+								// set init flag first to prevent calling init more than once (e.g. pager)
+								c.widgetInit[w.id] = true;
 								if (w.hasOwnProperty('options')) {
 									wo = table.config.widgetOptions = $.extend( true, {}, w.options, wo );
 								}
 								if (w.hasOwnProperty('init')) {
 									w.init(table, w, c, wo);
 								}
-								c.widgetInit[w.id] = true;
 							}
 							if (!init && w.hasOwnProperty('format')) {
 								w.format(table, c, wo, false);

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

@@ -1,4 +1,4 @@
-/*! Filter widget formatter functions - updated 4/30/2014 (v2.16.3)
+/*! Filter widget select2 formatter function - updated 7/17/2014 (v2.17.5)
  * 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 */
@@ -102,6 +102,7 @@ ts.filterFormatter.select2 = function($cell, indx, select2Def) {
 		val = val.replace(/[/()$^]/g, '').split('|');
 		$cell.find('.select2').select2('val', val);
 		updateSelect2();
+		ts.filter.formatterUpdated($cell, indx);
 	});
 
 	// has sticky headers?

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

@@ -1,4 +1,4 @@
-/*! Filter widget formatter functions - updated 6/18/2014 (v2.17.2)
+/*! Filter widget formatter functions - updated 7/17/2014 (v2.17.5)
  * requires: tableSorter 2.15+ and jQuery 1.4.3+
  *
  * uiSpinner (jQuery UI spinner)
@@ -145,6 +145,7 @@ tsff = ts.filterFormatter = {
 			var val = tsff.updateCompare($cell, $input, o)[0];
 			$cell.find('.spinner').val( val );
 			updateSpinner({ value: val }, true);
+			ts.filter.formatterUpdated($cell, indx);
 		});
 
 		if (o.compare) {
@@ -303,6 +304,7 @@ tsff = ts.filterFormatter = {
 			var val = tsff.updateCompare($cell, $input, o)[0];
 			$cell.find('.slider').slider('value', val );
 			updateSlider({ value: val }, false);
+			ts.filter.formatterUpdated($cell, indx);
 		});
 
 		if (o.compare) {
@@ -447,6 +449,7 @@ tsff = ts.filterFormatter = {
 		// update slider from hidden input, in case of saved filters
 		c.$table.bind('filterFomatterUpdate', function(){
 			getRange();
+			ts.filter.formatterUpdated($cell, indx);
 		});
 
 		// on reset
@@ -579,6 +582,7 @@ tsff = ts.filterFormatter = {
 			$cell.add($shcell).find('.date').datepicker( 'setDate', num || null );
 			setTimeout(function(){
 				date1Compare(true);
+				ts.filter.formatterUpdated($cell, indx);
 			}, 0);
 		});
 
@@ -728,6 +732,7 @@ tsff = ts.filterFormatter = {
 			// give datepicker time to process
 			setTimeout(function(){
 				closeDate();
+				ts.filter.formatterUpdated($cell, indx);
 			}, 0);
 		});
 
@@ -848,6 +853,7 @@ tsff = ts.filterFormatter = {
 				var val = tsff.updateCompare($cell, $input, o)[0] || o.value;
 				$cell.find('.number').val( ((val || '') + '').replace(/[><=]/g,'') );
 				updateNumber(false, true);
+				ts.filter.formatterUpdated($cell, indx);
 			});
 
 			if (o.compare) {
@@ -968,6 +974,7 @@ tsff = ts.filterFormatter = {
 				var val = tsff.updateCompare($cell, $input, o)[0];
 				$cell.find('.range').val( val );
 				updateRange(val, false, true);
+				ts.filter.formatterUpdated($cell, indx);
 			});
 
 			if (o.compare) {
@@ -1100,6 +1107,7 @@ tsff = ts.filterFormatter = {
 			// update slider from hidden input, in case of saved filters
 			c.$table.bind('filterFomatterUpdate', function(){
 				updateColor( $input.val(), true );
+				ts.filter.formatterUpdated($cell, indx);
 			});
 
 			// on reset

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.16+ widgets - updated 7/4/2014 (v2.17.4)
+/*! tableSorter 2.16+ widgets - updated 7/17/2014 (v2.17.5)
  *
  * Column Styles
  * Column Filters
@@ -54,7 +54,6 @@ $.extend(ts.css, {
 	filter    : 'tablesorter-filter',
 	wrapper   : 'tablesorter-wrapper',      // ui theme & resizable
 	resizer   : 'tablesorter-resizer',      // resizable
-	grip      : 'tablesorter-resizer-grip',
 	sticky    : 'tablesorter-stickyHeader', // stickyHeader
 	stickyVis : 'tablesorter-sticky-visible'
 });
@@ -444,7 +443,7 @@ ts.filter = {
 					savedSearch = query;
 				// parse filter value in case we're comparing numbers (dates)
 				if (parsed[index] || parser.type === 'numeric') {
-					result = parser.format( $.trim('' + iFilter.replace(ts.filter.regex.operators, '')), table, [], index );
+					result = ts.filter.parseFilter(table, $.trim('' + iFilter.replace(ts.filter.regex.operators, '')), index, parsed[index], true);
 					query = ( typeof result === "number" && result !== '' && !isNaN(result) ) ? result : query;
 				}
 
@@ -463,9 +462,9 @@ ts.filter = {
 			return null;
 		},
 		// Look for a not match
-		notMatch: function( filter, iFilter, exact, iExact, cached, index, table, wo ) {
+		notMatch: function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
 			if ( /^\!/.test(iFilter) ) {
-				iFilter = iFilter.replace('!', '');
+				iFilter = ts.filter.parseFilter(table, iFilter.replace('!', ''), index, parsed[index]);
 				if (ts.filter.regex.exact.test(iFilter)) {
 					// look for exact not matches - see #628
 					iFilter = iFilter.replace(ts.filter.regex.exact, '');
@@ -481,19 +480,19 @@ ts.filter = {
 		exact: function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed, rowArray ) {
 			/*jshint eqeqeq:false */
 			if (ts.filter.regex.exact.test(iFilter)) {
-				var fltr = iFilter.replace(ts.filter.regex.exact, '');
+				var fltr = ts.filter.parseFilter(table, iFilter.replace(ts.filter.regex.exact, ''), index, parsed[index]);
 				return rowArray ? $.inArray(fltr, rowArray) >= 0 : fltr == iExact;
 			}
 			return null;
 		},
 		// Look for an AND or && operator (logical and)
-		and : function( filter, iFilter, exact, iExact ) {
+		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(query[0]) ) >= 0,
+					result = iExact.search( $.trim(ts.filter.parseFilter(table, query[0], index, parsed[index])) ) >= 0,
 					indx = query.length - 1;
 				while (result && indx) {
-					result = result && iExact.search( $.trim(query[indx]) ) >= 0;
+					result = result && iExact.search( $.trim(ts.filter.parseFilter(table, query[indx], index, parsed[index])) ) >= 0;
 					indx--;
 				}
 				return result;
@@ -507,8 +506,8 @@ ts.filter = {
 					c = table.config,
 					// 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);
+					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 );
 					// parse filter value in case we're comparing numbers (dates)
 				if (parsed[index] || c.parsers[index].type === 'numeric') {
 					result = c.parsers[index].format('' + query[0], table, c.$headers.eq(index), index);
@@ -528,22 +527,23 @@ ts.filter = {
 		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 = iFilter.replace(ts.filter.regex.orReplace, "|");
+					query = ts.filter.parseFilter(table, iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed[index]);
 				// 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 + ')$';
 				}
+				// parsing the filter may not work properly when using wildcards =/
 				return new RegExp( query.replace(/\?/g, '\\S{1}').replace(/\*/g, '\\S*') ).test(iExact);
 			}
 			return null;
 		},
 		// fuzzy text search; modified from https://github.com/mattyork/fuzzy (MIT license)
-		fuzzy: function( filter, iFilter, exact, iExact ) {
+		fuzzy: function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
 			if ( /^~/.test(iFilter) ) {
 				var indx,
 					patternIndx = 0,
 					len = iExact.length,
-					pattern = iFilter.slice(1);
+					pattern = ts.filter.parseFilter(table, iFilter.slice(1), index, parsed[index]);
 				for (indx = 0; indx < len; indx++) {
 					if (iExact[indx] === pattern[patternIndx]) {
 						patternIndx += 1;
@@ -572,8 +572,11 @@ ts.filter = {
 		}
 		c.$table.addClass('hasFilters');
 
-		// define searchTimer so using clearTimeout won't cause an undefined error
+		// define timers so using clearTimeout won't cause an undefined error
 		wo.searchTimer = null;
+		wo.filter_initTimer = null;
+		wo.filter_formatterCount = 0;
+		wo.filter_formatterInit = [];
 
 		$.extend( regex, {
 			child : new RegExp(c.cssChildRow),
@@ -593,7 +596,7 @@ ts.filter = {
 		}
 
 		c.$table.bind('addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join(c.namespace + 'filter '), function(event, filter) {
-			c.$table.find('.' + ts.css.filterRow).toggle( !(wo.filter_hideEmpty && $.isEmptyObject(c.cache)) ); // fixes #450
+			c.$table.find('.' + ts.css.filterRow).toggle( !(wo.filter_hideEmpty && $.isEmptyObject(c.cache) && !(c.delayInit && event.type === 'appendCache')) ); // fixes #450
 			if ( !/(search|filter)/.test(event.type) ) {
 				event.stopPropagation();
 				ts.filter.buildDefault(table, true);
@@ -681,6 +684,9 @@ ts.filter = {
 			});
 		}
 
+		// set filtered rows count (intially unfiltered)
+		c.filteredRows = c.totalRows;
+
 		if (c.debug) {
 			ts.benchmark("Applying Filter widget", time);
 		}
@@ -690,24 +696,58 @@ ts.filter = {
 			var wo = this.config.widgetOptions;
 			filters = ts.filter.setDefaults(table, c, wo) || [];
 			if (filters.length) {
-				ts.setFilters(table, filters, true);
-				// ts.filter.checkFilters(table, filters);
+				// prevent delayInit from triggering a cache build if filters are empty
+				if ( !(c.delayInit && filters.join('') === '') ) {
+					ts.setFilters(table, filters, true);
+				}
 			}
 			c.$table.trigger('filterFomatterUpdate');
-			if (!wo.filter_initialized) {
-				// filter widget initialized
-				wo.filter_initialized = true;
-				c.$table.trigger('filterInit', c);
-			}
+			// trigger init after setTimeout to prevent multiple filterStart/End/Init triggers
+			setTimeout(function(){
+				if (!wo.filter_initialized) {
+					ts.filter.filterInitComplete(c);
+				}
+			}, 100);
 		});
 		// if filter widget is added after pager has initialized; then set filter init flag
 		if (c.pager && c.pager.initialized && !wo.filter_initialized) {
+			c.$table.trigger('filterFomatterUpdate');
+			setTimeout(function(){
+				ts.filter.filterInitComplete(c);
+			}, 100);
+		}
+	},
+	// $cell parameter, but not the config, is passed to the
+	// filter_formatters, so we have to work with it instead
+	formatterUpdated: function($cell, column) {
+		var wo = $cell.closest('table')[0].config.widgetOptions;
+		if (!wo.filter_initialized) {
+			// add updates by column since this function
+			// may be called numerous times before initialization
+			wo.filter_formatterInit[column] = 1;
+		}
+	},
+	filterInitComplete: function(c){
+		var wo = c.widgetOptions,
+			count = 0;
+		$.each( wo.filter_formatterInit, function(i, val) {
+			if (val === 1) {
+				count++;
+			}
+		});
+		clearTimeout(wo.filter_initTimer);
+		if (!wo.filter_initialized && count === wo.filter_formatterCount) {
+			// filter widget initialized
 			wo.filter_initialized = true;
-			c.$table
-				.trigger('filterFomatterUpdate')
-				.trigger('filterInit', c);
+			c.$table.trigger('filterInit', c);
+		} 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);
+			}, 500);
 		}
-
 	},
 	setDefaults: function(table, c, wo) {
 		var isArray, saved, indx,
@@ -728,6 +768,12 @@ ts.filter = {
 		c.$table.data('lastSearch', filters);
 		return filters;
 	},
+	parseFilter: function(table, filter, column, parsed, forceParse){
+		var c = table.config;
+		return forceParse || parsed ?
+			c.parsers[column].format( filter, table, [], column ) :
+			filter;
+	},
 	buildRow: function(table, c, wo) {
 		var column, $header, buildSelect, disabled, name, ffxn,
 			// c.columns defined in computeThIndexes()
@@ -753,6 +799,7 @@ ts.filter = {
 			} else {
 				ffxn = ts.getColumnData( table, wo.filter_formatter, column );
 				if (ffxn) {
+					wo.filter_formatterCount++;
 					buildFilter = ffxn( c.$filters.eq(column), column );
 					// no element returned, so lets go find it
 					if (buildFilter && buildFilter.length === 0) {
@@ -825,7 +872,9 @@ ts.filter = {
 			ts.filter.searching( table, true, true );
 		})
 		.bind('search change keypress '.split(' ').join(c.namespace + 'filter '), function(event){
-			if (event.which === 13 || event.type === 'search' || event.type === 'change') {
+			var column = $(this).data('column');
+			// don't allow "change" event to process if the input value is the same - fixes #685
+			if (event.which === 13 || event.type === 'search' || event.type === 'change' && this.value !== c.lastSearch[column]) {
 				event.preventDefault();
 				// init search with no delay
 				$(this).attr('data-lastSearchTime', new Date().getTime());
@@ -853,7 +902,15 @@ ts.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; }
+		if ($.isEmptyObject(c.cache)) {
+			// update cache if delayInit set & pager has initialized (after user initiates a search)
+			if (c.delayInit && c.pager && c.pager.initialized) {
+				c.$table.trigger('updateCache', [function(){
+					ts.filter.checkFilters(table, false, skipFirst);
+				}] );
+			}
+			return;
+		}
 		// add filter array back into inputs
 		if (filterArray) {
 			ts.setFilters( table, filters, false, skipFirst !== true );
@@ -1092,7 +1149,7 @@ ts.filter = {
 									result = filterMatched;
 								// Look for match, and add child row data for matching
 								} else {
-									exact = (iExact + childRowText).indexOf(iFilter);
+									exact = (iExact + childRowText).indexOf( ts.filter.parseFilter(table, iFilter, columnIndex, parsed[columnIndex]) );
 									result = ( (!wo.filter_startsWith && exact >= 0) || (wo.filter_startsWith && exact === 0) );
 								}
 							}
@@ -1208,7 +1265,7 @@ ts.filter = {
 					// check if has class filtered
 					if (onlyAvail && row.className.match(wo.filter_filteredRow)) { continue; }
 					// get non-normalized cell content
-					if (wo.filter_useParsedData) {
+					if (wo.filter_useParsedData || c.parsers[column].parsed || c.$headers.filter('[data-column="' + column + '"]:last').hasClass('filter-parsed')) {
 						arry.push( '' + cache.normalized[rowIndex][column] );
 					} else {
 						cell = row.cells[column];
@@ -1579,13 +1636,13 @@ ts.addWidget({
 		$columns
 		.each(function() {
 			var $column = $(this),
-				padding = parseInt($column.css('padding-right'), 10) + 10; // 10 is 1/2 of the 20px wide resizer grip
+				padding = parseInt($column.css('padding-right'), 10) + 10; // 10 is 1/2 of the 20px wide resizer
 			$column
 				.find('.' + ts.css.wrapper)
 				.append('<div class="' + ts.css.resizer + '" style="cursor:w-resize;position:absolute;z-index:1;right:-' +
 					padding + 'px;top:0;height:100%;width:20px;"></div>');
 		})
-		.find('.' + ts.css.resizer + ',.' + ts.css.grip)
+		.find('.' + ts.css.resizer)
 		.bind('mousedown', function(event) {
 			// save header cell and mouse position
 			$target = $(event.target).closest('th');
@@ -1629,7 +1686,7 @@ ts.addWidget({
 			.children('tr').children()
 			.unbind('mousemove.tsresize mouseup.tsresize')
 			// don't remove "tablesorter-wrapper" as uitheme uses it too
-			.find('.' + ts.css.resizer + ',.' + ts.css.grip).remove();
+			.find('.' + ts.css.resizer).remove();
 		ts.resizableReset(table);
 	}
 });

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

@@ -0,0 +1,20 @@
+/*! image alt attribute parser for jQuery 1.7+ & tablesorter 2.7.11+
+ * New 7/17/2014 (v2.17.5)
+ */
+/*jshint jquery:true, unused:false */
+;(function($){
+"use strict";
+
+	$.tablesorter.addParser({
+		id: "image",
+		is: function(){
+			return false;
+		},
+		format: function(s, table, cell) {
+			return $(cell).find('img').attr(table.config.imgAttr || 'alt') || s;
+		},
+		parsed : true, // filter widget flag
+		type: "text"
+	});
+
+})(jQuery);

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

@@ -1,5 +1,5 @@
 /*! input & select parsers for jQuery 1.7+ & tablesorter 2.7.11+
- * Updated 5/28/2014 (v2.17.1)
+ * Updated 7/17/2014 (v2.17.5)
  * Demo: http://mottie.github.com/tablesorter/docs/example-widget-grouping.html
  */
 /*jshint browser: true, jquery:true, unused:false */
@@ -64,34 +64,50 @@
 		type: "text"
 	});
 
+	// Select parser to get the selected text
+	$.tablesorter.addParser({
+		id: "select-text",
+		is: function(){
+			return false;
+		},
+		format: function(s, table, cell) {
+			var $s = $(cell).find('select');
+			return $s.length ? $s.find('option:selected').text() || '' : s;
+		},
+		parsed : true, // filter widget flag
+		type: "text"
+	});
+
 	// update select and all input types in the tablesorter cache when the change event fires.
 	// This method only works with jQuery 1.7+
 	// you can change it to use delegate (v1.4.3+) or live (v1.3+) as desired
 	// if this code interferes somehow, target the specific table $('#mytable'), instead of $('table')
-	$(window).load(function(){
-		// this flag prevents the updateCell event from being spammed
-		// it happens when you modify input text and hit enter
-		var alreadyUpdating = false,
-			t = $.tablesorter.css.table || 'tablesorter';
-		// bind to .tablesorter (default class name)
-		$('.' + t).find('tbody').on('change', 'select, input', function(e){
-			if (!alreadyUpdating) {
-				var $tar = $(e.target),
-					$cell = $tar.closest('td'),
-					$table = $cell.closest('table'),
-					indx = $cell[0].cellIndex,
-					c = $table[0].config || false,
-					$hdr = c && c.$headers && c.$headers.eq(indx);
-				// abort if not a tablesorter table, or
-				// don't use updateCell if column is set to "sorter-false" and "filter-false", or column is set to "parser-false"
-				if ( !c || ( $hdr && $hdr.length && ( $hdr.hasClass('parser-false') || ($hdr.hasClass('sorter-false') && $hdr.hasClass('filter-false')) ) ) ){
-					return false;
+	$(function(){
+		$('table').on('tablesorter-initialized', function(){
+			// this flag prevents the updateCell event from being spammed
+			// it happens when you modify input text and hit enter
+			var alreadyUpdating = false;
+			// bind to .tablesorter (default class name)
+			$(this).children('tbody').on('change', 'select, input', function(e){
+				if (!alreadyUpdating) {
+					var $tar = $(e.target),
+						$cell = $tar.closest('td'),
+						$table = $cell.closest('table'),
+						indx = $cell[0].cellIndex,
+						c = $table[0].config || false,
+						$hdr = c && c.$headers && c.$headers.eq(indx);
+					// abort if not a tablesorter table, or
+					// don't use updateCell if column is set to "sorter-false" and "filter-false", or column is set to "parser-false"
+					if ( !c || ( $hdr && $hdr.length && ( $hdr.hasClass('parser-false') || ($hdr.hasClass('sorter-false') && $hdr.hasClass('filter-false')) ) ) ){
+						return false;
+					}
+					alreadyUpdating = true;
+					$table.trigger('updateCell', [ $tar.closest('td'), resort, function(){
+						updateServer(e, $table, $tar);
+						setTimeout(function(){ alreadyUpdating = false; }, 10);
+					} ]);
 				}
-				alreadyUpdating = true;
-				$table.trigger('updateCell', [ $tar.closest('td'), resort ]);
-				updateServer(e, $table, $tar);
-				setTimeout(function(){ alreadyUpdating = false; }, 10);
-			}
+			});
 		});
 	});
 

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

@@ -1,4 +1,4 @@
-/* Output widget (beta) for TableSorter 5/22/2014 (v2.17.0)
+/* Output widget (beta) for TableSorter 7/17/2014 (v2.17.5)
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * Modified from:
  * HTML Table to CSV: http://www.kunalbabre.com/projects/table2CSV.php (License unknown?)
@@ -221,33 +221,55 @@ output = ts.output = {
 	},
 
 	// modified from https://github.com/PixelsCommander/Download-File-JS
+	// & http://html5-demos.appspot.com/static/a.download.html
 	download : function (wo, data){
-		var e, link,
-			processedData = wo.output_encoding + encodeURIComponent(data);
+
+		var e, blob, gotBlob,
+			nav = window.navigator,
+			link = document.createElement('a');
 
 		// iOS devices do not support downloading. We have to inform user about this.
-		if (/(iP)/g.test(navigator.userAgent)) {
+		if (/(iP)/g.test(nav.userAgent)) {
 			alert(output.message);
 			return false;
 		}
-		// If in Chrome or Safari - download via virtual link click
-		if ( /(chrome|safari)/.test(navigator.userAgent.toLowerCase()) ) {
-			// Creating new link node.
-			link = document.createElement('a');
-			link.href = processedData;
-			link.download = wo.output_saveFileName;
-			// Dispatching click event.
-			if (document.createEvent) {
-				e = document.createEvent('MouseEvents');
-				e.initEvent('click', true, true);
-				link.dispatchEvent(e);
-				return true;
+
+		// test for blob support
+		try {
+			gotBlob = !!new Blob();
+		} catch (err) {
+			gotBlob = false;
+		}
+
+		// Use HTML5 Blob if browser supports it
+		if ( gotBlob ) {
+
+			window.URL = window.webkitURL || window.URL;
+			blob = new Blob([data], {type: wo.output_encoding});
+
+			if (nav.msSaveBlob) {
+				// IE 10+
+				nav.msSaveBlob(blob, wo.output_saveFileName);
+			} else {
+				// all other browsers
+				link.href = window.URL.createObjectURL(blob);
+				link.download = wo.output_saveFileName;
+				// Dispatching click event; using $(link).trigger() won't work
+				if (document.createEvent) {
+					e = document.createEvent('MouseEvents');
+					// event.initMouseEvent(type, canBubble, cancelable, view, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget);
+					e.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+					link.dispatchEvent(e);
+				}
 			}
+			return false;
 		}
-		// Force file download (whether supported by server).
-		processedData += '?download';
-		window.open(processedData, '_self');
+
+		// fallback to force file download (whether supported by server).
+		// not sure if this actually works in IE9 and older...
+		window.open( wo.output_encoding + encodeURIComponent(data) + '?download' , '_self');
 		return true;
+
 	},
 
 	remove : function(c) {
@@ -278,11 +300,9 @@ ts.addWidget({
 		output_callback      : function(config, data){ return true; },
 		// JSON callback executed when a colspan is encountered in the header
 		output_callbackJSON  : function($cell, txt, cellIndex) { return txt + '(' + (cellIndex) + ')'; },
-		// output data type (with BOM or Windows-1252 is needed for excel)
-		// NO BOM   : 'data:text/csv;charset=utf8,'
-		// With BOM : 'data:text/csv;charset=utf8,%EF%BB%BF'
-		// WIN 1252 : 'data:text/csv;charset=windows-1252'
-		output_encoding      : 'data:text/csv;charset=utf8,'
+		// the need to modify this for Excel no longer exists
+		output_encoding      : 'data:application/octet-stream;charset=utf8,'
+
 	},
 	init: function(table, thisWidget, c) {
 		output.init(c);

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

@@ -1,4 +1,4 @@
-/* Pager widget for TableSorter 7/4/2014 (v2.17.4) */
+/* Pager widget for TableSorter 7/17/2014 (v2.17.5) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($){
 "use strict";
@@ -153,7 +153,7 @@ tsp = ts.pager = {
 		p.$goto = p.$container.find(s.gotoPage); // goto is a reserved word #657
 		// page size selector
 		p.$size = p.$container.find(s.pageSize);
-		p.totalRows = c.$tbodies.eq(0).children('tr').length;
+		p.totalRows = c.$tbodies.eq(0).children('tr').not( c.widgetOptions.pager_countChildRows ? '' : '.' + c.cssChildRow ).length;
 		p.oldAjaxSuccess = p.oldAjaxSuccess || wo.pager_ajaxObject.success;
 		c.appender = tsp.appender;
 		if (ts.filter && $.inArray('filter', c.widgets) >= 0) {
@@ -199,11 +199,11 @@ tsp = ts.pager = {
 		var p = c.pager;
 		tsp.changeHeight(table, c);
 		tsp.bindEvents(table, c);
+		tsp.setPageSize(table, 0, c); // page size 0 is ignored
 
 		// pager initialized
 		p.initialized = true;
 		p.isInitializing = false;
-		tsp.setPageSize(table, 0, c); // page size 0 is ignored
 		c.$table.trigger('pagerInitialized', c);
 		tsp.updatePageDisplay(table, c);
 	},
@@ -226,6 +226,10 @@ tsp = ts.pager = {
 			// update pager after filter widget completes
 			.bind('filterEnd.pager sortEnd.pager', function() {
 				if (p.initialized) {
+					if (c.delayInit && c.rowsCopy && c.rowsCopy.length === 0) {
+						// make sure we have a copy of all table rows once the cache has been built
+						tsp.updateCache(table);
+					}
 					// update page display first, so we update p.filteredPages
 					tsp.updatePageDisplay(table, c, false);
 					tsp.moveToPage(table, p, false);
@@ -266,7 +270,7 @@ tsp = ts.pager = {
 				e.stopPropagation();
 				p.page = (parseInt(v, 10) || 1) - 1;
 				if (p.$goto.length) { p.$goto.val(c.size); } // twice?
-				tsp.moveToPage(table, p);
+				tsp.moveToPage(table, p, true);
 				tsp.updatePageDisplay(table, c, false);
 			});
 
@@ -296,7 +300,7 @@ tsp = ts.pager = {
 				.unbind('change')
 				.bind('change', function(){
 					p.page = $(this).val() - 1;
-					tsp.moveToPage(table, p);
+					tsp.moveToPage(table, p, true);
 					tsp.updatePageDisplay(table, c, false);
 				});
 		}
@@ -342,15 +346,20 @@ tsp = ts.pager = {
 		if (wo.pager_countChildRows) { t.push(c.cssChildRow); }
 		regex = new RegExp( '(' + t.join('|') + ')' );
 		p.$size.add(p.$goto).removeClass(wo.pager_css.disabled).removeAttr('disabled').attr('aria-disabled', 'false');
-		p.totalPages = Math.ceil( p.totalRows / sz ); // needed for "pageSize" method
 		if (f && !wo.pager_ajaxUrl) {
-			p.filteredRows = 0;
-			$.each(c.cache[0].normalized, function(i, el) {
-				p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
-			});
+			if ($.isEmptyObject(c.cache)) {
+				// delayInit: true so nothing is in the cache
+				p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( c.widgetOptions.pager_countChildRows ? '' : '.' + c.cssChildRow ).length;
+			} else {
+				p.filteredRows = 0;
+				$.each(c.cache[0].normalized, function(i, el) {
+					p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
+				});
+			}
 		} else if (!f) {
 			p.filteredRows = p.totalRows;
 		}
+		p.totalPages = Math.ceil( p.totalRows / sz ); // needed for "pageSize" method
 		c.totalRows = p.totalRows;
 		c.filteredRows = p.filteredRows;
 		p.filteredPages = Math.ceil( p.filteredRows / sz ) || 0;
@@ -494,7 +503,7 @@ tsp = ts.pager = {
 					ts.log('Ajax Error', xhr, exception);
 				}
 				ts.showError(table, exception.message + ' (' + xhr.status + ')');
-				c.$tbodies.eq(0).children().detach();
+				c.$tbodies.eq(0).children('tr').detach();
 				p.totalRows = 0;
 			} else {
 				// process ajax object
@@ -519,7 +528,7 @@ tsp = ts.pager = {
 				if (d instanceof jQuery) {
 					if (wo.pager_processAjaxOnInit) {
 						// append jQuery object
-						c.$tbodies.eq(0).children().detach();
+						c.$tbodies.eq(0).children('tr').detach();
 						c.$tbodies.eq(0).append(d);
 					}
 				} else if (l) {
@@ -676,14 +685,19 @@ tsp = ts.pager = {
 			l = rows && rows.length || 0, // rows may be undefined
 			s = ( p.page * p.size ),
 			e = p.size;
-		if ( l < 1 ) { return; } // empty table, abort!
+		if ( l < 1 ) {
+			if (c.debug) {
+				ts.log('Pager: no rows for pager to render');
+			}
+			// empty table, abort!
+			return;
+		}
 		if ( p.page >= p.totalPages ) {
 			// lets not render the table more than once
 			return tsp.moveToLastPage(table, p);
 		}
 		p.isDisabled = false; // needed because sorting will change the page and re-enable the pager
 		if (p.initialized) { c.$table.trigger('pagerChange', c); }
-
 		if ( !wo.pager_removeRows ) {
 			tsp.hideRows(table, c);
 		} else {
@@ -746,8 +760,33 @@ tsp = ts.pager = {
 		});
 	},
 
+	// updateCache if delayInit: true
+	// this is normally done by "appendToTable" function in the tablesorter core AFTER a sort
+	updateCache: function(table) {
+		var c = table.config,
+			p = c.pager;
+		c.$table.trigger('updateCache', [ function(){
+			if ( !$.isEmptyObject(table.config.cache) ) {
+				var i,
+					rows = [],
+					n = table.config.cache[0].normalized;
+				p.totalRows = n.length;
+				for (i = 0; i < p.totalRows; i++) {
+					rows.push(n[i][c.columns].$row);
+				}
+				c.rowsCopy = rows;
+				tsp.moveToPage(table, p, true);
+				// clear out last search to force an update
+				p.last.currentFilters = [' '];
+			}
+		} ]);
+	},
+
 	moveToPage: function(table, p, pageMoved) {
 		if ( p.isDisabled ) { return; }
+		if ( pageMoved !== false && p.initialized && $.isEmptyObject(table.config.cache)) {
+			return tsp.updateCache(table);
+		}
 		var c = table.config,
 			l = p.last,
 			pg = Math.min( p.totalPages, p.filteredPages );
@@ -796,17 +835,17 @@ tsp = ts.pager = {
 		$.data(table, 'pagerLastSize', p.size);
 		p.totalPages = Math.ceil( p.totalRows / p.size );
 		p.filteredPages = Math.ceil( p.filteredRows / p.size );
-		tsp.moveToPage(table, p);
+		tsp.moveToPage(table, p, true);
 	},
 
 	moveToFirstPage: function(table, p) {
 		p.page = 0;
-		tsp.moveToPage(table, p);
+		tsp.moveToPage(table, p, true);
 	},
 
 	moveToLastPage: function(table, p) {
 		p.page = ( Math.min( p.totalPages, p.filteredPages ) - 1 );
-		tsp.moveToPage(table, p);
+		tsp.moveToPage(table, p, true);
 	},
 
 	moveToNextPage: function(table, p) {
@@ -814,7 +853,7 @@ tsp = ts.pager = {
 		if ( p.page >= ( Math.min( p.totalPages, p.filteredPages ) - 1 ) ) {
 			p.page = ( Math.min( p.totalPages, p.filteredPages ) - 1 );
 		}
-		tsp.moveToPage(table, p);
+		tsp.moveToPage(table, p, true);
 	},
 
 	moveToPrevPage: function(table, p) {
@@ -822,7 +861,7 @@ tsp = ts.pager = {
 		if ( p.page <= 0 ) {
 			p.page = 0;
 		}
-		tsp.moveToPage(table, p);
+		tsp.moveToPage(table, p, true);
 	},
 
 	destroyPager: function(table, c){
@@ -872,7 +911,7 @@ tsp = ts.pager = {
 			p.totalRows = c.widgetOptions.pager_countChildRows ? c.$tbodies.eq(0).children('tr').length : rows.length;
 			p.size = $.data(table, 'pagerLastSize') || p.size || wo.pager_size || 10;
 			p.totalPages = Math.ceil( p.totalRows / p.size );
-			tsp.moveToPage(table, p, true);
+			tsp.moveToPage(table, p);
 			// update display here in case all rows are removed
 			tsp.updatePageDisplay(table, c, false);
 		} else {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.5
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -93,6 +93,7 @@ files:
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-feet-inch-fraction.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-file-type.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-ignore-articles.js
+- vendor/assets/javascripts/jquery-tablesorter/parsers/parser-image.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-input-select.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-ipv6.js
 - vendor/assets/javascripts/jquery-tablesorter/parsers/parser-metric.js