RubyGems - jquery-tablesorter - Versions diffs - 1.18.5 → 1.19.0 - Mend

jquery-tablesorter 1.18.5 → 1.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

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

@@ -1,4 +1,4 @@
-/* Widget: print - updated 2/7/2015 (v2.19.0) *//*
+/* Widget: print - updated 11/2/2015 (v2.24.1) *//*
  * Requires tablesorter v2.8+ and jQuery 1.2.6+
  */
 /*jshint browser:true, jquery:true, unused:false */
@@ -12,6 +12,7 @@
 		event      : 'printTable',
 		basicStyle : 'table, tr, td, th { border : solid 1px black; border-collapse : collapse; } td, th { padding: 2px; }',
+		popupStyle : 'width=500,height=300',
 		init : function(c) {
 			c.$table
@@ -26,11 +27,13 @@
 		process : function(c, wo) {
 			var $this,
 				$table = $('<div/>').append(c.$table.clone()),
-				printStyle = printTable.basicStyle + 'table { width: 100% }' +
+				printStyle = printTable.basicStyle + 'table { width: 100%; }' +
 					// hide filter row
-					'.tablesorter-filter-row { display: none }' +
+					'.' + ( ts.css.filterRow || 'tablesorter-filter-row' ) +
+					// hide filtered rows
+					', .' + ( wo.filter_filteredRow || 'filtered' ) + ' { display: none; }' +
 					// hide sort arrows
-					'.tablesorter-header { background-image: none !important; }';
+					'.' + ( ts.css.header || 'tablesorter-header' ) + ' { background-image: none !important; }';
 			// replace content with data-attribute content
 			$table.find('[' + wo.print_dataAttrib + ']').each(function(){
@@ -41,12 +44,16 @@
 			// === rows ===
 			// Assume 'visible' means rows hidden by the pager (rows set to 'display:none')
 			// or hidden by a class name which is added to the wo.print_extraCSS definition
-			if (/a/i.test(wo.print_rows)) {
-				// force show of all rows
+			// look for jQuery filter selector in wo.print_rows & use if found
+			if ( /^f/i.test( wo.print_rows ) ) {
+				printStyle += 'tbody tr:not(.' + ( wo.filter_filteredRow || 'filtered' ) + ') { display: table-row !important; }';
+			} else if ( /^a/i.test( wo.print_rows ) ) {
+				// default force show of all rows
 				printStyle += 'tbody tr { display: table-row !important; }';
-			} else if (/f/i.test(wo.print_rows)) {
-				// add definition to show all non-filtered rows (cells hidden by the pager)
-				printStyle += 'tbody tr:not(.' + (wo.filter_filteredRow || 'filtered') + ') { display: table-row !important; }';
+			} else if ( /^[.#:\[]/.test( wo.print_rows ) ) {
+				// look for '.' (class selector), '#' (id selector),
+				// ':' (basic filters, e.g. ':not()') or '[' (attribute selector start)
+				printStyle += 'tbody tr' + wo.print_rows + ' { display: table-row !important; }';
 			}
 			// === columns ===
@@ -74,7 +81,7 @@
 		printOutput : function(c, data, style) {
 			var wo = c.widgetOptions,
-				generator = window.open('', wo.print_title, 'width=500,height=300'),
+				generator = window.open( '', wo.print_title, printTable.popupStyle ),
 				t = wo.print_title || c.$table.find('caption').text() || c.$table[0].id || document.title || 'table';
 			generator.document.write(
 				'<html><head><title>' + t + '</title>' +
@@ -83,8 +90,12 @@
 				'</head><body>' + data + '</body></html>'
 			);
 			generator.document.close();
-			generator.print();
-			generator.close();
+			// use timeout to allow browser to build DOM before printing
+			// Print preview in Chrome doesn't work without this code
+			setTimeout( function() {
+				generator.print();
+				generator.close();
+			}, 10 );
 			return true;
 		},
@@ -99,8 +110,8 @@
 		options: {
 			print_title      : '',          // this option > caption > table id > 'table'
 			print_dataAttrib : 'data-name', // header attrib containing modified header name
-			print_rows       : 'filtered',  // (a)ll, (v)isible or (f)iltered
-			print_columns    : 'selected',  // (a)ll or (s)elected (if columnSelector widget is added)
+			print_rows       : 'filtered',  // (a)ll, (v)isible, (f)iltered or custom css selector
+			print_columns    : 'selected',  // (a)ll, (v)isbible or (s)elected (if columnSelector widget is added)
 			print_extraCSS   : '',          // add any extra css definitions for the popup window here
 			print_styleSheet : '',          // add the url of your print stylesheet
 			// callback executed when processing completes

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-saveSort.js CHANGED Viewed

@@ -1,4 +1,7 @@
-/*! Widget: saveSort */
+/*! Widget: saveSort - updated 10/31/2015 (v2.24.0) *//*
+* Requires tablesorter v2.16+
+* by Rob Garrison
+*/
 ;(function ($) {
 	'use strict';
 	var ts = $.tablesorter || {};
@@ -54,7 +57,7 @@
 					c.sortList = sortList;
 				} else if (table.hasInitialized && sortList && sortList.length > 0) {
 					// update sort change
-					$table.trigger('sorton', [ sortList ]);
+					ts.sortOn( c, sortList );
 				}
 			}
 		},

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

@@ -1,4 +1,4 @@
-/*! Widget: scroller - updated 7/28/2015 (v2.22.4) *//*
+/*! Widget: scroller - updated 10/31/2015 (v2.24.0) *//*
 	Copyright (C) 2011 T. Connell & Associates, Inc.
 	Dual-licensed under the MIT and GPL licenses
@@ -88,7 +88,7 @@
 		}
 	});
-	/* Add window resizeEnd event */
+	/* Add window resizeEnd event (also used by columnSelector widget) */
 	ts.window_resize = function() {
 		if ( ts.timer_resize ) {
 			clearTimeout( ts.timer_resize );
@@ -186,7 +186,7 @@
 		},
 		setup : function( c, wo ) {
-			var maxHt, tbHt, $hdr, $t, $hCells, $fCells, $tableWrap, events, tmp,
+			var maxHt, tbHt, $hdr, $t, $hCells, $fCells, $tableWrap, events, tmp, detectedWidth,
 				$win = $( window ),
 				tsScroller = ts.scroller,
 				namespace = c.namespace + 'tsscroller',
@@ -202,10 +202,14 @@
 			wo.scroller_saved = [ 0, 0 ];
 			wo.scroller_isBusy = true;
-			// set scrollbar width & allow setting width to zero
-			wo.scroller_barSetWidth = wo.scroller_barWidth !== null ?
-				wo.scroller_barWidth :
-				( tsScroller.getBarWidth() || 15 );
+			// set scrollbar width to one of the following (1) explicitly set scroller_barWidth option,
+			// (2) detected scrollbar width or (3) fallback of 15px
+			if ( wo.scroller_barWidth !== null ) {
+				wo.scroller_barSetWidth = wo.scroller_barWidth;
+			} else {
+				detectedWidth = tsScroller.getBarWidth();
+				wo.scroller_barSetWidth = detectedWidth !== null ? detectedWidth : 15;
+			}
 			maxHt = wo.scroller_height || 300;

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-sort2Hash.js CHANGED Viewed

@@ -1,44 +1,61 @@
-/*! Widget: sort2Hash - updated 7/28/2015 (v2.22.4) */
+/*! Widget: sort2Hash (BETA) - updated 11/2/2015 (v2.24.1) */
+/* Requires tablesorter v2.8+ and jQuery 1.7+
+ * by Rob Garrison
+ */
 ;( function( $ ) {
 	'use strict';
 	var ts = $.tablesorter || {},
 	s2h = {
 		init : function( c, wo ) {
-			var hasSaveSort = ts.hasWidget( c.table, 'saveSort' ),
-				sort = s2h.getSort( c, wo );
+			var filter, temp, page, size,
+				table = c.table,
+				pager = c.pager,
+				hasSaveSort = ts.hasWidget( table, 'saveSort' ),
+				sort = s2h.decodeHash( c, wo, 'sort' );
 			if ( ( sort && !hasSaveSort ) || ( sort && hasSaveSort && wo.sort2Hash_overrideSaveSort ) ) {
-				s2h.processHash( c, wo, sort );
+				s2h.convertString2Sort( c, wo, sort );
 			}
-			c.$table.on( 'sortEnd.sort2hash', function() {
-				s2h.setHash( c, wo );
+			if ( ts.hasWidget( c.table, 'pager' ) ) {
+				temp = parseInt( s2h.decodeHash( c, wo, 'page' ), 10 );
+				page = pager.page = ( temp < 0 ? 0 : ( temp > pager.totalPages ? pager.totalPages - 1 : temp ) ) + 1;
+				size = pager.size = parseInt( s2h.decodeHash( c, wo, 'size' ), 10 );
+			}
+			if ( ts.hasWidget( table, 'filter' ) ) {
+				filter = s2h.decodeHash( c, wo, 'filter' );
+				if ( filter ) {
+					filter = filter.split( wo.sort2Hash_separator );
+					c.$table.one( 'tablesorter-ready', function() {
+						setTimeout(function(){
+							c.$table.one( 'filterEnd', function(){
+								$(this).trigger( 'pageAndSize', [ page, size ] );
+							});
+							$.tablesorter.setFilters( table, filter, true );
+						}, 100 );
+					});
+				}
+			} else {
+				c.$table.trigger( 'pageAndSize', [ page, size ] );
+			}
+			c.$table.on( 'sortEnd.sort2hash filterEnd.sort2hash pagerComplete.sort2Hash', function() {
+				if ( this.hasInitialized ) {
+					s2h.setHash( this.config, this.config.widgetOptions );
+				}
 			});
 		},
 		getTableId : function( c, wo ) {
 			// option > table id > table index on page
 			return wo.sort2Hash_tableId ||
 				c.table.id ||
 				'table' + $( 'table' ).index( c.$table );
 		},
-		getSort : function( c, wo, clean ) {
-			// modified original code from http://www.netlobo.com/url_query_string_javascript.html
-			var value,
-				name = s2h.getTableId( c, wo ).replace( /[\[]/, '\\[' ).replace( /[\]]/, '\\]' ),
-				sort = ( new RegExp( '[\\#&]' + name + '=([^&]*)' ) ).exec( window.location.hash );
-			if ( sort === null ) {
-				return '';
-			} else {
-				value = s2h.processSort( c, wo, sort[ 1 ] );
-				if ( clean ) {
-					window.location.hash = window.location.hash.replace( '&' + name + '=' + sort[ 1 ], '' );
-					return value;
-				}
-				return sort[ 1 ];
-			}
+		regexEscape : function( v ) {
+			return v.replace( /([\.\^\$\*\+\-\?\(\)\[\]\{\}\\\|])/g, '\\$1');
 		},
 		// convert 'first%20name,asc,last%20name,desc' into [[0,0], [1,1]]
-		processHash : function( c, wo, sortHash ) {
-			var regex, column, direction, temp,
-				arry = decodeURI( sortHash || '' ).split( wo.sort2Hash_separator ),
+		convertString2Sort : function( c, wo, sortHash ) {
+			var regex, column, direction, temp, index, $cell,
+				arry = sortHash.split( wo.sort2Hash_separator ),
 				indx = 0,
 				len = arry.length,
 				sort = [];
@@ -49,14 +66,18 @@
 				// ignore wo.sort2Hash_useHeaderText setting &
 				// just see if column contains a number
 				if ( isNaN( temp ) || temp > c.columns ) {
-					regex = new RegExp( '(' + column + ')', 'i' );
-					column = c.$headers.filter( function( index ) {
-						return regex.test( c.$headers[ index ].textContent || '' );
-					}).attr( 'data-column' );
+					regex = new RegExp( '(' + s2h.regexEscape( column ) + ')', 'i' );
+					for ( index = 0; index < c.columns; index++ ) {
+						$cell = c.$headerIndexed[ index ];
+						if ( regex.test( $cell.attr( wo.sort2Hash_headerTextAttr ) ) ) {
+							column = index;
+							index = c.columns;
+						}
+					}
 				}
 				direction = arry[ indx++ ];
 				// ignore unpaired values
-				if ( typeof direction !== 'undefined' ) {
+				if ( typeof column !== 'undefined' && typeof direction !== 'undefined' ) {
 					// convert text to 0, 1
 					if ( isNaN( direction ) ) {
 						// default to ascending sort
@@ -71,56 +92,134 @@
 		},
 		// convert [[0,0],[1,1]] to 'first%20name,asc,last%20name,desc'
-		processSort : function( c, wo ) {
+		convertSort2String : function( c, wo ) {
 			var index, txt, column, direction,
 				sort = [],
 				arry = c.sortList || [],
 				len = arry.length;
 			for ( index = 0; index < len; index++ ) {
 				column = arry[ index ][ 0 ];
-				if ( wo.sort2Hash_useHeaderText ) {
-					txt = $.trim( c.$headerIndexed[ column ].text() );
-					if ( typeof wo.sort2Hash_processHeaderText === 'function' ) {
-						txt = wo.sort2Hash_processHeaderText( txt, c, column );
-					}
-					column = txt;
-				}
-				sort.push( column );
+				txt = $.trim( c.$headerIndexed[ column ].attr( wo.sort2Hash_headerTextAttr ) );
+				sort.push( txt !== '' ? encodeURIComponent( txt ) : column );
 				direction = wo.sort2Hash_directionText[ arry[ index ][ 1 ] ];
 				sort.push( direction );
+			}
+			// join with separator
+			return sort.join( wo.sort2Hash_separator );
+		},
+		convertFilter2String : function( c, wo ) {
+			var index, txt, column, direction,
+				sort = [],
+				arry = c.sortList || [],
+				len = arry.length;
+			for ( index = 0; index < len; index++ ) {
+				column = arry[ index ][ 0 ];
+				txt = $.trim( c.$headerIndexed[ column ].attr( wo.sort2Hash_headerTextAttr ) );
+				column = typeof txt !== 'undefined' ? encodeURIComponent( txt ) : column;
+				sort.push( column );
+				direction = wo.sort2Hash_directionText[ arry[ index ][ 1 ] ];
+				sort.push( direction );
 			}
 			// join with separator
 			return sort.join( wo.sort2Hash_separator );
 		},
-		setHash : function( c, wo ) {
-			var sort = s2h.processSort( c, wo );
-			if ( sort.length ) {
-				// remove old hash
-				s2h.getSort( c, wo, true );
-				window.location.hash += ( window.location.hash.length ? '' : wo.sort2Hash_hash ) +
-					 '&' + s2h.getTableId( c, wo ) + '=' + encodeURI( sort );
+		encodeHash : function( c, wo, component, value, rawValue ) {
+			var result = false,
+				tableId = s2h.getTableId( c, wo );
+			if ( typeof wo.sort2Hash_encodeHash === 'function' ) {
+				result = wo.sort2Hash_encodeHash( c, tableId, component, value, rawValue || value );
+			}
+			if ( result === false ) {
+				result = '&' + component + '[' + tableId + ']=' + value;
+			}
+			return result;
+		},
+		decodeHash : function( c, wo, component ) {
+			var regex,
+				result = false,
+				tableId = s2h.getTableId( c, wo );
+			if ( typeof wo.sort2Hash_decodeHash === 'function' ) {
+				result = wo.sort2Hash_decodeHash( c, tableId, component );
+			}
+			if ( result === false ) {
+				regex = new RegExp( '[\\#&]' + component + '\\[' + s2h.regexEscape( tableId ) + '\\]=([^&]*)' ),
+				/*jshint -W030 */
+				result = regex.exec( window.location.hash );
 			}
+			return result ? decodeURIComponent( result[ 1 ] ) : '';
+		},
+		cleanHash : function( c, wo, component, hash ) {
+			var index, len, parts, regex,
+				result = false,
+				tableId = s2h.getTableId( c, wo );
+			if ( typeof wo.sort2Hash_cleanHash === 'function' ) {
+				result = wo.sort2Hash_cleanHash( c, tableId, component, hash );
+			}
+			if ( result === false ) {
+				result = [];
+				parts = ( hash || '' ).slice(1).split( '&' );
+				len = parts.length;
+				regex = new RegExp( component + '\\[' + s2h.regexEscape( tableId ) + '\\]=([^&]*)' );
+				for ( index = 0; index < len; index++ ) {
+					if ( !regex.test( parts[ index ] ) ) {
+						result.push( parts[ index ] );
+					}
+				}
+			}
+			return result.length ? '#' + result.join( '&' ) : '';
+		},
+		setHash : function( c, wo ) {
+			var str = '',
+				hash = window.location.hash,
+				hasPager = ts.hasWidget( c.table, 'pager' ),
+				hasFilter = ts.hasWidget( c.table, 'filter' ),
+				sortList = s2h.convertSort2String( c, wo ),
+				filters = ( hasFilter && c.lastSearch.join('') !== '' ? c.lastSearch : [] ),
+				filtersStr = encodeURIComponent( filters.join( c.widgetOptions.sort2Hash_separator ) ),
+				components = {
+					'sort'   : sortList ? s2h.encodeHash( c, wo, 'sort', sortList, c.sortList ) : '',
+					'page'   : hasPager ? s2h.encodeHash( c, wo, 'page', c.pager.page + 1 ) : '',
+					'size'   : hasPager ? s2h.encodeHash( c, wo, 'size', c.pager.size ) : '',
+					'filter' : filtersStr ? s2h.encodeHash( c, wo, 'filter', filtersStr, filters ) : ''
+				};
+			// remove old hash
+			$.each( components, function( component, value ) {
+				hash = s2h.cleanHash( c, wo, component, hash );
+				str += value;
+			});
+			// add updated hash
+			window.location.hash = ( ( window.location.hash || '' ).replace( '#', '' ).length ? hash : wo.sort2Hash_hash ) + str;
 		}
 	};
 	ts.addWidget({
 		id: 'sort2Hash',
-		priority: 30, // after saveSort
+		priority: 60, // after saveSort & pager
 		options: {
 			sort2Hash_hash              : '#',      // hash prefix
 			sort2Hash_separator         : '-',      // don't '#' or '=' here
-			sort2Hash_tableId           : null,     // this option > table ID > table index on page,
-			sort2Hash_useHeaderText     : false,    // use column header text (true) or zero-based column index
-			sort2Hash_processHeaderText : null,     // function( text, config, columnIndex ) {},
+			sort2Hash_headerTextAttr    : 'data-header', // data attribute containing alternate header text
 			sort2Hash_directionText     : [ 0, 1 ], // [ 'asc', 'desc' ],
 			sort2Hash_overrideSaveSort  : false     // if true, override saveSort widget if saved sort available
+			// Options below commented out for improved compression
+			// ******************
+			// sort2Hash_tableId           : null,     // this option > table ID > table index on page,
+			// custom hash processing functions
+			// sort2Hash_encodeHash        : null,
+			// sort2Hash_decodeHash        : null,
+			// sort2Hash_cleanHash         : null
 		},
 		init: function(table, thisWidget, c, wo) {
 			s2h.init( c, wo );
 		},
 		remove: function(table, c) {
-			c.$table.off( 'sortEnd.sort2hash' );
+			c.$table.off( '.sort2hash' );
 		}
 	});

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-sortTbodies.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/*! tablesorter tbody sorting widget (BETA) - 6/10/2015 (core v2.22.2)
+/*! tablesorter tbody sorting widget (BETA) - 10/31/2015 (v2.24.0)
  * Requires tablesorter v2.22.2+ and jQuery 1.4+
  * by Rob Garrison
  */
@@ -37,13 +37,13 @@
 				.bind( 'updateComplete' + namespace, function() {
 					// find parsers for each column
 					ts.sortTbodies.setTbodies( c, wo );
-					c.$table.trigger( 'updateCache', [ null, c.$tbodies ] );
+					ts.updateCache( c, null, c.$tbodies );
 				});
 			// detect parsers - in case the table contains only info-only tbodies
 			if ( $.isEmptyObject( c.parsers ) || c.$tbodies.length !== $tbodies.length ) {
 				ts.sortTbodies.setTbodies( c, wo );
-				c.$table.trigger( 'updateCache', [ null, c.$tbodies ] );
+				ts.updateCache( c, null, c.$tbodies );
 			}
 			// find colMax; this only matter for numeric columns
@@ -116,10 +116,10 @@
 								colMax = c.$headerIndexed[ col ].attr( 'data-ts-col-max-value' ) ||
 									1.79E+308; // close to Number.MAX_VALUE
 								// sort strings in numerical columns
-								if ( typeof ( c.string[ c.strings[ col ] ] ) === 'boolean' ) {
-									num = ( dir ? 1 : -1 ) * ( c.string[ c.strings[ col ] ] ? -1 : 1 );
+								if ( typeof ( ts.string[ c.strings[ col ] ] ) === 'boolean' ) {
+									num = ( dir ? 1 : -1 ) * ( ts.string[ c.strings[ col ] ] ? -1 : 1 );
 								} else {
-									num = ( c.strings[ col ] ) ? c.string[ c.strings[ col ] ] || 0 : 0;
+									num = ( c.strings[ col ] ) ? ts.string[ c.strings[ col ] ] || 0 : 0;
 								}
 								// fall back to built-in numeric sort
 								// var sort = $.tablesorter['sort' + s](a, b, dir, colMax, table);
@@ -138,7 +138,7 @@
 									sort = cts[ col ]( x, y, dir, col, table );
 								} else {
 									// fall back to natural sort
-									sort = ts[ 'sortNatural' + ( dir ? 'Asc' : 'Desc' ) ]( colA, colB, col, table, c );
+									sort = ts[ 'sortNatural' + ( dir ? 'Asc' : 'Desc' ) ]( colA, colB, col, c );
 								}
 							}
 							if ( sort ) { return sort; }