jquery-tablesorter 1.17.1 → 1.17.2

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

@@ -0,0 +1,228 @@
+/*! tablesorter tbody sorting widget (BETA) - 6/10/2015 (core v2.22.2)
+ * Requires tablesorter v2.22.2+ and jQuery 1.4+
+ * by Rob Garrison
+ */
+/*jshint browser:true, jquery:true, unused:false */
+/*global jQuery: false */
+;( function( $ ) {
+'use strict';
+var ts = $.tablesorter;
+
+ts.sortTbodies = {
+	init: function( c, wo ) {
+
+		var index, rows, txt, max, $rows,
+			namespace = c.namespace + 'sortTbody',
+			$tbodies = c.$table.children( 'tbody' ),
+			len = $tbodies.length;
+
+		// save serverSideSorting value; use to toggle internal row sorting
+		wo.sortTbody_original_serverSideSorting = c.serverSideSorting;
+
+		// include info-only tbodies - we need parsed data from *all* tbodies
+		wo.sortTbody_original_cssInfoBlock = c.cssInfoBlock;
+		c.cssInfoBlock = wo.sortTbody_noSort;
+		ts.sortTbodies.setTbodies( c, wo );
+
+		// add original order index for stable sort
+		for ( index = 0; index < len; index++ ) {
+			$tbodies.eq( index ).attr( 'data-ts-original-order', index );
+		}
+
+		c.$table
+			.unbind( 'sortBegin updateComplete '.split( ' ' ).join( namespace + ' ' ) )
+			.bind( 'sortBegin' + namespace, function() {
+				ts.sortTbodies.sorter( c );
+			})
+			.bind( 'updateComplete' + namespace, function() {
+				// find parsers for each column
+				ts.sortTbodies.setTbodies( c, wo );
+				c.$table.trigger( 'updateCache', [ 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 ] );
+		}
+
+		// find colMax; this only matter for numeric columns
+		$rows = $tbodies.children( 'tr' );
+		len = $rows.length;
+		for ( index = 0; index < c.columns; index++ ) {
+			max = 0;
+			if ( c.parsers[ index ].type === 'numeric' ) {
+				for ( rows = 0; rows < len; rows++ ) {
+					// update column max value (ignore sign)
+					txt = ts.getParsedText( c, $rows.eq( rows ).children()[ index ], index );
+					max = Math.max( Math.abs( txt ) || 0, max );
+				}
+			}
+			c.$headerIndexed[ index ].attr( 'data-ts-col-max-value', max );
+		}
+
+	},
+
+	// make sure c.$tbodies is up-to-date (init & after updates)
+	setTbodies: function( c, wo ) {
+		c.$tbodies = c.$table.children( 'tbody' ).not( '.' + wo.sortTbody_noSort );
+	},
+
+	sorter: function( c ) {
+		var $table = c.$table,
+			wo = c.widgetOptions;
+
+		// prevent multiple calls while processing
+		if ( wo.sortTbody_busy !== true ) {
+			wo.sortTbody_busy = true;
+			var $tbodies = $table.children( 'tbody' ).not( '.' + wo.sortTbody_noSort ),
+				primary = wo.sortTbody_primaryRow || 'tr:eq(0)',
+				sortList = c.sortList || [],
+				len = sortList.length;
+
+			if ( len ) {
+
+				// toggle internal row sorting
+				c.serverSideSorting = !wo.sortTbody_sortRows;
+
+				$tbodies.sort( function( a, b ) {
+					var sortListIndex, txt, dir, num, colMax, sort, col, order, colA, colB, x, y,
+						table = c.table,
+						parsers = c.parsers,
+						cts = c.textSorter || '',
+						$tbodyA = $( a ),
+						$tbodyB = $( b ),
+						$a = $tbodyA.find( primary ).children( 'td, th' ),
+						$b = $tbodyB.find( primary ).children( 'td, th' );
+					for ( sortListIndex = 0; sortListIndex < len; sortListIndex++ ) {
+						col = sortList[ sortListIndex ][0];
+						order = sortList[ sortListIndex ][1];
+						// sort direction, true = asc, false = desc
+						dir = order === 0;
+						// column txt - tbody A
+						txt = ts.getElementText( c, $a.eq( col ), col );
+						colA = parsers[ col ].format( txt, table, $a[ col ], col );
+						// column txt - tbody B
+						txt = ts.getElementText( c, $b.eq( col ), col );
+						colB = parsers[ col ].format( txt, table, $b[ col ], col );
+
+						if (c.sortStable && colA === colB && len === 1) {
+							return $tbodyA.attr( 'data-ts-original-order' ) - $tbodyB.attr( 'data-ts-original-order' );
+						}
+
+						// fallback to natural sort since it is more robust
+						num = /n/i.test( parsers && parsers[ col ] ? parsers[ col ].type || '' : '' );
+						if ( num && c.strings[ col ] ) {
+							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 );
+							} else {
+								num = ( c.strings[ col ] ) ? c.string[ c.strings[ col ] ] || 0 : 0;
+							}
+							// fall back to built-in numeric sort
+							// var sort = $.tablesorter['sort' + s](a, b, dir, colMax, table);
+							sort = c.numberSorter ? c.numberSorter( colA, colB, dir, colMax, table ) :
+								ts[ 'sortNumeric' + ( dir ? 'Asc' : 'Desc' ) ]( colA, colB, num, colMax, col, table );
+						} else {
+							// set a & b depending on sort direction
+							x = dir ? colA : colB;
+							y = dir ? colB : colA;
+							// text sort function
+							if ( typeof ( cts ) === 'function' ) {
+								// custom OVERALL text sorter
+								sort = cts( x, y, dir, col, table );
+							} else if ( typeof ( cts ) === 'object' && cts.hasOwnProperty( col ) ) {
+								// custom text sorter for a SPECIFIC COLUMN
+								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 );
+							}
+						}
+						if ( sort ) { return sort; }
+					}
+					return $tbodyA.attr( 'data-ts-original-order' ) - $tbodyB.attr( 'data-ts-original-order' );
+				});
+
+				ts.sortTbodies.restoreTbodies ( c, wo, $tbodies );
+				wo.sortTbody_busy = false;
+			}
+		}
+	},
+
+	restoreTbodies : function ( c, wo, $sortedTbodies ) {
+		var $nosort, $tbodies, $thisTbody, tbLen, nsLen, index, targetIndex,
+			$table = c.$table,
+			hasShuffled = true,
+			indx = 0;
+
+		// hide entire table to improve sort performance
+		$table.hide();
+		$sortedTbodies.appendTo( $table );
+
+		// reposition no-sort tbodies
+		$tbodies = $table.children( 'tbody' );
+		tbLen = $tbodies.length;
+		$nosort = $tbodies.filter( '.' + wo.sortTbody_noSort ).appendTo( $table );
+		nsLen = $nosort.length;
+
+		if ( nsLen ) {
+			// don't allow the while loop to cycle more times than the set number of no-sort tbodies
+			while ( hasShuffled && indx < nsLen ) {
+				hasShuffled = false;
+				for ( index = 0; index < nsLen; index++ ) {
+					targetIndex = parseInt( $nosort.eq( index ).attr( 'data-ts-original-order' ), 10 );
+					// if target index > number of tbodies, make it last
+					targetIndex = targetIndex >= tbLen ? tbLen : targetIndex < 0 ? 0 : targetIndex;
+
+					if ( targetIndex !== $nosort.eq( index ).index() ) {
+						hasShuffled = true;
+						$thisTbody = $nosort.eq( index ).detach();
+
+						if ( targetIndex >= tbLen ) {
+							// Are we trying to be the last tbody?
+							$thisTbody.appendTo( $table );
+						} else if ( targetIndex === 0 ) {
+							// Are we trying to be the first tbody?
+							$thisTbody.prependTo( $table );
+						} else {
+							// No, we want to be somewhere in the middle!
+							$thisTbody.insertBefore( $table.children( 'tbody:eq(' + targetIndex + ')' ) );
+						}
+
+					}
+				}
+				indx++;
+			}
+		}
+
+		$table.show();
+	}
+
+};
+
+ts.addWidget({
+	id: 'sortTbody',
+	// priority < 50 (filter widget), so c.$tbodies has the correct elements
+	priority: 40,
+	options: {
+		// point to a row within the tbody that matches the number of header columns
+		sortTbody_primaryRow : null,
+		// sort tbody internal rows
+		sortTbody_sortRows   : false,
+		// static tbodies (like static rows)
+		sortTbody_noSort     : 'tablesorter-no-sort-tbody'
+	},
+	init : function( table, thisWidget, c, wo ) {
+		ts.sortTbodies.init( c, wo );
+	},
+	remove : function( table, c, wo, refreshing ) {
+		c.$table.unbind( 'sortBegin updateComplete '.split( ' ' ).join( c.namespace + 'sortTbody ' ) );
+		c.serverSideSorting = wo.sortTbody_original_serverSideSorting;
+		c.cssInfoBlock = wo.sortTbody_original_cssInfoBlock;
+	}
+});
+
+})( jQuery );

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

@@ -16,32 +16,34 @@ $.extend(ts.css, {
 // Add a resize event to table headers
 ts.addHeaderResizeEvent = function(table, disable, settings) {
 	table = $(table)[0]; // make sure we're using a dom element
-	var headers,
-		defaults = {
+	if ( !table.config ) { return; }
+	var defaults = {
 			timer : 250
 		},
 		options = $.extend({}, defaults, settings),
 		c = table.config,
 		wo = c.widgetOptions,
-		checkSizes = function(triggerEvent) {
+		checkSizes = function( triggerEvent ) {
+			var index, headers, $header, sizes, width, height,
+				len = c.$headers.length;
 			wo.resize_flag = true;
 			headers = [];
-			c.$headers.each(function() {
-				var $header = $(this),
-					sizes = $header.data('savedSizes') || [0,0], // fixes #394
-					width = this.offsetWidth,
-					height = this.offsetHeight;
-				if (width !== sizes[0] || height !== sizes[1]) {
-					$header.data('savedSizes', [ width, height ]);
-					headers.push(this);
+			for ( index = 0; index < len; index++ ) {
+				$header = c.$headers.eq( index );
+				sizes = $header.data( 'savedSizes' ) || [ 0,0 ]; // fixes #394
+				width = $header[0].offsetWidth;
+				height = $header[0].offsetHeight;
+				if ( width !== sizes[0] || height !== sizes[1] ) {
+					$header.data( 'savedSizes', [ width, height ] );
+					headers.push( $header[0] );
 				}
-			});
-			if (headers.length && triggerEvent !== false) {
-				c.$table.trigger('resize', [ headers ]);
+			}
+			if ( headers.length && triggerEvent !== false ) {
+				c.$table.trigger( 'resize', [ headers ] );
 			}
 			wo.resize_flag = false;
 		};
-	checkSizes(false);
+	checkSizes( false );
 	clearInterval(wo.resize_timer);
 	if (disable) {
 		wo.resize_flag = false;
@@ -77,7 +79,8 @@ ts.addWidget({
 		if ( c.$table.hasClass('hasStickyHeaders') || ($.inArray('filter', c.widgets) >= 0 && !c.$table.hasClass('hasFilters')) ) {
 			return;
 		}
-		var $table = c.$table,
+		var index, len, $t,
+			$table = c.$table,
 			// add position: relative to attach element, hopefully it won't cause trouble.
 			$attach = $(wo.stickyHeaders_attachTo),
 			namespace = c.namespace + 'stickyheaders ',
@@ -112,17 +115,19 @@ ts.addWidget({
 			laststate = '',
 			spacing = 0,
 			setWidth = function($orig, $clone){
-				$orig.filter(':visible').each(function(i) {
-					var width, border,
-						$cell = $clone.filter(':visible').eq(i),
-						$this = $(this);
+				var index, width, border, $cell, $this,
+					$cells = $orig.filter(':visible'),
+					len = $cells.length;
+				for ( index = 0; index < len; index++ ) {
+					$cell = $clone.filter(':visible').eq(index);
+					$this = $cells.eq(index);
 					// code from https://github.com/jmosbech/StickyTableHeaders
 					if ($this.css('box-sizing') === 'border-box') {
 						width = $this.outerWidth();
 					} else {
 						if ($cell.css('border-collapse') === 'collapse') {
 							if (window.getComputedStyle) {
-								width = parseFloat( window.getComputedStyle(this, null).width );
+								width = parseFloat( window.getComputedStyle($this[0], null).width );
 							} else {
 								// ie8 only
 								border = parseFloat( $this.css('border-width') );
@@ -133,10 +138,11 @@ ts.addWidget({
 						}
 					}
 					$cell.css({
+						'width': width,
 						'min-width': width,
 						'max-width': width
 					});
-				});
+				}
 			},
 			resizeHeader = function() {
 				stickyOffset = $stickyOffset.length ? $stickyOffset.height() || 0 : parseInt(wo.stickyHeaders_offset, 10) || 0;
@@ -148,6 +154,39 @@ ts.addWidget({
 				});
 				setWidth( $table, $stickyTable );
 				setWidth( $header, $stickyCells );
+			},
+			scrollSticky = function( resizing ) {
+				if (!$table.is(':visible')) { return; } // fixes #278
+				// Detect nested tables - fixes #724
+				nestedStickyTop = $nestedSticky.length ? $nestedSticky.offset().top - $yScroll.scrollTop() + $nestedSticky.height() : 0;
+				var offset = $table.offset(),
+					yWindow = $.isWindow( $yScroll[0] ), // $.isWindow needs jQuery 1.4.3
+					xWindow = $.isWindow( $xScroll[0] ),
+					// scrollTop = ( $attach.length ? $attach.offset().top : $yScroll.scrollTop() ) + stickyOffset + nestedStickyTop,
+					scrollTop = ( $attach.length ? ( yWindow ? $yScroll.scrollTop() : $yScroll.offset().top ) : $yScroll.scrollTop() ) + stickyOffset + nestedStickyTop,
+					tableHeight = $table.height() - ($stickyWrap.height() + ($tfoot.height() || 0)),
+					isVisible = ( scrollTop > offset.top ) && ( scrollTop < offset.top + tableHeight ) ? 'visible' : 'hidden',
+					cssSettings = { visibility : isVisible };
+
+				if ($attach.length) {
+					cssSettings.top = yWindow ? scrollTop - $attach.offset().top : $attach.scrollTop();
+				}
+				if (xWindow) {
+					// adjust when scrolling horizontally - fixes issue #143
+					cssSettings.left = $table.offset().left - parseInt($table.css('margin-left'), 10) - $xScroll.scrollLeft() - spacing;
+				}
+				if ($nestedSticky.length) {
+					cssSettings.top = ( cssSettings.top || 0 ) + stickyOffset + nestedStickyTop;
+				}
+				$stickyWrap
+					.removeClass( ts.css.stickyVis + ' ' + ts.css.stickyHide )
+					.addClass( isVisible === 'visible' ? ts.css.stickyVis : ts.css.stickyHide )
+					.css(cssSettings);
+				if (isVisible !== laststate || resizing) {
+					// make sure the column widths match
+					resizeHeader();
+					laststate = isVisible;
+				}
 			};
 		// only add a position relative if a position isn't already defined
 		if ($attach.length && !$attach.css('position')) {
@@ -179,48 +218,26 @@ ts.addWidget({
 
 		// onRenderHeader is defined, we need to do something about it (fixes #641)
 		if (c.onRenderHeader) {
-			$stickyThead.children('tr').children().each(function(index){
+			$t = $stickyThead.children('tr').children();
+			len = $t.length;
+			for ( index = 0; index < len; index++ ) {
 				// send second parameter
-				c.onRenderHeader.apply( $(this), [ index, c, $stickyTable ] );
-			});
+				c.onRenderHeader.apply( $t.eq( index ), [ index, c, $stickyTable ] );
+			}
 		}
 
 		// make it sticky!
 		$xScroll.add($yScroll)
-		.unbind( ('scroll resize '.split(' ').join( namespace )).replace(/\s+/g, ' ') )
-		.bind('scroll resize '.split(' ').join( namespace ), function(event) {
-			if (!$table.is(':visible')) { return; } // fixes #278
-			// Detect nested tables - fixes #724
-			nestedStickyTop = $nestedSticky.length ? $nestedSticky.offset().top - $yScroll.scrollTop() + $nestedSticky.height() : 0;
-			var offset = $table.offset(),
-				yWindow = $.isWindow( $yScroll[0] ), // $.isWindow needs jQuery 1.4.3
-				xWindow = $.isWindow( $xScroll[0] ),
-				// scrollTop = ( $attach.length ? $attach.offset().top : $yScroll.scrollTop() ) + stickyOffset + nestedStickyTop,
-				scrollTop = ( $attach.length ? ( yWindow ? $yScroll.scrollTop() : $yScroll.offset().top ) : $yScroll.scrollTop() ) + stickyOffset + nestedStickyTop,
-				tableHeight = $table.height() - ($stickyWrap.height() + ($tfoot.height() || 0)),
-				isVisible = ( scrollTop > offset.top ) && ( scrollTop < offset.top + tableHeight ) ? 'visible' : 'hidden',
-				cssSettings = { visibility : isVisible };
+			.unbind( ('scroll resize '.split(' ').join( namespace )).replace(/\s+/g, ' ') )
+			.bind('scroll resize '.split(' ').join( namespace ), function( event ) {
+				scrollSticky( event.type === 'resize' );
+			});
+		c.$table
+			.unbind('stickyHeadersUpdate' + namespace)
+			.bind('stickyHeadersUpdate' + namespace, function(){
+				scrollSticky( true );
+			});
 
-			if ($attach.length) {
-				cssSettings.top = yWindow ? scrollTop - $attach.offset().top : $attach.scrollTop();
-			}
-			if (xWindow) {
-				// adjust when scrolling horizontally - fixes issue #143
-				cssSettings.left = $table.offset().left - parseInt($table.css('margin-left'), 10) - $xScroll.scrollLeft() - spacing;
-			}
-			if ($nestedSticky.length) {
-				cssSettings.top = ( cssSettings.top || 0 ) + stickyOffset + nestedStickyTop;
-			}
-			$stickyWrap
-				.removeClass( ts.css.stickyVis + ' ' + ts.css.stickyHide )
-				.addClass( isVisible === 'visible' ? ts.css.stickyVis : ts.css.stickyHide )
-				.css(cssSettings);
-			if (isVisible !== laststate || event.type === 'resize') {
-				// make sure the column widths match
-				resizeHeader();
-				laststate = isVisible;
-			}
-		});
 		if (wo.stickyHeaders_addResizeEvent) {
 			ts.addHeaderResizeEvent(table);
 		}
@@ -256,7 +273,7 @@ ts.addWidget({
 		var namespace = c.namespace + 'stickyheaders ';
 		c.$table
 			.removeClass('hasStickyHeaders')
-			.unbind( ('pagerComplete filterEnd '.split(' ').join(namespace)).replace(/\s+/g, ' ') )
+			.unbind( ('pagerComplete filterEnd stickyHeadersUpdate '.split(' ').join(namespace)).replace(/\s+/g, ' ') )
 			.next('.' + ts.css.stickyWrap).remove();
 		if (wo.$sticky && wo.$sticky.length) { wo.$sticky.remove(); } // remove cloned table
 		$(window)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.17.2
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -129,6 +129,7 @@ files:
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-resizable.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-saveSort.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-scroller.js
+- vendor/assets/javascripts/jquery-tablesorter/widgets/widget-sortTbodies.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-staticRow.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-stickyHeaders.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-storage.js