jquery-tablesorter 1.20.4 → 1.20.5

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

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 2/15/2016 (v2.25.4) *//*
+/*! Widget: filter - updated 3/1/2016 (v2.25.5) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -45,6 +45,7 @@
 			filter_hideFilters   : false, // collapse filter row when mouse leaves the area
 			filter_ignoreCase    : true,  // if true, make all searches case-insensitive
 			filter_liveSearch    : true,  // if true, search column content while the user types ( with a delay )
+			filter_matchType     : { 'input': 'exact', 'select': 'exact' }, // global query settings ('exact' or 'match'); overridden by "filter-match" or "filter-exact" class
 			filter_onlyAvail     : 'filter-onlyAvail', // a header with a select dropdown & this class name will only show available ( visible ) options within the drop down
 			filter_placeholder   : { search : '', select : '' }, // default placeholder text ( overridden by any header 'data-placeholder' setting )
 			filter_reset         : null,  // jQuery selector string of an element used to reset the filters
@@ -971,7 +972,7 @@
 						end = c.columns - 1;
 					}
 					for ( ; start <= end; start++ ) {
-						columns.push( start );
+						columns[ columns.length ] = start;
 					}
 					// remove processed range from val
 					val = val.replace( ranges[ indx ], '' );
@@ -985,7 +986,7 @@
 					if ( singles[ i ] !== '' ) {
 						indx = parseInt( singles[ i ], 10 );
 						if ( indx < c.columns ) {
-							columns.push( indx );
+							columns[ columns.length ] = indx;
 						}
 					}
 				}
@@ -993,7 +994,7 @@
 			// return all columns
 			if ( !columns.length ) {
 				for ( indx = 0; indx < c.columns; indx++ ) {
-					columns.push( indx );
+					columns[ columns.length ] = indx;
 				}
 			}
 			return columns;
@@ -1029,6 +1030,24 @@
 			}
 			return filterMatched;
 		},
+		matchType: function( c, columnIndex ) {
+			var isMatch,
+				$el = c.$headerIndexed[ columnIndex ];
+			// filter-exact > filter-match > filter_matchType for type
+			if ( $el.hasClass( 'filter-exact' ) ) {
+				isMatch = false;
+			} else if ( $el.hasClass( 'filter-match' ) ) {
+				isMatch = true;
+			} else {
+				// filter-select is not applied when filter_functions are used, so look for a select
+				$el = c.$filters.eq( columnIndex ).find( '.' + tscss.filter );
+				isMatch = $el.length ?
+					c.widgetOptions.filter_matchType[ ( $el[ 0 ].nodeName || '' ).toLowerCase() ] === 'match' :
+					// default to exact, if no inputs found
+					false;
+			}
+			return isMatch;
+		},
 		processRow: function( c, data, vars ) {
 			var result, filterMatched,
 				fxn, ffxn, txt,
@@ -1102,12 +1121,11 @@
 				// ignore if filter is empty or disabled
 				if ( data.filter ) {
 					data.cache = data.cacheArray[ columnIndex ];
-					result = data.rawArray[ columnIndex ] || '';
+					result = data.parsed[ columnIndex ] ? data.cache : data.rawArray[ columnIndex ] || '';
 					data.exact = c.sortLocaleCompare ? ts.replaceAccents( result ) : result; // issue #405
 					data.iExact = !tsfRegex.type.test( typeof data.exact ) && wo.filter_ignoreCase ?
 						data.exact.toLowerCase() : data.exact;
-
-					data.isMatch = c.$headerIndexed[ data.index ].hasClass( 'filter-match' );
+					data.isMatch = tsf.matchType( c, columnIndex );
 
 					result = showRow; // if showRow is true, show that row
 
@@ -1302,7 +1320,7 @@
 								!( tsfRegex.isNeg1.test( val ) || tsfRegex.isNeg2.test( val ) ) &&
 								// if filtering using a select without a 'filter-match' class ( exact match ) - fixes #593
 								!( val !== '' && c.$filters && c.$filters.filter( '[data-column="' + indx + '"]' ).find( 'select' ).length &&
-									!c.$headerIndexed[indx].hasClass( 'filter-match' ) );
+									!tsf.matchType( c, indx ) );
 						}
 					}
 					notFiltered = $rows.not( '.' + wo.filter_filteredRow ).length;
@@ -1491,13 +1509,13 @@
 					// table cell to the parser format function
 					if ( txt.text ) {
 						txt.parsed = parsedTxt;
-						parsed.push( txt );
+						parsed[ parsed.length ] = txt;
 					} else {
-						parsed.push({
+						parsed[ parsed.length ] = {
 							text : txt,
 							// check parser length - fixes #934
 							parsed : parsedTxt
-						});
+						};
 					}
 				}
 				// sort parsed select options
@@ -1522,7 +1540,7 @@
 				arry = [];
 				len = parsed.length;
 				for ( indx = 0; indx < len; indx++ ) {
-					arry.push( parsed[indx] );
+					arry[ arry.length ] = parsed[indx];
 				}
 				return arry;
 			}
@@ -1551,23 +1569,23 @@
 					if ( wo.filter_useParsedData ||
 						c.parsers[column].parsed ||
 						c.$headerIndexed[column].hasClass( 'filter-parsed' ) ) {
-						arry.push( '' + cache.normalized[ rowIndex ][ column ] );
+						arry[ arry.length ] = '' + cache.normalized[ rowIndex ][ column ];
 						// child row parsed data
 						if ( wo.filter_childRows && wo.filter_childByColumn ) {
 							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length - 1;
 							for ( indx = 0; indx < childLen; indx++ ) {
-								arry.push( '' + cache.normalized[ rowIndex ][ c.columns ].child[ indx ][ column ] );
+								arry[ arry.length ] = '' + cache.normalized[ rowIndex ][ c.columns ].child[ indx ][ column ];
 							}
 						}
 					} else {
 						// get raw cached data instead of content directly from the cells
-						arry.push( cache.normalized[ rowIndex ][ c.columns ].raw[ column ] );
+						arry[ arry.length ] = cache.normalized[ rowIndex ][ c.columns ].raw[ column ];
 						// child row unparsed data
 						if ( wo.filter_childRows && wo.filter_childByColumn ) {
 							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length;
 							for ( indx = 1; indx < childLen; indx++ ) {
 								child =  cache.normalized[ rowIndex ][ c.columns ].$row.eq( indx ).children().eq( column );
-								arry.push( '' + ts.getElementText( c, child, column ) );
+								arry[ arry.length ] = '' + ts.getElementText( c, child, column );
 							}
 						}
 					}

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

@@ -1,4 +1,4 @@
-/*! Widget: grouping - updated 2/15/2016 (v2.25.4) *//*
+/*! Widget: grouping - updated 3/1/2016 (v2.25.5) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -92,9 +92,11 @@
 			return hours + ':' + min + ( wo.group_time24Hour ? '' : ' ' + ( suffix || '' ) );
 		},
 
-		update : function(table, c, wo) {
-			if ($.isEmptyObject(c.cache)) { return; }
-			var hasSort = typeof c.sortList[0] !== 'undefined',
+		update : function(table) {
+			if ($.isEmptyObject(table.config.cache)) { return; }
+			var c = table.config,
+				wo = c.widgetOptions,
+				hasSort = typeof c.sortList[0] !== 'undefined',
 				data = {},
 				column = $.isArray( wo.group_forceColumn ) && typeof wo.group_forceColumn[0] !== 'undefined' ?
 					( wo.group_enforceSort && !hasSort ? -1 : wo.group_forceColumn[0] ) :
@@ -278,14 +280,14 @@
 				tsg.clearSavedGroups(table);
 			});
 			c.$table.on('pagerChange.tsgrouping', function(){
-				tsg.update(table, c, wo);
+				tsg.update(table);
 			});
 		},
 
 		clearSavedGroups: function(table){
 			if (table && ts.storage) {
 				ts.storage(table, 'tablesorter-groups', '');
-				tsg.update(table, table.config, table.config.widgetOptions);
+				tsg.update(table);
 			}
 		}
 
@@ -330,7 +332,7 @@
 			tsg.bindEvents(table, c, wo);
 		},
 		format: function(table, c, wo) {
-			tsg.update(table, c, wo);
+			tsg.update(table);
 		},
 		remove : function(table, c, wo){
 			c.$table

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

@@ -1,4 +1,4 @@
-/*! Widget: math - updated 12/13/2015 (v2.25.0) *//*
+/*! Widget: math - updated 3/1/2016 (v2.25.5) *//*
 * Requires tablesorter v2.16+ and jQuery 1.7+
 * by Rob Garrison
 */
@@ -21,7 +21,7 @@
 		invalid : function( c, name, errorIndex ) {
 			// name = function returning invalid results
 			// errorIndex = math.error index with an explanation of the error
-			console.log( name, math.error[ errorIndex ] );
+			console.warn( name, math.error[ errorIndex ] );
 			return c && c.widgetOptions.math_none || ''; // text for cell
 		},
 
@@ -48,7 +48,7 @@
 			if ( hasFilter || !isFiltered ) {
 				$cells = $row.children().not( '[' + wo.math_dataAttrib + '=ignore]' );
 				if ( wo.math_ignore.length ) {
-					$cells = $cells.filter( function( indx ) {
+					$cells = $cells.filter( function() {
 						// using $.inArray is not optimal (needed for IE8)
 						return $.inArray( math.getCellIndex( $( this ) ), wo.math_ignore ) === -1;
 					});
@@ -87,7 +87,7 @@
 					if ( hasFilter ) {
 						$tr = $tr.filter( hasFilter );
 					}
-					$t = $tr.children().filter( function( indx ) {
+					$t = $tr.children().filter( function() {
 						return math.getCellIndex( $( this ) ) === cIndex;
 					});
 					// ignore filtered rows & rows with data-math="ignore" (and starting row)
@@ -99,7 +99,7 @@
 						if ( mathAbove ) {
 							index = 0;
 						} else if ( $t.length ) {
-							arry.push( math.processText( c, $t ) );
+							arry[ arry.length ] = math.processText( c, $t );
 						}
 					}
 					index--;
@@ -115,13 +115,13 @@
 					if ( hasFilter ) {
 						$tr = $tr.filter( hasFilter );
 					}
-					$t = $tr.children().filter( function( indx ) {
+					$t = $tr.children().filter( function() {
 						return math.getCellIndex( $( this ) ) === cIndex;
 					});
 					if ( ( hasFilter || !$tr.hasClass( filtered ) ) &&
 						$tr.not( mathIgnore ).length &&
 						$t.length ) {
-						arry.push( math.processText( c, $t ) );
+						arry[ arry.length ] = math.processText( c, $t );
 					}
 				}
 			} else {
@@ -132,13 +132,13 @@
 					if ( hasFilter ) {
 						$tr = $tr.filter( hasFilter );
 					}
-					$t = $tr.children().filter( function( indx ) {
+					$t = $tr.children().filter( function() {
 						return math.getCellIndex( $( this ) ) === cIndex;
 					});
 					if ( ( hasFilter || !$tr.hasClass( filtered ) ) &&
 						$t.not( mathAttrs.join( ',' ) ).length &&
 						!$t.is( $el ) ) {
-						arry.push( math.processText( c, $t ) );
+						arry[ arry.length ] = math.processText( c, $t );
 					}
 				}
 			}
@@ -168,7 +168,7 @@
 						$t = $cells.eq( cellIndex );
 						col = math.getCellIndex( $t );
 						if ( !$t.filter( '[' + mathAttr + ']' ).length && $.inArray( col, wo.math_ignore ) < 0 ) {
-							arry.push( math.processText( c, $t ) );
+							arry[ arry.length ] = math.processText( c, $t );
 						}
 					}
 				}
@@ -177,13 +177,11 @@
 		},
 
 		setColumnIndexes : function( c ) {
-			c.$table.after( '<div id="_tablesorter_table_placeholder"></div>' );
-			// detach table from DOM to speed up column indexing
-			var $table = c.$table.detach(),
+			var $table = c.$table,
 				last = 1,
 				// only target rows with a colspan or rows included in a rowspan
 				$rows = $table.children( 'tbody' ).children().filter( function() {
-					var cells, indx, len,
+					var cells, indx,
 						$this = $( this ),
 						include = $this.children( '[colspan]' ).length > 0;
 					if ( last > 1 ) {
@@ -205,9 +203,6 @@
 			// to every tbody cell, just the ones where the .cellIndex property doesn't match
 			// the calculated cell index - hopefully fixes the lag issue in #1048
 			ts.computeColumnIndex( $rows, c );
-			$( '#_tablesorter_table_placeholder' )
-				.after( $table )
-				.remove();
 		},
 
 		getCellIndex : function( $cell ) {
@@ -250,11 +245,11 @@
 				len = $mathCells.length;
 				// get math filter, if any
 				// hasFilter = $row.attr( mathAttr + '-filter' ) || wo.math_rowFilter;
-				$mathCells.each( function( indx, cell ) {
-					var $cell = $( cell ),
-						filter = $mathCells.eq( indx ).attr( mathAttr + '-filter' ) || wo.math_rowFilter;
+				for (indx = 0; indx < len; indx++) {
+					var $cell = $mathCells.eq( indx ),
+						filter = $cell.attr( mathAttr + '-filter' ) || wo.math_rowFilter;
 					filters[ filter ] = filters[ filter ] ? filters[ filter ].add( $cell ) : $cell;
-				});
+				}
 				$.each( filters, function( hasFilter, $cells ) {
 					changed = math.mathType( c, $cells, [ 'all' ], hasFilter ) || changed;
 				});
@@ -518,7 +513,7 @@
 					modes = [ el ];
 					maxCount = m;
 				} else if ( m === maxCount ) {
-					modes.push( el );
+					modes[ modes.length ] = el;
 					maxCount = m;
 				}
 			}

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

@@ -443,7 +443,7 @@
 				p = c.pager,
 				namespace = c.namespace + 'pager',
 				sz = tsp.parsePageSize( c, p.size, 'get' ); // don't allow dividing by zero
-			if ( wo.pager_countChildRows ) { t.push( c.cssChildRow ); }
+			if ( wo.pager_countChildRows ) { t[ t.length ] = c.cssChildRow; }
 			p.$size
 				.add( p.$goto )
 				.removeClass( wo.pager_css.disabled )
@@ -542,10 +542,10 @@
 				optionPagesStartPage = largeCollection ? skipSetSize : 1;
 
 			for ( i = optionPagesStartPage; i <= pg; ) {
-				optionPages.push( i );
+				optionPages[ optionPages.length ] = i;
 				i = i + ( largeCollection ? skipSetSize : 1 );
 			}
-			optionPages.push( pg );
+			optionPages[ optionPages.length ] = pg;
 
 			if ( largeCollection ) {
 				focusOptionPages = [];
@@ -558,7 +558,7 @@
 				if ( endPage > pg ) { endPage = pg; }
 				// construct an array to get a focus set around the current page
 				for ( i = startPage; i <= endPage ; i++ ) {
-					focusOptionPages.push( i );
+					focusOptionPages[ focusOptionPages.length ] = i;
 				}
 
 				// keep unique values
@@ -649,7 +649,7 @@
 							} else {
 								$rows[ rowIndex ].style.display = ( size >= start && size < end ) ? '' : 'none';
 								if ( last !== size && size >= start && size < end ) {
-									p.cacheIndex.push( rowIndex );
+									p.cacheIndex[ p.cacheIndex.length ] = rowIndex;
 									last = size;
 								}
 								// don't count child rows
@@ -875,7 +875,7 @@
 				sortCol = sortCol[ 1 ];
 				len = sortList.length;
 				for ( indx = 0; indx < len; indx++ ) {
-					arry.push( sortCol + '[' + sortList[ indx ][ 0 ] + ']=' + sortList[ indx ][ 1 ] );
+					arry[ arry.length ] = sortCol + '[' + sortList[ indx ][ 0 ] + ']=' + sortList[ indx ][ 1 ];
 				}
 				// if the arry is empty, just add the col parameter... '&{sortList:col}' becomes '&col'
 				url = url.replace( /\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join( '&' ) : sortCol );
@@ -886,7 +886,7 @@
 				len = filterList.length;
 				for ( indx = 0; indx < len; indx++ ) {
 					if ( filterList[ indx ] ) {
-						arry.push( filterCol + '[' + indx + ']=' + encodeURIComponent( filterList[ indx ] ) );
+						arry[ arry.length ] = filterCol + '[' + indx + ']=' + encodeURIComponent( filterList[ indx ] );
 					}
 				}
 				// if the arry is empty, just add the fcol parameter... '&{filterList:fcol}' becomes '&fcol'
@@ -945,7 +945,7 @@
 						count++;
 						if ( count > s && added <= e ) {
 							added++;
-							p.cacheIndex.push( index );
+							p.cacheIndex[ p.cacheIndex.length ] = index;
 							$tb.append( rows[ index ] );
 						}
 					}
@@ -1015,7 +1015,7 @@
 						normalized = c.cache[ 0 ].normalized;
 					p.totalRows = normalized.length;
 					for ( index = 0; index < p.totalRows; index++ ) {
-						rows.push( normalized[ index ][ c.columns ].$row );
+						rows[ rows.length ] = normalized[ index ][ c.columns ].$row;
 					}
 					c.rowsCopy = rows;
 					tsp.moveToPage( c, p, true );

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

@@ -1,9 +1,9 @@
-/* Widget: print - updated 12/13/2015 (v2.25.0) *//*
+/* Widget: print - updated 3/1/2016 (v2.25.5) *//*
  * Requires tablesorter v2.8+ and jQuery 1.2.6+
  */
 /*jshint browser:true, jquery:true, unused:false */
 /*global jQuery: false */
-;(function($){
+;(function($) {
 	'use strict';
 
 	var ts = $.tablesorter,
@@ -17,10 +17,11 @@
 		init : function(c) {
 			c.$table
 				.unbind(printTable.event)
-				.bind(printTable.event, function(){
+				.bind(printTable.event, function() {
 					// explicitly use table.config.widgetOptions because we want
 					// the most up-to-date values; not the 'wo' from initialization
 					printTable.process(c, c.widgetOptions);
+					return false;
 				});
 		},
 
@@ -38,7 +39,7 @@
 					'@media print { .print_widget_hidden { display: none; } }';
 
 			// replace content with data-attribute content
-			$table.find('[' + wo.print_dataAttrib + ']').each(function(){
+			$table.find('[' + wo.print_dataAttrib + ']').each(function() {
 				$this = $(this);
 				$this.text( $this.attr(wo.print_dataAttrib) );
 			});
@@ -137,7 +138,7 @@
 		init: function(table, thisWidget, c) {
 			printTable.init(c);
 		},
-		remove: function(table, c){
+		remove: function(table, c) {
 			printTable.remove(c);
 		}
 

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

@@ -1,4 +1,4 @@
-/*! Widget: scroller - updated 10/31/2015 (v2.24.0) *//*
+/*! Widget: scroller - updated 3/1/2016 (v2.25.5) *//*
 	Copyright (C) 2011 T. Connell & Associates, Inc.
 
 	Dual-licensed under the MIT and GPL licenses
@@ -186,7 +186,7 @@
 		},
 
 		setup : function( c, wo ) {
-			var maxHt, tbHt, $hdr, $t, $hCells, $fCells, $tableWrap, events, tmp, detectedWidth,
+			var tbHt, $hdr, $t, $hCells, $fCells, $tableWrap, events, tmp, detectedWidth,
 				$win = $( window ),
 				tsScroller = ts.scroller,
 				namespace = c.namespace + 'tsscroller',
@@ -211,9 +211,10 @@
 				wo.scroller_barSetWidth = detectedWidth !== null ? detectedWidth : 15;
 			}
 
-			maxHt = wo.scroller_height || 300;
+			tmp = $table.children( 'caption' );
 
 			$hdr = $( '<table class="' + $table.attr( 'class' ) + '" cellpadding=0 cellspacing=0>' +
+				( tmp.length ? tmp[ 0 ].outerHTML : '' ) +
 				$table.children( 'thead' )[ 0 ].outerHTML + '</table>' );
 			wo.scroller_$header = $hdr.addClass( c.namespace.slice( 1 ) + '_extra_table' );
 
@@ -247,8 +248,10 @@
 				.wrap( '<div class="' + tscss.scrollerHeader + '" />' )
 				.find( '.' + tscss.header );
 
-			// use max-height, so the height resizes dynamically while filtering
-			$table.wrap( '<div class="' + tscss.scrollerTable + '" style="max-height:' + maxHt + 'px;" />' );
+			// if max-height is greater than 0 use max-height, so the height resizes dynamically while filtering
+			// else let the table not have a vertical scroll
+			$table.wrap( '<div class="' + tscss.scrollerTable +
+				( wo.scroller_height > 0 ? '" style="max-height:' + wo.scroller_height + 'px;">' : '">' ) );
 			$tableWrap = $table.parent();
 
 			// make scroller header sortable
@@ -260,9 +263,8 @@
 			}
 
 			$table
-				.find( 'thead' )
+				.children( 'thead, caption' )
 				.addClass( tscss.scrollerHideElement );
-
 			tbHt = $tableWrap.parent().height();
 
 			// The header will always jump into view if scrolling the table body
@@ -444,7 +446,7 @@
 				.width( setWidth + temp );
 
 			// hide original table thead
-			$table.children( 'thead' ).addClass( tscss.scrollerHideElement );
+			$table.children( 'thead, caption' ).addClass( tscss.scrollerHideElement );
 
 			// update fixed column sizes
 			tsScroller.updateFixed( c, wo );
@@ -479,6 +481,8 @@
 				.removeClass( tscss.scrollerWrap )
 				.attr( 'id', '' );
 
+			$fixedColumn.find('caption').html('&nbsp;');
+
 			if ( wo.scroller_addFixedOverlay ) {
 				$fixedColumn.append( '<div class="' + tscss.scrollerFixedPanel + '">' );
 			}