jquery-tablesorter 1.12.5 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3a2967474752c48b4b2bcd5743672332758b852
-  data.tar.gz: e78a3ef07c01f2d563ee9df828b69ff6dec9d114
+  metadata.gz: dad82916aeb678dc8bf4d725a13478229aac98c6
+  data.tar.gz: be61736afbcfacfcfad39a3beedbe9d23c424b10
 SHA512:
-  metadata.gz: 7290bf0447e717080dd596016945d29db62e82d586c32ad329d0177eb2691ca979729bb162d31f7e707f24a181df2385febb1e26e5d5a7cc89f3c16e14683e09
-  data.tar.gz: 12387d4cfe2fa24a7ff2906002012a43afb7970fc91e432fa1caae5522e3206b3a41fb73e9acf612d526333039699ab683cc56eeb6bf01c3a5cffbc753989b9b
+  metadata.gz: b60c0de8ee6f20f55e5c1e393ca69a3f53d8fc50eef292152fcd57d18ef465ea64bb45b9dd00903483fb5aaf12f3cf833fab0cd0ec17d72f1bba02436417a83b
+  data.tar.gz: 13c349069d081c29bffffdac92708e18b6cfff3a8bdc9ccfe78e6a19072940a89a854527fae4a687ca53811637a1fbf8bdcb2f0d2b023e88107536607837acc4

data/README.md

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

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 7/17/2014 (v2.17.5)
+ * updated 8/1/2014 (v2.17.6)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -129,7 +129,7 @@
 		},
 
 		updatePageDisplay = function(table, p, completed) {
-			var i, pg, s, out, regex,
+			var i, pg, s, $out, regex,
 				c = table.config,
 				f = c.$table.hasClass('hasFilters'),
 				t = [],
@@ -159,7 +159,7 @@
 				p.startRow = (t) ? 1 : (p.filteredRows === 0 ? 0 : p.size * p.page + 1);
 				p.page = (t) ? 0 : p.page;
 				p.endRow = Math.min( p.filteredRows, p.totalRows, p.size * ( p.page + 1 ) );
-				out = p.$container.find(p.cssPageDisplay);
+				$out = p.$container.find(p.cssPageDisplay);
 				// form the output string (can now get a new output string from the server)
 				s = ( p.ajaxData && p.ajaxData.output ? p.ajaxData.output || p.output : p.output )
 					// {page} = one-based index; {page+#} = zero based index +/- value
@@ -168,15 +168,21 @@
 					})
 					// {totalPages}, {extra}, {extra:0} (array) or {extra : key} (object)
 					.replace(/\{\w+(\s*:\s*\w+)?\}/gi, function(m){
-						var str = m.replace(/[{}\s]/g,''),
+						var len, indx,
+							str = m.replace(/[{}\s]/g,''),
 							extra = str.split(':'),
 							data = p.ajaxData,
 							// return zero for default page/row numbers
 							deflt = /(rows?|pages?)$/i.test(str) ? 0 : '';
+						if (/(startRow|page)/.test(extra[0]) && extra[1] === 'input') {
+							len = ('' + (extra[0] === 'page' ? p.totalPages : p.totalRows)).length;
+							indx = extra[0] === 'page' ? p.page + 1 : p.startRow;
+							return '<input type="text" class="ts-' + extra[0] + '" style="max-width:' + len + 'em" value="' + indx + '"/>';
+						}
 						return extra.length > 1 && data && data[extra[0]] ? data[extra[0]][extra[1]] : p[str] || (data ? data[str] : deflt) || deflt;
 					});
-				if (out.length) {
-					out[ (out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
+				if ($out.length) {
+					$out[ ($out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
 					if ( p.$goto.length ) {
 						t = '';
 						pg = Math.min( p.totalPages, p.filteredPages );
@@ -185,6 +191,12 @@
 						}
 						p.$goto.html(t).val( p.page + 1 );
 					}
+					// rebind startRow/page inputs
+					$out.find('.ts-startRow, .ts-page').unbind('change').bind('change', function(){
+						var v = $(this).val(),
+							pg = $(this).hasClass('ts-startRow') ? Math.floor( v/p.size ) + 1 : v;
+						c.$table.trigger('pageSet.pager', [ pg ]);
+					});
 				}
 			}
 			pagerArrows(p);
@@ -546,7 +558,7 @@
 				}
 			}
 			// disable size selector
-			p.$size.add(p.$goto).each(function(){
+			p.$size.add(p.$goto).add(p.$container.find('.ts-startRow, .ts-page')).each(function(){
 				$(this).attr('aria-disabled', 'true').addClass(p.cssDisabled)[0].disabled = true;
 			});
 		},
@@ -665,7 +677,10 @@
 		enablePager = function(table, p, triggered){
 			var info,
 				c = table.config;
-			p.$size.add(p.$goto).removeClass(p.cssDisabled).removeAttr('disabled').attr('aria-disabled', 'false');
+			p.$size.add(p.$goto).add(p.$container.find('.ts-startRow, .ts-page'))
+				.removeClass(p.cssDisabled)
+				.removeAttr('disabled')
+				.attr('aria-disabled', 'false');
 			p.isDisabled = false;
 			p.page = $.data(table, 'pagerLastPage') || p.page || 0;
 			p.size = $.data(table, 'pagerLastSize') || parseInt(p.$size.find('option[selected]').val(), 10) || p.size || 10;
@@ -827,6 +842,8 @@
 				// page size selector
 				p.$size = pager.find(p.cssPageSize);
 				if ( p.$size.length ) {
+					// setting an option as selected appears to cause issues with initial page size
+					p.$size.find('option').removeAttr('selected');
 					p.$size.unbind('change.pager').bind('change.pager', function() {
 						p.$size.val( $(this).val() ); // in case there are more than one pagers
 						if ( !$(this).hasClass(p.cssDisabled) ) {

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.17.5 - Client-side table sorting with ease!
+* TableSorter 2.17.6 - 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.5";
+			ts.version = "2.17.6";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -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, np, p, time,
+					rows, list, l, i, h, ch, np, p, e, time,
 					j = 0,
 					parsersDebug = "",
 					len = tb.length;
@@ -229,7 +229,10 @@
 					time = new Date();
 					log('Detecting parsers for each column');
 				}
-				list = [];
+				list = {
+					extractors: [],
+					parsers: []
+				};
 				while (j < len) {
 					rows = tb[j].rows;
 					if (rows[j]) {
@@ -238,7 +241,8 @@
 							h = c.$headers.filter('[data-column="' + i + '"]:last');
 							// get column indexed table cell
 							ch = ts.getColumnData( table, c.headers, i );
-							// get column parser
+							// get column parser/extractor
+							e = ts.getParserById( ts.getData(h, ch, 'extractor') );
 							p = ts.getParserById( ts.getData(h, ch, 'sorter') );
 							np = ts.getData(h, ch, 'parser') === 'false';
 							// empty cells behaviour - keeping emptyToBottom for backwards compatibility
@@ -248,31 +252,38 @@
 							if (np) {
 								p = ts.getParserById('no-parser');
 							}
+							if (!e) {
+								// For now, maybe detect someday
+								e = false;
+							}
 							if (!p) {
 								p = detectParserForColumn(table, rows, -1, i);
 							}
 							if (c.debug) {
-								parsersDebug += "column:" + i + "; parser:" + p.id + "; string:" + c.strings[i] + '; empty: ' + c.empties[i] + "\n";
+								parsersDebug += "column:" + i + "; extractor:" + e.id + "; parser:" + p.id + "; string:" + c.strings[i] + '; empty: ' + c.empties[i] + "\n";
 							}
-							list[i] = p;
+							list.parsers[i] = p;
+							list.extractors[i] = e;
 						}
 					}
-					j += (list.length) ? len : 1;
+					j += (list.parsers.length) ? len : 1;
 				}
 				if (c.debug) {
 					log(parsersDebug ? parsersDebug : "No parsers detected");
 					benchmark("Completed detecting parsers", time);
 				}
-				c.parsers = list;
+				c.parsers = list.parsers;
+				c.extractors = list.extractors;
 			}
 
 			/* utils */
 			function buildCache(table) {
-				var cc, t, v, i, j, k, $row, rows, cols, cacheTime,
+				var cc, t, tx, v, i, j, k, $row, rows, cols, cacheTime,
 					totalRows, rowData, colMax,
 					c = table.config,
 					$tb = c.$table.children('tbody'),
-				parsers = c.parsers;
+					extractors = c.extractors,
+					parsers = c.parsers;
 				c.cache = {};
 				c.totalRows = 0;
 				// if no parsers found, return - it's an empty table.
@@ -330,10 +341,16 @@
 									continue;
 								}
 								t = getElementText(table, $row[0].cells[j], j);
+								// do extract before parsing if there is one
+								if (typeof extractors[j].id === 'undefined') {
+									tx = t;
+								} else {
+									tx = extractors[j].format(t, table, $row[0].cells[j], j);
+								}
 								// allow parsing if the string is empty, previously parsing would change it to zero,
 								// in case the parser needs to extract data from the table cell attributes
-								v = parsers[j].id === 'no-parser' ? '' : parsers[j].format(t, table, $row[0].cells[j], j);
-								cols.push(v);
+								v = parsers[j].id === 'no-parser' ? '' : parsers[j].format(tx, table, $row[0].cells[j], j);
+								cols.push( c.ignoreCase && typeof v === 'string' ? v.toLowerCase() : v );
 								if ((parsers[j].type || '').toLowerCase() === "numeric") {
 									// determine column max value (ignore sign)
 									colMax[j] = Math.max(Math.abs(v) || 0, colMax[j] || 0);
@@ -379,6 +396,7 @@
 					if ($bk.length && !$bk.hasClass(c.cssInfoBlock)) {
 						// get tbody
 						$tb = ts.processTbody(table, $bk, true);
+						$tb.children().detach(); // remove rows
 						n = cc[k].normalized;
 						totalRows = n.length;
 						for (i = 0; i < totalRows; i++) {
@@ -423,7 +441,8 @@
 				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.each(function(index) {
+				// redefine c.$headers here in case of an updateAll that replaces or adds an entire header cell - see #683
+				c.$headers = $(table).find(c.selectorHeaders).each(function(index) {
 					$t = $(this);
 					// make sure to get header cell & not column indexed cell
 					ch = ts.getColumnData( table, c.headers, index, true );
@@ -477,11 +496,13 @@
 			}
 
 			function updateHeader(table) {
-				var s, $th,
+				var s, $th, col,
 					c = table.config;
 				c.$headers.each(function(index, th){
 					$th = $(th);
-					s = ts.getData( th, ts.getColumnData( table, c.headers, index, true ), 'sorter' ) === 'false';
+					col = ts.getColumnData( table, c.headers, index, true );
+					// add "sorter-false" class if "parser-false" is set
+					s = ts.getData( th, col, 'sorter' ) === 'false' || ts.getData( th, col, 'parser' ) === 'false';
 					th.sortDisabled = s;
 					$th[ s ? 'addClass' : 'removeClass' ]('sorter-false').attr('aria-disabled', '' + s);
 					// aria-controls - requires table ID
@@ -544,7 +565,7 @@
 					var colgroup = $('<colgroup>'),
 						overallWidth = $(table).width();
 					// only add col for visible columns - fixes #371
-					$(table.tBodies[0]).find("tr:first").children("td:visible").each(function() {
+					$(table.tBodies[0]).find("tr:first").children(":visible").each(function() {
 						colgroup.append($('<col>').css('width', parseInt(($(this).width()/overallWidth)*1000, 10)/10 + '%'));
 					});
 					$(table).prepend(colgroup);
@@ -601,6 +622,10 @@
 			}
 
 			function initSort(table, cell, event){
+				if (table.isUpdating) {
+					// let any updates complete before initializing a sort
+					return setTimeout(function(){ initSort(table, cell, event); }, 50);
+				}
 				var arry, indx, col, order, s,
 					c = table.config,
 					key = !event[c.sortMultiSortKey],
@@ -833,7 +858,7 @@
 					table.isUpdating = true;
 					$table.find(c.selectorRemove).remove();
 					// get position from the dom
-					var v, row, icell,
+					var v, t, row, icell,
 					$tb = $table.find('tbody'),
 					$cell = $(cell),
 					// update cache - format: function(s, table, cell, cellIndex)
@@ -846,8 +871,14 @@
 						row = $tb.eq(tbdy).find('tr').index( $row );
 						icell = $cell.index();
 						c.cache[tbdy].normalized[row][c.columns].$row = $row;
-						v = c.cache[tbdy].normalized[row][icell] = c.parsers[icell].id === 'no-parser' ? '' :
-							c.parsers[icell].format( getElementText(table, cell, icell), table, cell, icell );
+						if (typeof c.extractors[icell].id === 'undefined') {
+							t = getElementText(table, cell, icell);
+						} else {
+							t = c.extractors[icell].format( getElementText(table, cell, icell), table, cell, icell );
+						}
+						v = c.parsers[icell].id === 'no-parser' ? '' :
+							c.parsers[icell].format( t, table, cell, icell );
+						c.cache[tbdy].normalized[row][icell] = c.ignoreCase && typeof v === 'string' ? v.toLowerCase() : v;
 						if ((c.parsers[icell].type || '').toLowerCase() === "numeric") {
 							// update column max value (ignore sign)
 							c.cache[tbdy].colMax[icell] = Math.max(Math.abs(v) || 0, c.cache[tbdy].colMax[icell] || 0);
@@ -863,8 +894,8 @@
 						updateHeader(table);
 						commonUpdate(table, resort, callback);
 					} else {
-						$row = $($row); // make sure we're using a jQuery object
-						var i, j, l, rowData, cells,
+						$row = $($row).attr('role', 'row'); // make sure we're using a jQuery object
+						var i, j, l, t, v, rowData, cells,
 						rows = $row.filter('tr').length,
 						tbdy = $table.find('tbody').index( $row.parents('tbody').filter(':first') );
 						// fixes adding rows to an empty table - see issue #179
@@ -882,8 +913,14 @@
 							};
 							// add each cell
 							for (j = 0; j < l; j++) {
-								cells[j] = c.parsers[j].id === 'no-parser' ? '' :
-									c.parsers[j].format( getElementText(table, $row[i].cells[j], j), table, $row[i].cells[j], j );
+								if (typeof c.extractors[j].id === 'undefined') {
+									t = getElementText(table, $row[i].cells[j], j);
+								} else {
+									t = c.extractors[j].format( getElementText(table, $row[i].cells[j], j), table, $row[i].cells[j], j );
+								}
+								v = c.parsers[j].id === 'no-parser' ? '' :
+									c.parsers[j].format( t, table, $row[i].cells[j], j );
+								cells[j] = c.ignoreCase && typeof v === 'string' ? v.toLowerCase() : v;
 								if ((c.parsers[j].type || '').toLowerCase() === "numeric") {
 									// update column max value (ignore sign)
 									c.cache[tbdy].colMax[j] = Math.max(Math.abs(cells[j]) || 0, c.cache[tbdy].colMax[j] || 0);
@@ -1019,8 +1056,8 @@
 				c.table = table;
 				c.$table = $table
 					.addClass(ts.css.table + ' ' + c.tableClass + k)
-					.attr({ role : 'grid'});
-				c.$headers = $(table).find(c.selectorHeaders);
+					.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) {
@@ -1030,6 +1067,7 @@
 					c.namespace = '.' + c.namespace.replace(/\W/g,'');
 				}
 
+				c.$table.children().children('tr').attr('role', 'row');
 				c.$tbodies = $table.children('tbody:not(.' + c.cssInfoBlock + ')').attr({
 					'aria-live' : 'polite',
 					'aria-relevant' : 'all'

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.16+ widgets - updated 7/17/2014 (v2.17.5)
+/*! tableSorter 2.16+ widgets - updated 8/1/2014 (v2.17.6)
  *
  * Column Styles
  * Column Filters
@@ -131,6 +131,7 @@ ts.storage = function(table, key, value, options) {
 // Add a resize event to table headers
 // **************************
 ts.addHeaderResizeEvent = function(table, disable, settings) {
+	table = $(table)[0]; // make sure we're usig a dom element
 	var headers,
 		defaults = {
 			timer : 250
@@ -371,7 +372,8 @@ ts.addWidget({
 		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.
-		filter_defaultAttrib : 'data-value' // data attribute in the header cell that contains the default filter value
+		filter_defaultAttrib : 'data-value', // data attribute in the header cell that contains the default filter value
+		filter_selectSourceSeparator : '|' // filter_selectSource array text left of the separator is added to the option value, right into the option text
 	},
 	format: function(table, c, wo) {
 		if (!c.$table.hasClass('hasFilters')) {
@@ -565,7 +567,7 @@ ts.filter = {
 			and : 'and'
 		}, ts.language);
 
-		var options, string, $header, column, filters, time, fxn,
+		var options, string, txt, $header, column, filters, val, time, fxn, noSelect,
 			regex = ts.filter.regex;
 		if (c.debug) {
 			time = new Date();
@@ -590,7 +592,7 @@ ts.filter = {
 		});
 
 		// 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) {
+		if (wo.filter_columnFilters !== false && c.$headers.filter('.filter-false, .parser-false').length !== c.$headers.length) {
 			// build filter row
 			ts.filter.buildRow(table, c, wo);
 		}
@@ -642,17 +644,27 @@ ts.filter = {
 			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');
+					// remove "filter-select" from header otherwise the options added here are replaced with all options
+					$header = c.$headers.filter('[data-column="' + column + '"]:last').removeClass('filter-select');
+					// don't build select if "filter-false" or "parser-false" set
+					noSelect = !($header.hasClass('filter-false') || $header.hasClass('parser-false'));
 					options = '';
-					if (fxn === true && !$header.hasClass('filter-false')) {
+					if ( fxn === true && noSelect ) {
 						ts.filter.buildSelect(table, column);
-					} else if (typeof fxn === 'object' && !$header.hasClass('filter-false')) {
+					} else if ( typeof fxn === 'object' && noSelect ) {
 						// add custom drop down list
 						for (string in fxn) {
 							if (typeof string === 'string') {
 								options += options === '' ?
 									'<option value="">' + ($header.data('placeholder') || $header.attr('data-placeholder') || wo.filter_placeholder.select || '') + '</option>' : '';
-								options += '<option value="' + string + '">' + string + '</option>';
+								val = string;
+								txt = string;
+								if (string.indexOf(wo.filter_selectSourceSeparator) >= 0) {
+									val = string.split(wo.filter_selectSourceSeparator);
+									txt = val[1];
+									val = val[0];
+								}
+								options += '<option ' + (txt === val ? '' : 'data-function-name="' + string + '" ') + 'value="' + val + '">' + txt + '</option>';
 							}
 						}
 						c.$table.find('thead').find('select.' + ts.css.filter + '[data-column="' + column + '"]').append(options);
@@ -691,7 +703,7 @@ ts.filter = {
 			ts.benchmark("Applying Filter widget", time);
 		}
 		// add default values
-		c.$table.bind('tablesorter-initialized pagerInitialized', function(e) {
+		c.$table.bind('tablesorter-initialized pagerInitialized', function() {
 			// redefine "wo" as it does not update properly inside this callback
 			var wo = this.config.widgetOptions;
 			filters = ts.filter.setDefaults(table, c, wo) || [];
@@ -775,10 +787,10 @@ ts.filter = {
 			filter;
 	},
 	buildRow: function(table, c, wo) {
-		var column, $header, buildSelect, disabled, name, ffxn,
+		var col, column, $header, buildSelect, disabled, name, ffxn,
 			// c.columns defined in computeThIndexes()
 			columns = c.columns,
-			buildFilter = '<tr class="' + ts.css.filterRow + '">';
+			buildFilter = '<tr role="row" class="' + ts.css.filterRow + '">';
 		for (column = 0; column < columns; column++) {
 			buildFilter += '<td></td>';
 		}
@@ -792,7 +804,8 @@ ts.filter = {
 			buildSelect = (wo.filter_functions && ffxn && typeof ffxn !== "function" ) ||
 				$header.hasClass('filter-select');
 			// get data from jQuery data, metadata, headers option or header class name
-			disabled = ts.getData($header[0], ts.getColumnData( table, c.headers, column ), 'filter') === 'false';
+			col = ts.getColumnData( table, c.headers, column );
+			disabled = ts.getData($header[0], col, 'filter') === 'false' || ts.getData($header[0], col, 'parser') === 'false';
 
 			if (buildSelect) {
 				buildFilter = $('<select>').appendTo( c.$filters.eq(column) );
@@ -983,7 +996,7 @@ ts.filter = {
 		var cached, len, $rows, rowIndex, tbodyIndex, $tbody, $cells, columnIndex,
 			childRow, childRowText, exact, iExact, iFilter, lastSearch, matches, result,
 			notFiltered, searchFiltered, filterMatched, showRow, time, val, indx,
-			anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache, fxn,
+			anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache, fxn, ffxn,
 			regex = ts.filter.regex,
 			c = table.config,
 			wo = c.widgetOptions,
@@ -1098,7 +1111,16 @@ ts.filter = {
 						if (filterMatched !== null) {
 							showRow = filterMatched;
 						} else {
-							showRow = (iRowText + childRowText).indexOf(iAnyMatch) >= 0;
+							if (wo.filter_startsWith) {
+								showRow = false;
+								columnIndex = columns;
+								while (!showRow && columnIndex > 0) {
+									columnIndex--;
+									showRow = showRow || rowArray[columnIndex].indexOf(iAnyMatch) === 0;
+								}
+							} else {
+								showRow = (iRowText + childRowText).indexOf(iAnyMatch) >= 0;
+							}
 						}
 					}
 
@@ -1117,6 +1139,9 @@ ts.filter = {
 							iExact = !regex.type.test(typeof exact) && wo.filter_ignoreCase ? exact.toLocaleLowerCase() : exact;
 							result = showRow; // if showRow is true, show that row
 
+							// in case select filter option has a different value vs text "a - z|A through Z"
+							ffxn = c.$filters.eq(columnIndex).find('select option:selected').attr('data-function-name') || '';
+
 							// replace accents - see #357
 							filters[columnIndex] = c.sortLocaleCompare ? ts.replaceAccents(filters[columnIndex]) : filters[columnIndex];
 							// val = case insensitive, filters[columnIndex] = case sensitive
@@ -1130,9 +1155,9 @@ ts.filter = {
 								} else if (typeof fxn === 'function') {
 									// filter callback( exact cell content, parser normalized content, filter input value, column index, jQuery row object )
 									result = fxn(exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
-								} else if (typeof fxn[filters[columnIndex]] === 'function') {
+								} else if (typeof fxn[ffxn || filters[columnIndex]] === 'function') {
 									// selector option function
-									result = fxn[filters[columnIndex]](exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
+									result = fxn[ffxn || filters[columnIndex]](exact, cached, filters[columnIndex], columnIndex, $rows.eq(rowIndex));
 								}
 							} else {
 								filterMatched = null;
@@ -1189,12 +1214,22 @@ ts.filter = {
 			parsed = [],
 			arry = false,
 			source = wo.filter_selectSource,
+			last = c.$table.data('lastSearch') || [],
 			fxn = $.isFunction(source) ? true : ts.getColumnData( table, source, column );
 
+		if (onlyAvail && last[column] !== '') {
+			onlyAvail = false;
+		}
+
 		// filter select source option
 		if (fxn === true) {
 			// OVERALL source
 			arry = source(table, column, onlyAvail);
+		} else if ( fxn instanceof $ || ($.type(fxn) === 'string' && fxn.indexOf('</option>') >= 0) ) {
+			// selectSource is a jQuery object or string of options
+			return fxn;
+		} else if ($.isArray(fxn)) {
+			arry = fxn;
 		} else if ($.type(source) === 'object' && fxn) {
 			// custom select source function for a SPECIFIC COLUMN
 			arry = fxn(table, column, onlyAvail);
@@ -1278,46 +1313,73 @@ ts.filter = {
 		}
 		return arry;
 	},
-	buildSelect: function(table, column, updating, onlyAvail) {
-		if (!table.config.cache || $.isEmptyObject(table.config.cache)) { return; }
+	buildSelect: function(table, column, arry, updating, onlyAvail) {
+		table = $(table)[0];
 		column = parseInt(column, 10);
-		var indx, txt, $filters,
+		if (!table.config.cache || $.isEmptyObject(table.config.cache)) { return; }
+		var indx, val, txt, t, $filters, $filter,
 			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();
+		// nothing included in arry (external source), so get the options from filter_selectSource or column data
+		if (typeof arry === 'undefined' || arry === '') {
+			arry = ts.filter.getOptionSource(table, column, onlyAvail);
+		}
 
-		// build option list
-		for (indx = 0; indx < arry.length; indx++) {
-			txt = arry[indx].replace(/\"/g, "&quot;");
-			// replace quotes - fixes #242 & ignore empty strings - see http://stackoverflow.com/q/14990971/145346
-			options += arry[indx] !== '' ? '<option value="' + txt + '"' + (currentValue === txt ? ' selected="selected"' : '') +
-				'>' + arry[indx] + '</option>' : '';
+		if ($.isArray(arry)) {
+			// build option list
+			for (indx = 0; indx < arry.length; indx++) {
+				txt = arry[indx] = ('' + arry[indx]).replace(/\"/g, "&quot;");
+				val = txt;
+				// allow including a symbol in the selectSource array
+				// "a-z|A through Z" so that "a-z" becomes the option value
+				// and "A through Z" becomes the option text
+				if (txt.indexOf(wo.filter_selectSourceSeparator) >= 0) {
+					t = txt.split(wo.filter_selectSourceSeparator);
+					val = t[0];
+					txt = t[1];
+				}
+				// replace quotes - fixes #242 & ignore empty strings - see http://stackoverflow.com/q/14990971/145346
+				options += arry[indx] !== '' ? '<option ' + (val === txt ? '' : 'data-function-name="' + arry[indx] + '" ') + 'value="' + val + '">' + txt + '</option>' : '';
+			}
+			// clear arry so it doesn't get appended twice
+			arry = [];
 		}
+
 		// update all selects in the same column (clone thead in sticky headers & any external selects) - fixes 473
 		$filters = ( c.$filters ? c.$filters : c.$table.children('thead') ).find('.' + ts.css.filter);
 		if (wo.filter_$externalFilters) {
 			$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;
+		$filter = $filters.filter('select[data-column="' + column + '"]');
+
+		// make sure there is a select there!
+		if ($filter.length) {
+			$filter[ updating ? 'html' : 'append' ](options);
+			if (!$.isArray(arry)) {
+				// append options if arry is provided externally as a string or jQuery object
+				// options (default value) was already added
+				$filter.append(arry).val(currentValue);
+			}
+			$filter.val(currentValue);
+		}
 	},
 	buildDefault: function(table, updating) {
-		var columnIndex, $header,
+		var columnIndex, $header, noSelect,
 			c = table.config,
 			wo = c.widgetOptions,
 			columns = c.columns;
 		// build default select dropdown
 		for (columnIndex = 0; columnIndex < columns; columnIndex++) {
 			$header = c.$headers.filter('[data-column="' + columnIndex + '"]:last');
+			noSelect = !($header.hasClass('filter-false') || $header.hasClass('parser-false'));
 			// look for the filter-select class; build/update it if found
-			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));
+			if (($header.hasClass('filter-select') || ts.getColumnData( table, wo.filter_functions, columnIndex ) === true) && noSelect) {
+				ts.filter.buildSelect(table, columnIndex, '', updating, $header.hasClass(wo.filter_onlyAvail));
 			}
 		}
 	}

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

@@ -71,7 +71,6 @@
 			var date = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/").match(/(\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2}(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?)/i);
 			if (date) {
 				date = date[0].replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/, "$2/$3/$1");
-				console.log(date);
 				return $.tablesorter.formatFloat((new Date(date).getTime() || ''), table) || s;
 			}
 			return s;

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 7/17/2014 (v2.17.5)
+ * Updated 8/1/2014 (v2.17.6)
  * Demo: http://mottie.github.com/tablesorter/docs/example-widget-grouping.html
  */
 /*jshint browser: true, jquery:true, unused:false */
@@ -78,6 +78,20 @@
 		type: "text"
 	});
 
+	// Custom parser for parsing textarea values
+	// updated dynamically using the "change" function below
+	$.tablesorter.addParser({
+		id: "textarea",
+		is: function(){
+			return false;
+		},
+		format: function(s, table, cell) {
+			return $(cell).find('textarea').val() || 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
@@ -86,10 +100,36 @@
 		$('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;
+			var focused = false,
+				restoreValue = function(){
+					// focused = false; // uncomment this line to prevent auto-accepting changes
+					// make sure we restore original values
+					$(':focus').blur();
+					return;
+				};
 			// bind to .tablesorter (default class name)
-			$(this).children('tbody').on('change', 'select, input', function(e){
-				if (!alreadyUpdating) {
+			$(this).children('tbody')
+			.on('mouseleave', function(){
+				restoreValue();
+			})
+			.on('focus', 'select, input, textarea', function(){
+				focused = true;
+				$(this).data('ts-original-value', this.value);
+			})
+			.on('blur', 'input, textarea', function(){
+				// restore input value;
+				// "change" is triggered before "blur" so this doesn't replace the new update with the original
+				this.value = $(this).data('ts-original-value');
+			})
+			.on('change keyup', 'select, input, textarea', function(e){
+				if ( e.which === 27 ) {
+					// escape: restore original value
+					this.value = $(this).data('ts-original-value');
+					return;
+				}
+				// Update cell cache using... select: change, input: enter or textarea: alt + enter
+				if ( ( e.type === 'change' && focused ) ||
+					( e.type === 'keyup' && e.which === 13 && ( e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA' && e.altKey ) ) ) {
 					var $tar = $(e.target),
 						$cell = $tar.closest('td'),
 						$table = $cell.closest('table'),
@@ -98,14 +138,17 @@
 						$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;
+					if ( !c || ( $hdr && $hdr.length && ( $hdr.hasClass('parser-false') || ( $hdr.hasClass('sorter-false') && $hdr.hasClass('filter-false') ) ) ) ) {
+						return restoreValue();
+					}
+					// ignore change event if nothing changed
+					if ($tar.val() !== $tar.data('ts-original-value')) {
+						$tar.data('ts-original-value', $tar.val());
+						$table.trigger('updateCell', [ $tar.closest('td'), resort, function(){
+							updateServer(e, $table, $tar);
+							setTimeout(function(){ focused = false; }, 10);
+						} ]);
 					}
-					alreadyUpdating = true;
-					$table.trigger('updateCell', [ $tar.closest('td'), resort, function(){
-						updateServer(e, $table, $tar);
-						setTimeout(function(){ alreadyUpdating = false; }, 10);
-					} ]);
 				}
 			});
 		});

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

@@ -1,4 +1,4 @@
-/*! tablesorter Editable Content widget - updated 1/24/2014 (core v2.15.0)
+/*! tablesorter Editable Content widget - updated 8/1/2014 (core v2.17.6)
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -12,76 +12,100 @@
 		options : {
 			editable_columns       : [],
 			editable_enterToAccept : true,
+			editable_autoAccept    : true,
 			editable_autoResort    : false,
+			editable_validate      : null, // function(text, originalText){ return text; }
 			editable_noEdit        : 'no-edit',
 			editable_editComplete  : 'editComplete'
 		},
 		init: function(table, thisWidget, c, wo){
-			if (!wo.editable_columns.length) { return; }
-			var indx, tmp, $t, cols = [];
-			if (wo.editable_columns.indexOf('-') >= 0) {
+			if ( !wo.editable_columns.length ) { return; }
+			var indx, tmp, $t,
+				cols = [];
+			if ( $.type(wo.editable_columns) === "string" && wo.editable_columns.indexOf('-') >= 0 ) {
 				// editable_columns can contain a range string (i.e. "2-4" )
 				tmp = wo.editable_columns.split('-');
 				indx = parseInt(tmp[0],10) || 0;
 				tmp = parseInt(tmp[1],10) || (c.columns - 1);
-				if (tmp > c.columns) { tmp = c.columns - 1; }
-				for (; indx <= tmp; indx++) {
+				if ( tmp > c.columns ) { tmp = c.columns - 1; }
+				for ( ; indx <= tmp; indx++ ) {
 					cols.push('td:nth-child(' + (indx + 1) + ')');
 				}
-			} else if ($.isArray(wo.editable_columns)) {
+			} else if ( $.isArray(wo.editable_columns) ) {
 				$.each(wo.editable_columns, function(i, col){
-					cols.push('td:nth-child(' + (col + 1) + ')');
+					if ( col < c.columns ) {
+						cols.push('td:nth-child(' + (col + 1) + ')');
+					}
 				});
 			}
 			// IE does not allow making TR/TH/TD cells directly editable (issue #404)
 			// so add a div or span inside ( it's faster than using wrapInner() )
-			c.$tbodies.find( cols.join(',') ).not('.' + wo.editable_noEdit).each(function(){
+			c.$tbodies.find( cols.join(',') ).not( '.' + wo.editable_noEdit ).each(function(){
 				// test for children, if they exist, then make the children editable
 				$t = $(this);
-				( $t.children().length ? $t.children() : $t ).prop('contenteditable', true);
+				( $t.children().length ? $t.children() : $t ).prop( 'contenteditable', true );
 			});
 			c.$tbodies
 				.on('mouseleave.tseditable', function(){
-					if (c.$table.data('contentFocused')) {
+					if ( c.$table.data('contentFocused') ) {
+						// change to "true" instead of element to allow focusout to process
+						c.$table.data( 'contentFocused', true );
 						$(':focus').trigger('blur');
 					}
 				})
-				.on('focus.tseditable', '[contenteditable]', function(){
-					c.$table.data('contentFocused', true);
-					var $this = $(this), v = $this.html();
+				.on('focus.tseditable', '[contenteditable]', function(e){
+					c.$table.data( 'contentFocused', e.target );
+					var $this = $(this),
+						v = $this.html();
 					if (wo.editable_enterToAccept) {
 						// prevent enter from adding into the content
 						$this.on('keydown.tseditable', function(e){
-							if (e.which === 13) {
+							if ( e.which === 13 ) {
 								e.preventDefault();
 							}
 						});
 					}
 					$this.data({ before : v, original: v });
 				})
-				.on('blur focusout keyup '.split(' ').join('.tseditable '), '[contenteditable]', function(e){
-					if (!c.$table.data('contentFocused')) { return; }
-					var $this = $(e.target), t;
-					if (e.which === 27) {
+				.on('blur focusout keydown '.split(' ').join('.tseditable '), '[contenteditable]', function(e){
+					if ( !c.$table.data('contentFocused') ) { return; }
+					var t,
+						valid = false,
+						$this = $(e.target);
+					if ( e.which === 27 ) {
 						// user cancelled
 						$this.html( $this.data('original') ).trigger('blur.tseditable');
-						c.$table.data('contentFocused', false);
+						c.$table.data( 'contentFocused', false );
 						return false;
 					}
-					t = e.type !== 'keyup' || (wo.editable_enterToAccept && e.which === 13);
+					t = e.which === 13 && ( wo.editable_enterToAccept || e.altKey ) || wo.editable_autoAccept && e.type !== 'keydown';
 					// change if new or user hits enter (if option set)
-					if ($this.data('before') !== $this.html() || t) {
-						$this.data('before', $this.html()).trigger('change');
-						if (t) {
-							c.$table
-								.data('contentFocused', false)
-								.trigger('updateCell', [ $this.closest('td'), wo.editable_autoResort, function(table){
-									$this.trigger( wo.editable_editComplete );
+					if ( t && $this.data('before') !== $this.html() ) {
+						valid = $.isFunction(wo.editable_validate) ? wo.editable_validate( $this.html(), $this.data('original') ) : $this.html();
+						if ( t && valid !== false ) {
+							$this
+								.html( valid )
+								.data('before', valid)
+								.trigger('change');
+							c.$table.trigger('updateCell', [ $this.closest('td'), wo.editable_autoResort, function(table){
+								$this.trigger( wo.editable_editComplete, [c] );
+								$this.data( 'original', $this.html() );
+								if ( wo.editable_autoResort && c.sortList.length ) {
 									c.$table.trigger('applyWidgets');
-								} ]);
-							$this.trigger('blur.tseditable');
+								}
+								// restore focus last cell after updating
+								setTimeout(function(){
+									var t = c.$table.data('contentFocused');
+									if ( t instanceof HTMLElement ) { t.focus(); }
+								}, 50);
+							} ]);
+							return false;
 						}
 					}
+					if ( !valid && e.type !== 'keydown' ) {
+						// restore original content on blur
+						$this.html( $this.data('original') );
+					}
 				});
 		}
 	});

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

@@ -1,4 +1,4 @@
-/* Pager widget for TableSorter 7/17/2014 (v2.17.5) */
+/* Pager widget for TableSorter 8/1/2014 (v2.17.6) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($){
 "use strict";
@@ -306,6 +306,8 @@ tsp = ts.pager = {
 		}
 
 		if ( p.$size.length ) {
+			// setting an option as selected appears to cause issues with initial page size
+			p.$size.find('option').removeAttr('selected');
 			p.$size
 				.unbind('change.pager')
 				.bind('change.pager', function() {
@@ -336,7 +338,7 @@ tsp = ts.pager = {
 	},
 
 	updatePageDisplay: function(table, c, completed) {
-		var i, pg, s, out, regex,
+		var i, pg, s, $out, regex,
 			wo = c.widgetOptions,
 			p = c.pager,
 			f = c.$table.hasClass('hasFilters'),
@@ -368,7 +370,7 @@ tsp = ts.pager = {
 			p.startRow = (t) ? 1 : (p.filteredRows === 0 ? 0 : p.size * p.page + 1);
 			p.page = (t) ? 0 : p.page;
 			p.endRow = Math.min( p.filteredRows, p.totalRows, p.size * ( p.page + 1 ) );
-			out = p.$container.find(wo.pager_selectors.pageDisplay);
+			$out = p.$container.find(wo.pager_selectors.pageDisplay);
 			// form the output string (can now get a new output string from the server)
 			s = ( p.ajaxData && p.ajaxData.output ? p.ajaxData.output || wo.pager_output : wo.pager_output )
 				// {page} = one-based index; {page+#} = zero based index +/- value
@@ -377,15 +379,21 @@ tsp = ts.pager = {
 				})
 				// {totalPages}, {extra}, {extra:0} (array) or {extra : key} (object)
 				.replace(/\{\w+(\s*:\s*\w+)?\}/gi, function(m){
-					var str = m.replace(/[{}\s]/g,''),
+					var len, indx,
+						str = m.replace(/[{}\s]/g,''),
 						extra = str.split(':'),
 						data = p.ajaxData,
 						// return zero for default page/row numbers
 						deflt = /(rows?|pages?)$/i.test(str) ? 0 : '';
+					if (/(startRow|page)/.test(extra[0]) && extra[1] === 'input') {
+						len = ('' + (extra[0] === 'page' ? p.totalPages : p.totalRows)).length;
+						indx = extra[0] === 'page' ? p.page + 1 : p.startRow;
+						return '<input type="text" class="ts-' + extra[0] + '" style="max-width:' + len + 'em" value="' + indx + '"/>';
+					}
 					return extra.length > 1 && data && data[extra[0]] ? data[extra[0]][extra[1]] : p[str] || (data ? data[str] : deflt) || deflt;
 				});
-			if (out.length) {
-				out[ (out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
+			if ($out.length) {
+				$out[ ($out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
 				if ( p.$goto.length ) {
 					t = '';
 					pg = Math.min( p.totalPages, p.filteredPages );
@@ -394,6 +402,12 @@ tsp = ts.pager = {
 					}
 					p.$goto.html(t).val( p.page + 1 );
 				}
+				// rebind startRow/page inputs
+				$out.find('.ts-startRow, .ts-page').unbind('change').bind('change', function(){
+					var v = $(this).val(),
+						pg = $(this).hasClass('ts-startRow') ? Math.floor( v/p.size ) + 1 : v;
+					c.$table.trigger('pageSet.pager', [ pg ]);
+				});
 			}
 		}
 		tsp.pagerArrows(c);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.12.5
+  version: 1.12.6
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties