jquery-tablesorter 1.16.4 → 1.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0cf6bbed8cef35f8c06f69d9cd34656cabe552
-  data.tar.gz: d35fb81a407e3cdada26f41ad02defd7bef200de
+  metadata.gz: a506f228e740d405af7dbf96ff2dddcc8a17bfbd
+  data.tar.gz: 2a3dd948476f1f9b9667faf560b19509d2c931dd
 SHA512:
-  metadata.gz: b4ecb45d3d07efe428b91dc590dfe124488c3b0b2ef459ac8ff141601315c6711fd98b27782bdb2a5a9096de7f42f12ff0f5c7a8fe15ee73d91dc06b3ab4d9d5
-  data.tar.gz: e23e7e585c11214b3dab625e78a9d935533aff38a27db9bcb27cc442ae3f257057ddec03877b8b832194b6cf12516b8c8bc65174ce92967500b4be488590b45c
+  metadata.gz: 23fbf1cbbc8a6940618ce4f4b0883794977dcee6d59446c327be55901734d5ba59125827c54ca5909aa2b9b8f0dd3379cf046148d650a082b02856ea62bb3527
+  data.tar.gz: 02166e4ebd4556d1336378ec2dfc707b8b1cd6bfd3e672e63060011f920b8622ddd938324d2c2d4ff8e17b7aafbf2b4075bcae9ec58cbb9cbc3f93cbbda5f7f3

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.21.4 (3/28/2015), [documentation]
+Current tablesorter version: 2.21.5 (4/8/2015), [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.16.4'
+  VERSION = '1.16.5'
 end

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 03-30-2015 (v2.21.4)*/
+/*! tablesorter (FORK) - updated 04-08-2015 (v2.21.5)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -16,7 +16,7 @@
 	}
 }(function($) {
 
-/*! TableSorter (FORK) v2.21.4 *//*
+/*! TableSorter (FORK) v2.21.5 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -44,7 +44,7 @@
 
 			var ts = this;
 
-			ts.version = '2.21.4';
+			ts.version = '2.21.5';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -2861,6 +2861,12 @@ ts.filter = {
 							}
 						}
 						c.$table.find('thead').find('select.' + tscss.filter + '[data-column="' + column + '"]').append(options);
+						txt = wo.filter_selectSource;
+						fxn = $.isFunction(txt) ? true : ts.getColumnData( table, txt, column );
+						if (fxn) {
+							// updating so the extra options are appended
+							ts.filter.buildSelect(c.table, column, '', true, $header.hasClass(wo.filter_onlyAvail));
+						}
 					}
 				}
 			}
@@ -3303,6 +3309,19 @@ ts.filter = {
 				$(this).hasClass('filter-parsed');
 		}).get();
 
+		// cache filter variables that use ts.getColumnData in the main loop
+		wo.filter_indexed = {
+			functions : [],
+			excludeFilter : [],
+			defaultColFilter : [],
+			defaultAnyFilter : ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || ''
+		};
+		for ( columnIndex = 0; columnIndex < c.columns; columnIndex++ ) {
+			wo.filter_indexed.functions[ columnIndex ] = ts.getColumnData( table, wo.filter_functions, columnIndex );
+			wo.filter_indexed.defaultColFilter[ columnIndex ] = ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '';
+			wo.filter_indexed.excludeFilter[ columnIndex ] = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+		}
+
 		if (c.debug) {
 			ts.log('Filter: Starting filter widget search', filters);
 			time = new Date();
@@ -3389,8 +3408,8 @@ ts.filter = {
 						// replace accents
 						data.anyMatchFilter = ts.replaceAccents(data.anyMatchFilter);
 					}
-					if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || '')) {
-						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) );
+					if ( wo.filter_defaultFilter && regex.iQuery.test( wo.filter_indexed.defaultAnyFilter ) ) {
+						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, wo.filter_indexed.defaultAnyFilter );
 						// clear search filtered flag because default filters are not saved to the last search
 						searchFiltered = false;
 					}
@@ -3472,7 +3491,7 @@ ts.filter = {
 						data.index = columnIndex;
 
 						// filter types to exclude, per column
-						excludeMatch = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+						excludeMatch = wo.filter_indexed.excludeFilter[ columnIndex ];
 
 						// ignore if filter is empty or disabled
 						if (data.filter) {
@@ -3497,29 +3516,30 @@ ts.filter = {
 							}
 
 							val = true;
-							if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '')) {
-								data.filter = ts.filter.defaultFilter( data.filter, ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) );
+							if (wo.filter_defaultFilter && regex.iQuery.test( wo.filter_indexed.defaultColFilter[ columnIndex ] )) {
+								data.filter = ts.filter.defaultFilter( data.filter, wo.filter_indexed.defaultColFilter[ columnIndex ] );
 								// val is used to indicate that a filter select is using a default filter; so we override the exact & partial matches
 								val = false;
 							}
 							// data.iFilter = case insensitive (if wo.filter_ignoreCase is true), data.filter = case sensitive
 							data.iFilter = wo.filter_ignoreCase ? (data.filter || '').toLocaleLowerCase() : data.filter;
-							fxn = ts.getColumnData( table, wo.filter_functions, columnIndex );
+							fxn = wo.filter_indexed.functions[ columnIndex ];
 							$cell = c.$headerIndexed[columnIndex];
 							hasSelect = $cell.hasClass('filter-select');
+							filterMatched = null;
 							if ( fxn || ( hasSelect && val ) ) {
 								if (fxn === true || hasSelect) {
 									// default selector uses exact match unless "filter-match" class is found
-									result = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
+									filterMatched = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
 								} else if (typeof fxn === 'function') {
 									// filter callback( exact cell content, parser normalized content, filter input value, column index, jQuery row object )
-									result = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
+									filterMatched = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
 								} else if (typeof fxn[ffxn || data.filter] === 'function') {
 									// selector option function
-									result = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
+									filterMatched = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
 								}
-							} else {
-								filterMatched = null;
+							}
+							if (filterMatched === null) {
 								// cycle through the different filters
 								// filters return a boolean or null if nothing matches
 								$.each(ts.filter.types, function(type, typeFunction) {
@@ -3538,6 +3558,8 @@ ts.filter = {
 									data.exact = (data.iExact + data.childRowText).indexOf( ts.filter.parseFilter(c, data.iFilter, columnIndex, data.parsed[columnIndex]) );
 									result = ( (!wo.filter_startsWith && data.exact >= 0) || (wo.filter_startsWith && data.exact === 0) );
 								}
+							} else {
+								result = filterMatched;
 							}
 							showRow = (result) ? showRow : false;
 						}
@@ -4095,7 +4117,7 @@ ts.addWidget({
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 3/26/2015 (v2.21.3) */
+/*! Widget: resizable - updated 4/2/2015 (v2.21.5) */
 ;(function ($, window) {
 'use strict';
 var ts = $.tablesorter = $.tablesorter || {};
@@ -4186,7 +4208,7 @@ ts.resizable = {
 		if ( storedSizes.length ) {
 			for ( column = 0; column < c.columns; column++ ) {
 				// set saved resizable widths
-				c.$headers.eq( column ).width( storedSizes[ column ] );
+				c.$headerIndexed[ column ].width( storedSizes[ column ] );
 				if ( $extra.length ) {
 					// stickyHeaders needs to modify min & max width as well
 					ts.resizable.setWidth( $extra.eq( column ).add( $col.eq( column ) ), storedSizes[ column ] );
@@ -4199,11 +4221,11 @@ ts.resizable = {
 	},
 
 	setHandlePosition : function( c, wo ) {
-		var tableWidth = c.$table.outerWidth(),
+		var startPosition,
 			hasScroller = ts.hasWidget( c.table, 'scroller' ),
 			tableHeight = c.$table.height(),
 			$handles = wo.$resizable_container.children(),
-			handleCenter = Math.floor( $handles.width() / 2 - parseFloat( c.$headers.css( 'border-right-width' ) ) * 2 );
+			handleCenter = Math.floor( $handles.width() / 2 );
 
 		if ( hasScroller ) {
 			tableHeight = 0;
@@ -4213,15 +4235,21 @@ ts.resizable = {
 				tableHeight += $this.filter('[style*="height"]').length ? $this.height() : $this.children('table').height();
 			});
 		}
+		// subtract out table left position from resizable handles. Fixes #864
+		startPosition = c.$table.position().left;
 		$handles.each( function() {
 			var $this = $(this),
 				column = parseInt( $this.attr( 'data-column' ), 10 ),
 				columns = c.columns - 1,
 				$header = $this.data( 'header' );
-			if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
+			if ( !$header ) { return; } // see #859
+			if ( !$header.is(':visible') ) {
+				$this.hide();
+			} else if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
 				$this.css({
+					display: 'inline-block',
 					height : tableHeight,
-					left : $header.position().left + $header.width() - handleCenter
+					left : $header.position().left - startPosition + $header.outerWidth() - handleCenter
 				});
 			}
 		});
@@ -4247,7 +4275,7 @@ ts.resizable = {
 		var namespace = c.namespace + 'tsresize';
 		wo.$resizable_container.children().bind( 'mousedown', function( event ) {
 			// save header cell and mouse position
-			var column,
+			var column, $this,
 				vars = wo.resizable_,
 				$extras = $( c.namespace + '_extra_headers' ),
 				$header = $( event.target ).data( 'header' );
@@ -4266,7 +4294,11 @@ ts.resizable = {
 			vars.next = column;
 
 			vars.mouseXPosition = event.pageX;
-			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			vars.storedSizes = [];
+			for ( column = 0; column < c.columns; column++ ) {
+				$this = c.$headerIndexed[ column ];
+				vars.storedSizes[ column ] = $this.is(':visible') ? $this.width() : 0;
+			}
 			ts.resizable.toggleTextSelection( c, true );
 		});
 
@@ -4297,15 +4329,20 @@ ts.resizable = {
 		});
 
 		// right click to reset columns to default widths
-		c.$table.find( 'thead:first' ).add( $( c.namespace + '_extra_table' ).find( 'thead:first' ) )
-		.bind( 'contextmenu' + namespace, function() {
-			// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
-			var allowClick = wo.resizable_.storedSizes.length === 0;
-			ts.resizableReset( c.table );
-			ts.resizable.setHandlePosition( c, wo );
-			wo.resizable_.storedSizes = [];
-			return allowClick;
-		});
+		c.$table
+			.bind( 'columnUpdate' + namespace, function() {
+				ts.resizable.setHandlePosition( c, wo );
+			})
+			.find( 'thead:first' )
+			.add( $( c.namespace + '_extra_table' ).find( 'thead:first' ) )
+			.bind( 'contextmenu' + namespace, function() {
+				// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
+				var allowClick = wo.resizable_.storedSizes.length === 0;
+				ts.resizableReset( c.table );
+				ts.resizable.setHandlePosition( c, wo );
+				wo.resizable_.storedSizes = [];
+				return allowClick;
+			});
 
 	},
 
@@ -4313,10 +4350,8 @@ ts.resizable = {
 		if ( wo.resizable_.mouseXPosition === 0 || !wo.resizable_.$target ) { return; }
 		// resize columns
 		var vars = wo.resizable_,
-			$target = vars.$target,
 			$next = vars.$next,
-			leftEdge = event.pageX - vars.mouseXPosition,
-			targetWidth = $target.width();
+			leftEdge = event.pageX - vars.mouseXPosition;
 		if ( vars.fullWidth ) {
 			vars.storedSizes[ vars.target ] += leftEdge;
 			vars.storedSizes[ vars.next ] -= leftEdge;
@@ -4338,10 +4373,15 @@ ts.resizable = {
 	},
 
 	stopResize : function( c, wo ) {
-		var vars = wo.resizable_;
+		var $this, column,
+			vars = wo.resizable_;
 		vars.storedSizes = [];
 		if ( ts.storage ) {
-			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			vars.storedSizes = [];
+			for ( column = 0; column < c.columns; column++ ) {
+				$this = c.$headerIndexed[ column ];
+				vars.storedSizes[ column ] = $this.is(':visible') ? $this.width() : 0;
+			}
 			if ( wo.resizable !== false ) {
 				// save all column widths
 				ts.storage( c.table, ts.css.resizableStorage, vars.storedSizes );
@@ -4386,19 +4426,19 @@ ts.addWidget({
 
 ts.resizableReset = function( table, nosave ) {
 	$( table ).each(function(){
-		var $t,
+		var index, $t,
 			c = this.config,
 			wo = c && c.widgetOptions;
-		if ( table && c ) {
-			c.$headers.each( function( i ) {
-				$t = $(this);
-				if ( wo.resizable_widths && wo.resizable_widths[ i ] ) {
-					$t.css( 'width', wo.resizable_widths[ i ] );
+		if ( table && c && c.$headerIndexed.length ) {
+			for ( index = 0; index < c.columns; index++ ) {
+				$t = c.$headerIndexed[ index ];
+				if ( wo.resizable_widths && wo.resizable_widths[ index ] ) {
+					$t.css( 'width', wo.resizable_widths[ index ] );
 				} else if ( !$t.hasClass( 'resizable-false' ) ) {
 					// don't clear the width of any column that is not resizable
 					$t.css( 'width', '' );
 				}
-			});
+			}
 			// reset stickyHeader widths
 			$( window ).trigger( 'resize' );
 			if ( ts.storage && !nosave ) {

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

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.21.4 *//*
+/*! TableSorter (FORK) v2.21.5 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -26,7 +26,7 @@
 
 			var ts = this;
 
-			ts.version = '2.21.4';
+			ts.version = '2.21.5';
 
 			ts.parsers = [];
 			ts.widgets = [];

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 03-30-2015 (v2.21.4)*/
+/*! tablesorter (FORK) - updated 04-08-2015 (v2.21.5)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -732,6 +732,12 @@ ts.filter = {
 							}
 						}
 						c.$table.find('thead').find('select.' + tscss.filter + '[data-column="' + column + '"]').append(options);
+						txt = wo.filter_selectSource;
+						fxn = $.isFunction(txt) ? true : ts.getColumnData( table, txt, column );
+						if (fxn) {
+							// updating so the extra options are appended
+							ts.filter.buildSelect(c.table, column, '', true, $header.hasClass(wo.filter_onlyAvail));
+						}
 					}
 				}
 			}
@@ -1174,6 +1180,19 @@ ts.filter = {
 				$(this).hasClass('filter-parsed');
 		}).get();
 
+		// cache filter variables that use ts.getColumnData in the main loop
+		wo.filter_indexed = {
+			functions : [],
+			excludeFilter : [],
+			defaultColFilter : [],
+			defaultAnyFilter : ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || ''
+		};
+		for ( columnIndex = 0; columnIndex < c.columns; columnIndex++ ) {
+			wo.filter_indexed.functions[ columnIndex ] = ts.getColumnData( table, wo.filter_functions, columnIndex );
+			wo.filter_indexed.defaultColFilter[ columnIndex ] = ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '';
+			wo.filter_indexed.excludeFilter[ columnIndex ] = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+		}
+
 		if (c.debug) {
 			ts.log('Filter: Starting filter widget search', filters);
 			time = new Date();
@@ -1260,8 +1279,8 @@ ts.filter = {
 						// replace accents
 						data.anyMatchFilter = ts.replaceAccents(data.anyMatchFilter);
 					}
-					if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || '')) {
-						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) );
+					if ( wo.filter_defaultFilter && regex.iQuery.test( wo.filter_indexed.defaultAnyFilter ) ) {
+						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, wo.filter_indexed.defaultAnyFilter );
 						// clear search filtered flag because default filters are not saved to the last search
 						searchFiltered = false;
 					}
@@ -1343,7 +1362,7 @@ ts.filter = {
 						data.index = columnIndex;
 
 						// filter types to exclude, per column
-						excludeMatch = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+						excludeMatch = wo.filter_indexed.excludeFilter[ columnIndex ];
 
 						// ignore if filter is empty or disabled
 						if (data.filter) {
@@ -1368,29 +1387,30 @@ ts.filter = {
 							}
 
 							val = true;
-							if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '')) {
-								data.filter = ts.filter.defaultFilter( data.filter, ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) );
+							if (wo.filter_defaultFilter && regex.iQuery.test( wo.filter_indexed.defaultColFilter[ columnIndex ] )) {
+								data.filter = ts.filter.defaultFilter( data.filter, wo.filter_indexed.defaultColFilter[ columnIndex ] );
 								// val is used to indicate that a filter select is using a default filter; so we override the exact & partial matches
 								val = false;
 							}
 							// data.iFilter = case insensitive (if wo.filter_ignoreCase is true), data.filter = case sensitive
 							data.iFilter = wo.filter_ignoreCase ? (data.filter || '').toLocaleLowerCase() : data.filter;
-							fxn = ts.getColumnData( table, wo.filter_functions, columnIndex );
+							fxn = wo.filter_indexed.functions[ columnIndex ];
 							$cell = c.$headerIndexed[columnIndex];
 							hasSelect = $cell.hasClass('filter-select');
+							filterMatched = null;
 							if ( fxn || ( hasSelect && val ) ) {
 								if (fxn === true || hasSelect) {
 									// default selector uses exact match unless "filter-match" class is found
-									result = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
+									filterMatched = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
 								} else if (typeof fxn === 'function') {
 									// filter callback( exact cell content, parser normalized content, filter input value, column index, jQuery row object )
-									result = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
+									filterMatched = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
 								} else if (typeof fxn[ffxn || data.filter] === 'function') {
 									// selector option function
-									result = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
+									filterMatched = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
 								}
-							} else {
-								filterMatched = null;
+							}
+							if (filterMatched === null) {
 								// cycle through the different filters
 								// filters return a boolean or null if nothing matches
 								$.each(ts.filter.types, function(type, typeFunction) {
@@ -1409,6 +1429,8 @@ ts.filter = {
 									data.exact = (data.iExact + data.childRowText).indexOf( ts.filter.parseFilter(c, data.iFilter, columnIndex, data.parsed[columnIndex]) );
 									result = ( (!wo.filter_startsWith && data.exact >= 0) || (wo.filter_startsWith && data.exact === 0) );
 								}
+							} else {
+								result = filterMatched;
 							}
 							showRow = (result) ? showRow : false;
 						}
@@ -1966,7 +1988,7 @@ ts.addWidget({
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 3/26/2015 (v2.21.3) */
+/*! Widget: resizable - updated 4/2/2015 (v2.21.5) */
 ;(function ($, window) {
 'use strict';
 var ts = $.tablesorter = $.tablesorter || {};
@@ -2057,7 +2079,7 @@ ts.resizable = {
 		if ( storedSizes.length ) {
 			for ( column = 0; column < c.columns; column++ ) {
 				// set saved resizable widths
-				c.$headers.eq( column ).width( storedSizes[ column ] );
+				c.$headerIndexed[ column ].width( storedSizes[ column ] );
 				if ( $extra.length ) {
 					// stickyHeaders needs to modify min & max width as well
 					ts.resizable.setWidth( $extra.eq( column ).add( $col.eq( column ) ), storedSizes[ column ] );
@@ -2070,11 +2092,11 @@ ts.resizable = {
 	},
 
 	setHandlePosition : function( c, wo ) {
-		var tableWidth = c.$table.outerWidth(),
+		var startPosition,
 			hasScroller = ts.hasWidget( c.table, 'scroller' ),
 			tableHeight = c.$table.height(),
 			$handles = wo.$resizable_container.children(),
-			handleCenter = Math.floor( $handles.width() / 2 - parseFloat( c.$headers.css( 'border-right-width' ) ) * 2 );
+			handleCenter = Math.floor( $handles.width() / 2 );
 
 		if ( hasScroller ) {
 			tableHeight = 0;
@@ -2084,15 +2106,21 @@ ts.resizable = {
 				tableHeight += $this.filter('[style*="height"]').length ? $this.height() : $this.children('table').height();
 			});
 		}
+		// subtract out table left position from resizable handles. Fixes #864
+		startPosition = c.$table.position().left;
 		$handles.each( function() {
 			var $this = $(this),
 				column = parseInt( $this.attr( 'data-column' ), 10 ),
 				columns = c.columns - 1,
 				$header = $this.data( 'header' );
-			if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
+			if ( !$header ) { return; } // see #859
+			if ( !$header.is(':visible') ) {
+				$this.hide();
+			} else if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
 				$this.css({
+					display: 'inline-block',
 					height : tableHeight,
-					left : $header.position().left + $header.width() - handleCenter
+					left : $header.position().left - startPosition + $header.outerWidth() - handleCenter
 				});
 			}
 		});
@@ -2118,7 +2146,7 @@ ts.resizable = {
 		var namespace = c.namespace + 'tsresize';
 		wo.$resizable_container.children().bind( 'mousedown', function( event ) {
 			// save header cell and mouse position
-			var column,
+			var column, $this,
 				vars = wo.resizable_,
 				$extras = $( c.namespace + '_extra_headers' ),
 				$header = $( event.target ).data( 'header' );
@@ -2137,7 +2165,11 @@ ts.resizable = {
 			vars.next = column;
 
 			vars.mouseXPosition = event.pageX;
-			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			vars.storedSizes = [];
+			for ( column = 0; column < c.columns; column++ ) {
+				$this = c.$headerIndexed[ column ];
+				vars.storedSizes[ column ] = $this.is(':visible') ? $this.width() : 0;
+			}
 			ts.resizable.toggleTextSelection( c, true );
 		});
 
@@ -2168,15 +2200,20 @@ ts.resizable = {
 		});
 
 		// right click to reset columns to default widths
-		c.$table.find( 'thead:first' ).add( $( c.namespace + '_extra_table' ).find( 'thead:first' ) )
-		.bind( 'contextmenu' + namespace, function() {
-			// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
-			var allowClick = wo.resizable_.storedSizes.length === 0;
-			ts.resizableReset( c.table );
-			ts.resizable.setHandlePosition( c, wo );
-			wo.resizable_.storedSizes = [];
-			return allowClick;
-		});
+		c.$table
+			.bind( 'columnUpdate' + namespace, function() {
+				ts.resizable.setHandlePosition( c, wo );
+			})
+			.find( 'thead:first' )
+			.add( $( c.namespace + '_extra_table' ).find( 'thead:first' ) )
+			.bind( 'contextmenu' + namespace, function() {
+				// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
+				var allowClick = wo.resizable_.storedSizes.length === 0;
+				ts.resizableReset( c.table );
+				ts.resizable.setHandlePosition( c, wo );
+				wo.resizable_.storedSizes = [];
+				return allowClick;
+			});
 
 	},
 
@@ -2184,10 +2221,8 @@ ts.resizable = {
 		if ( wo.resizable_.mouseXPosition === 0 || !wo.resizable_.$target ) { return; }
 		// resize columns
 		var vars = wo.resizable_,
-			$target = vars.$target,
 			$next = vars.$next,
-			leftEdge = event.pageX - vars.mouseXPosition,
-			targetWidth = $target.width();
+			leftEdge = event.pageX - vars.mouseXPosition;
 		if ( vars.fullWidth ) {
 			vars.storedSizes[ vars.target ] += leftEdge;
 			vars.storedSizes[ vars.next ] -= leftEdge;
@@ -2209,10 +2244,15 @@ ts.resizable = {
 	},
 
 	stopResize : function( c, wo ) {
-		var vars = wo.resizable_;
+		var $this, column,
+			vars = wo.resizable_;
 		vars.storedSizes = [];
 		if ( ts.storage ) {
-			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			vars.storedSizes = [];
+			for ( column = 0; column < c.columns; column++ ) {
+				$this = c.$headerIndexed[ column ];
+				vars.storedSizes[ column ] = $this.is(':visible') ? $this.width() : 0;
+			}
 			if ( wo.resizable !== false ) {
 				// save all column widths
 				ts.storage( c.table, ts.css.resizableStorage, vars.storedSizes );
@@ -2257,19 +2297,19 @@ ts.addWidget({
 
 ts.resizableReset = function( table, nosave ) {
 	$( table ).each(function(){
-		var $t,
+		var index, $t,
 			c = this.config,
 			wo = c && c.widgetOptions;
-		if ( table && c ) {
-			c.$headers.each( function( i ) {
-				$t = $(this);
-				if ( wo.resizable_widths && wo.resizable_widths[ i ] ) {
-					$t.css( 'width', wo.resizable_widths[ i ] );
+		if ( table && c && c.$headerIndexed.length ) {
+			for ( index = 0; index < c.columns; index++ ) {
+				$t = c.$headerIndexed[ index ];
+				if ( wo.resizable_widths && wo.resizable_widths[ index ] ) {
+					$t.css( 'width', wo.resizable_widths[ index ] );
 				} else if ( !$t.hasClass( 'resizable-false' ) ) {
 					// don't clear the width of any column that is not resizable
 					$t.css( 'width', '' );
 				}
-			});
+			}
 			// reset stickyHeader widths
 			$( window ).trigger( 'resize' );
 			if ( ts.storage && !nosave ) {

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

@@ -359,6 +359,12 @@ ts.filter = {
 							}
 						}
 						c.$table.find('thead').find('select.' + tscss.filter + '[data-column="' + column + '"]').append(options);
+						txt = wo.filter_selectSource;
+						fxn = $.isFunction(txt) ? true : ts.getColumnData( table, txt, column );
+						if (fxn) {
+							// updating so the extra options are appended
+							ts.filter.buildSelect(c.table, column, '', true, $header.hasClass(wo.filter_onlyAvail));
+						}
 					}
 				}
 			}
@@ -801,6 +807,19 @@ ts.filter = {
 				$(this).hasClass('filter-parsed');
 		}).get();
 
+		// cache filter variables that use ts.getColumnData in the main loop
+		wo.filter_indexed = {
+			functions : [],
+			excludeFilter : [],
+			defaultColFilter : [],
+			defaultAnyFilter : ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || ''
+		};
+		for ( columnIndex = 0; columnIndex < c.columns; columnIndex++ ) {
+			wo.filter_indexed.functions[ columnIndex ] = ts.getColumnData( table, wo.filter_functions, columnIndex );
+			wo.filter_indexed.defaultColFilter[ columnIndex ] = ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '';
+			wo.filter_indexed.excludeFilter[ columnIndex ] = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+		}
+
 		if (c.debug) {
 			ts.log('Filter: Starting filter widget search', filters);
 			time = new Date();
@@ -887,8 +906,8 @@ ts.filter = {
 						// replace accents
 						data.anyMatchFilter = ts.replaceAccents(data.anyMatchFilter);
 					}
-					if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || '')) {
-						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) );
+					if ( wo.filter_defaultFilter && regex.iQuery.test( wo.filter_indexed.defaultAnyFilter ) ) {
+						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, wo.filter_indexed.defaultAnyFilter );
 						// clear search filtered flag because default filters are not saved to the last search
 						searchFiltered = false;
 					}
@@ -970,7 +989,7 @@ ts.filter = {
 						data.index = columnIndex;
 
 						// filter types to exclude, per column
-						excludeMatch = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+						excludeMatch = wo.filter_indexed.excludeFilter[ columnIndex ];
 
 						// ignore if filter is empty or disabled
 						if (data.filter) {
@@ -995,29 +1014,30 @@ ts.filter = {
 							}
 
 							val = true;
-							if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '')) {
-								data.filter = ts.filter.defaultFilter( data.filter, ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) );
+							if (wo.filter_defaultFilter && regex.iQuery.test( wo.filter_indexed.defaultColFilter[ columnIndex ] )) {
+								data.filter = ts.filter.defaultFilter( data.filter, wo.filter_indexed.defaultColFilter[ columnIndex ] );
 								// val is used to indicate that a filter select is using a default filter; so we override the exact & partial matches
 								val = false;
 							}
 							// data.iFilter = case insensitive (if wo.filter_ignoreCase is true), data.filter = case sensitive
 							data.iFilter = wo.filter_ignoreCase ? (data.filter || '').toLocaleLowerCase() : data.filter;
-							fxn = ts.getColumnData( table, wo.filter_functions, columnIndex );
+							fxn = wo.filter_indexed.functions[ columnIndex ];
 							$cell = c.$headerIndexed[columnIndex];
 							hasSelect = $cell.hasClass('filter-select');
+							filterMatched = null;
 							if ( fxn || ( hasSelect && val ) ) {
 								if (fxn === true || hasSelect) {
 									// default selector uses exact match unless "filter-match" class is found
-									result = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
+									filterMatched = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
 								} else if (typeof fxn === 'function') {
 									// filter callback( exact cell content, parser normalized content, filter input value, column index, jQuery row object )
-									result = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
+									filterMatched = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
 								} else if (typeof fxn[ffxn || data.filter] === 'function') {
 									// selector option function
-									result = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
+									filterMatched = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex), c);
 								}
-							} else {
-								filterMatched = null;
+							}
+							if (filterMatched === null) {
 								// cycle through the different filters
 								// filters return a boolean or null if nothing matches
 								$.each(ts.filter.types, function(type, typeFunction) {
@@ -1036,6 +1056,8 @@ ts.filter = {
 									data.exact = (data.iExact + data.childRowText).indexOf( ts.filter.parseFilter(c, data.iFilter, columnIndex, data.parsed[columnIndex]) );
 									result = ( (!wo.filter_startsWith && data.exact >= 0) || (wo.filter_startsWith && data.exact === 0) );
 								}
+							} else {
+								result = filterMatched;
 							}
 							showRow = (result) ? showRow : false;
 						}

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

@@ -1,4 +1,4 @@
-/*! Widget: resizable - updated 3/26/2015 (v2.21.3) */
+/*! Widget: resizable - updated 4/2/2015 (v2.21.5) */
 ;(function ($, window) {
 'use strict';
 var ts = $.tablesorter = $.tablesorter || {};
@@ -89,7 +89,7 @@ ts.resizable = {
 		if ( storedSizes.length ) {
 			for ( column = 0; column < c.columns; column++ ) {
 				// set saved resizable widths
-				c.$headers.eq( column ).width( storedSizes[ column ] );
+				c.$headerIndexed[ column ].width( storedSizes[ column ] );
 				if ( $extra.length ) {
 					// stickyHeaders needs to modify min & max width as well
 					ts.resizable.setWidth( $extra.eq( column ).add( $col.eq( column ) ), storedSizes[ column ] );
@@ -102,11 +102,11 @@ ts.resizable = {
 	},
 
 	setHandlePosition : function( c, wo ) {
-		var tableWidth = c.$table.outerWidth(),
+		var startPosition,
 			hasScroller = ts.hasWidget( c.table, 'scroller' ),
 			tableHeight = c.$table.height(),
 			$handles = wo.$resizable_container.children(),
-			handleCenter = Math.floor( $handles.width() / 2 - parseFloat( c.$headers.css( 'border-right-width' ) ) * 2 );
+			handleCenter = Math.floor( $handles.width() / 2 );
 
 		if ( hasScroller ) {
 			tableHeight = 0;
@@ -116,15 +116,21 @@ ts.resizable = {
 				tableHeight += $this.filter('[style*="height"]').length ? $this.height() : $this.children('table').height();
 			});
 		}
+		// subtract out table left position from resizable handles. Fixes #864
+		startPosition = c.$table.position().left;
 		$handles.each( function() {
 			var $this = $(this),
 				column = parseInt( $this.attr( 'data-column' ), 10 ),
 				columns = c.columns - 1,
 				$header = $this.data( 'header' );
-			if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
+			if ( !$header ) { return; } // see #859
+			if ( !$header.is(':visible') ) {
+				$this.hide();
+			} else if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
 				$this.css({
+					display: 'inline-block',
 					height : tableHeight,
-					left : $header.position().left + $header.width() - handleCenter
+					left : $header.position().left - startPosition + $header.outerWidth() - handleCenter
 				});
 			}
 		});
@@ -150,7 +156,7 @@ ts.resizable = {
 		var namespace = c.namespace + 'tsresize';
 		wo.$resizable_container.children().bind( 'mousedown', function( event ) {
 			// save header cell and mouse position
-			var column,
+			var column, $this,
 				vars = wo.resizable_,
 				$extras = $( c.namespace + '_extra_headers' ),
 				$header = $( event.target ).data( 'header' );
@@ -169,7 +175,11 @@ ts.resizable = {
 			vars.next = column;
 
 			vars.mouseXPosition = event.pageX;
-			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			vars.storedSizes = [];
+			for ( column = 0; column < c.columns; column++ ) {
+				$this = c.$headerIndexed[ column ];
+				vars.storedSizes[ column ] = $this.is(':visible') ? $this.width() : 0;
+			}
 			ts.resizable.toggleTextSelection( c, true );
 		});
 
@@ -200,15 +210,20 @@ ts.resizable = {
 		});
 
 		// right click to reset columns to default widths
-		c.$table.find( 'thead:first' ).add( $( c.namespace + '_extra_table' ).find( 'thead:first' ) )
-		.bind( 'contextmenu' + namespace, function() {
-			// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
-			var allowClick = wo.resizable_.storedSizes.length === 0;
-			ts.resizableReset( c.table );
-			ts.resizable.setHandlePosition( c, wo );
-			wo.resizable_.storedSizes = [];
-			return allowClick;
-		});
+		c.$table
+			.bind( 'columnUpdate' + namespace, function() {
+				ts.resizable.setHandlePosition( c, wo );
+			})
+			.find( 'thead:first' )
+			.add( $( c.namespace + '_extra_table' ).find( 'thead:first' ) )
+			.bind( 'contextmenu' + namespace, function() {
+				// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
+				var allowClick = wo.resizable_.storedSizes.length === 0;
+				ts.resizableReset( c.table );
+				ts.resizable.setHandlePosition( c, wo );
+				wo.resizable_.storedSizes = [];
+				return allowClick;
+			});
 
 	},
 
@@ -216,10 +231,8 @@ ts.resizable = {
 		if ( wo.resizable_.mouseXPosition === 0 || !wo.resizable_.$target ) { return; }
 		// resize columns
 		var vars = wo.resizable_,
-			$target = vars.$target,
 			$next = vars.$next,
-			leftEdge = event.pageX - vars.mouseXPosition,
-			targetWidth = $target.width();
+			leftEdge = event.pageX - vars.mouseXPosition;
 		if ( vars.fullWidth ) {
 			vars.storedSizes[ vars.target ] += leftEdge;
 			vars.storedSizes[ vars.next ] -= leftEdge;
@@ -241,10 +254,15 @@ ts.resizable = {
 	},
 
 	stopResize : function( c, wo ) {
-		var vars = wo.resizable_;
+		var $this, column,
+			vars = wo.resizable_;
 		vars.storedSizes = [];
 		if ( ts.storage ) {
-			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			vars.storedSizes = [];
+			for ( column = 0; column < c.columns; column++ ) {
+				$this = c.$headerIndexed[ column ];
+				vars.storedSizes[ column ] = $this.is(':visible') ? $this.width() : 0;
+			}
 			if ( wo.resizable !== false ) {
 				// save all column widths
 				ts.storage( c.table, ts.css.resizableStorage, vars.storedSizes );
@@ -289,19 +307,19 @@ ts.addWidget({
 
 ts.resizableReset = function( table, nosave ) {
 	$( table ).each(function(){
-		var $t,
+		var index, $t,
 			c = this.config,
 			wo = c && c.widgetOptions;
-		if ( table && c ) {
-			c.$headers.each( function( i ) {
-				$t = $(this);
-				if ( wo.resizable_widths && wo.resizable_widths[ i ] ) {
-					$t.css( 'width', wo.resizable_widths[ i ] );
+		if ( table && c && c.$headerIndexed.length ) {
+			for ( index = 0; index < c.columns; index++ ) {
+				$t = c.$headerIndexed[ index ];
+				if ( wo.resizable_widths && wo.resizable_widths[ index ] ) {
+					$t.css( 'width', wo.resizable_widths[ index ] );
 				} else if ( !$t.hasClass( 'resizable-false' ) ) {
 					// don't clear the width of any column that is not resizable
 					$t.css( 'width', '' );
 				}
-			});
+			}
 			// reset stickyHeader widths
 			$( window ).trigger( 'resize' );
 			if ( ts.storage && !nosave ) {

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

@@ -1,4 +1,4 @@
-/*! Widget: scroller - updated 3/26/2015 (v2.21.3) *//*
+/*! Widget: scroller - updated 4/2/2015 (v2.21.5) *//*
 	Copyright (C) 2011 T. Connell & Associates, Inc.
 
 	Dual-licensed under the MIT and GPL licenses
@@ -434,7 +434,7 @@ ts.scroller = {
 		ts.bindEvents( c.table, $fixedColumn.find( '.' + tscss.header ) );
 
 		// update thead & tbody in fixed column
-		temp = ( 'sortEnd filterEnd ' ).split( ' ' ).join( namespace + ' ' );
+		temp = ( 'tablesorter-initialized sortEnd filterEnd ' ).split( ' ' ).join( namespace + ' ' );
 		c.$table
 			.off( temp )
 			.on( temp, function( event, size ) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.16.4
+  version: 1.16.5
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties