jquery-tablesorter 1.15.0 → 1.16.0

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

@@ -1,4 +1,4 @@
-/* Output widget for TableSorter 2/9/2015 (v2.19.1)
+/* Output widget for TableSorter 3/5/2015 (v2.21.0)
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * Modified from:
  * HTML Table to CSV: http://www.kunalbabre.com/projects/table2CSV.php (License unknown?)
@@ -120,6 +120,13 @@ output = ts.output = {
 
 		// all tbody rows
 		$rows = $el.children('tbody').children('tr');
+
+		if (wo.output_includeFooter) {
+			// clone, to force the tfoot rows to the end of this selection of rows
+			// otherwise they appear after the thead (the order in the HTML)
+			$rows = $rows.add( $el.children('tfoot').children('tr').clone() );
+		}
+
 		// get (f)iltered, (v)isible or all rows (look for the first letter only)
 		$rows = /f/.test(wo.output_saveRows) ? $rows.not('.' + (wo.filter_filteredRow || 'filtered') ) :
 			/v/.test(wo.output_saveRows) ? $rows.filter(':visible') : $rows;
@@ -287,6 +294,7 @@ ts.addWidget({
 	options: {
 		output_separator     : ',',         // set to "json", "array" or any separator
 		output_ignoreColumns : [],          // columns to ignore [0, 1,... ] (zero-based index)
+		output_includeFooter : false,       // include footer rows in the output
 		output_dataAttrib    : 'data-name', // header attrib containing modified header name
 		output_headerRows    : false,       // if true, include multiple header rows (JSON only)
 		output_delivery      : 'popup',     // popup, download

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

@@ -1,4 +1,4 @@
-/* Pager widget for TableSorter 2/9/2015 (v2.19.1) - requires jQuery 1.7+ */
+/* Pager widget for TableSorter 3/5/2015 (v2.21.0) - requires jQuery 1.7+ */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($){
 "use strict";
@@ -151,7 +151,7 @@ tsp = ts.pager = {
 
 		p.isInitializing = true;
 		if (c.debug) {
-			ts.log('Pager initializing');
+			ts.log('Pager: Initializing');
 		}
 
 		p.size = $.data(table, 'pagerLastSize') || wo.pager_size;
@@ -196,7 +196,7 @@ tsp = ts.pager = {
 		} else {
 			p.ajax = false;
 			// Regular pager; all rows stored in memory
-			c.$table.trigger("appendCache", [{}, true]);
+			c.$table.trigger('appendCache', [{}, true]);
 		}
 
 	},
@@ -214,6 +214,9 @@ tsp = ts.pager = {
 		p.initialized = true;
 		p.initializing = false;
 		p.isInitializing = false;
+		if (c.debug) {
+			ts.log('Pager: Triggering pagerInitialized');
+		}
 		c.$table.trigger('pagerInitialized', c);
 		// filter widget not initialized; it will update the output display & fire off the pagerComplete event
 		if ( !( c.widgetOptions.filter_initialized && ts.hasWidget(table, 'filter') ) ) {
@@ -310,6 +313,9 @@ tsp = ts.pager = {
 		// clicked controls
 		ctrls = [ s.first, s.prev, s.next, s.last ];
 		fxn = [ 'moveToFirstPage', 'moveToPrevPage', 'moveToNextPage', 'moveToLastPage' ];
+		if (c.debug && !p.$container.length) {
+			ts.log('Pager: >> Container not found');
+		}
 		p.$container.find(ctrls.join(','))
 			.attr("tabindex", 0)
 			.off('click.pager')
@@ -336,6 +342,8 @@ tsp = ts.pager = {
 					tsp.moveToPage(table, p, true);
 					tsp.updatePageDisplay(table, c, false);
 				});
+		} else if (c.debug) {
+			ts.log('Pager: >> Goto selector not found');
 		}
 
 		if ( p.$size.length ) {
@@ -351,6 +359,8 @@ tsp = ts.pager = {
 					}
 					return false;
 				});
+		} else if (c.debug) {
+			ts.log('Pager: >> Size selector not found');
 		}
 
 	},
@@ -371,7 +381,8 @@ tsp = ts.pager = {
 	},
 
 	calcFilters: function(table, c) {
-		var wo = c.widgetOptions,
+		var normalized, indx, len,
+			wo = c.widgetOptions,
 			p = c.pager,
 			hasFilters = c.$table.hasClass('hasFilters');
 		if (hasFilters && !wo.pager_ajaxUrl) {
@@ -380,9 +391,11 @@ tsp = ts.pager = {
 				p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( wo.pager_countChildRows ? '' : '.' + c.cssChildRow ).length;
 			} else {
 				p.filteredRows = 0;
-				$.each(c.cache[0].normalized, function(i, el) {
-					p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
-				});
+				normalized = c.cache[0].normalized;
+				len = normalized.length;
+				for (indx = 0; indx < len; indx++) {
+					p.filteredRows += p.regexRows.test(normalized[indx][c.columns].$row[0].className) ? 0 : 1;
+				}
 			}
 		} else if (!hasFilters) {
 			p.filteredRows = p.totalRows;
@@ -391,7 +404,7 @@ tsp = ts.pager = {
 
 	updatePageDisplay: function(table, c, completed) {
 		if ( c.pager.initializing ) { return; }
-		var s, t, $out,
+		var s, t, $out, options, indx, len,
 			wo = c.widgetOptions,
 			p = c.pager,
 			sz = p.size || p.setSize || 10; // don't allow dividing by zero
@@ -431,9 +444,11 @@ tsp = ts.pager = {
 				});
 			if ( p.$goto.length ) {
 				t = '';
-				$.each(tsp.buildPageSelect(p, c), function(i, opt){
-					t += '<option value="' + opt + '">' + opt + '</option>';
-				});
+				options = tsp.buildPageSelect(p, c);
+				len = options.length;
+				for (indx = 0; indx < len; indx++) {
+					t += '<option value="' + options[indx] + '">' + options[indx] + '</option>';
+				}
 				// innerHTML doesn't work in IE9 - http://support2.microsoft.com/kb/276228
 				p.$goto.html(t).val( p.page + 1 );
 			}
@@ -450,6 +465,9 @@ tsp = ts.pager = {
 		tsp.pagerArrows(c);
 		tsp.fixHeight(table, c);
 		if (p.initialized && completed !== false) {
+			if (c.debug) {
+				ts.log('Pager: Triggering pagerComplete');
+			}
 			c.$table.trigger('pagerComplete', c);
 			// save pager info to storage
 			if (wo.pager_savePages && ts.storage) {
@@ -624,7 +642,7 @@ tsp = ts.pager = {
 
 			if ( exception ) {
 				if (c.debug) {
-					ts.log('Ajax Error', xhr, exception);
+					ts.log('Pager: >> Ajax Error', xhr, exception);
 				}
 				ts.showError(table, exception.message + ' (' + xhr.status + ')');
 				c.$tbodies.eq(0).children('tr').detach();
@@ -714,6 +732,9 @@ tsp = ts.pager = {
 					// apply widgets after table has rendered & after a delay to prevent
 					// multiple applyWidget blocking code from blocking this trigger
 					setTimeout(function(){
+						if (c.debug) {
+							ts.log('Pager: Triggering pagerChange');
+						}
 						$t
 							.trigger('applyWidgets')
 							.trigger('pagerChange', p);
@@ -755,49 +776,52 @@ tsp = ts.pager = {
 					}
 			};
 			if (c.debug) {
-				ts.log('ajax initialized', p.ajaxObject);
+				ts.log('Pager: Ajax initialized', p.ajaxObject);
 			}
 			$.ajax(p.ajaxObject);
 		}
 	},
 
 	getAjaxUrl: function(table, c) {
-		var p = c.pager,
+		var indx, len,
+			p = c.pager,
 			wo = c.widgetOptions,
 			url = (wo.pager_ajaxUrl) ? wo.pager_ajaxUrl
 				// allow using "{page+1}" in the url string to switch to a non-zero based index
 				.replace(/\{page([\-+]\d+)?\}/, function(s,n){ return p.page + (n ? parseInt(n, 10) : 0); })
 				.replace(/\{size\}/g, p.size) : '',
-			sl = c.sortList,
-			fl = p.currentFilters || $(table).data('lastSearch') || [],
+			sortList = c.sortList,
+			filterList = p.currentFilters || $(table).data('lastSearch') || [],
 			sortCol = url.match(/\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/),
 			filterCol = url.match(/\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/),
 			arry = [];
 		if (sortCol) {
 			sortCol = sortCol[1];
-			$.each(sl, function(i,v){
-				arry.push(sortCol + '[' + v[0] + ']=' + v[1]);
-			});
+			len = sortList.length;
+			for (indx = 0; indx < len; indx++) {
+				arry.push(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 );
 			arry = [];
 		}
 		if (filterCol) {
 			filterCol = filterCol[1];
-			$.each(fl, function(i,v){
-				if (v) {
-					arry.push(filterCol + '[' + i + ']=' + encodeURIComponent(v));
+			len = filterList.length;
+			for (indx = 0; indx < len; indx++) {
+				if (filterList[indx]) {
+					arry.push(filterCol + '[' + indx + ']=' + encodeURIComponent(filterList[indx]));
 				}
-			});
+			}
 			// if the arry is empty, just add the fcol parameter... "&{filterList:fcol}" becomes "&fcol"
 			url = url.replace(/\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join('&') : filterCol );
-			p.currentFilters = fl;
+			p.currentFilters = filterList;
 		}
 		if ( $.isFunction(wo.pager_customAjaxUrl) ) {
 			url = wo.pager_customAjaxUrl(table, url);
 		}
 		if (c.debug) {
-			ts.log('Pager ajax url: ' + url);
+			ts.log('Pager: Ajax url = ' + url);
 		}
 		return url;
 	},
@@ -813,7 +837,7 @@ tsp = ts.pager = {
 			e = p.size;
 		if ( l < 1 ) {
 			if (c.debug) {
-				ts.log('Pager: no rows for pager to render');
+				ts.log('Pager: >> No rows for pager to render');
 			}
 			// empty table, abort!
 			return;
@@ -824,7 +848,12 @@ tsp = ts.pager = {
 		}
 		p.cacheIndex = [];
 		p.isDisabled = false; // needed because sorting will change the page and re-enable the pager
-		if (p.initialized) { c.$table.trigger('pagerChange', c); }
+		if (p.initialized) {
+			if (c.debug) {
+				ts.log('Pager: Triggering pagerChange');
+			}
+			c.$table.trigger('pagerChange', c);
+		}
 		if ( !wo.pager_removeRows ) {
 			tsp.hideRows(table, c);
 		} else {
@@ -853,6 +882,9 @@ tsp = ts.pager = {
 		wo.pager_startPage = p.page;
 		wo.pager_size = p.size;
 		if (table.isUpdating) {
+			if (c.debug) {
+				ts.log('Pager: Triggering updateComplete');
+			}
 			c.$table.trigger('updateComplete', [ table, true ]);
 		}
 
@@ -877,7 +909,7 @@ tsp = ts.pager = {
 			tsp.renderTable(table, c.rowsCopy);
 			c.$table.trigger('applyWidgets');
 			if (c.debug) {
-				ts.log('pager disabled');
+				ts.log('Pager: Disabled');
 			}
 		}
 		// disable size selector
@@ -940,7 +972,7 @@ tsp = ts.pager = {
 				return;
 			}
 		if (c.debug) {
-			ts.log('Pager changing to page ' + p.page);
+			ts.log('Pager: Changing to page ' + p.page);
 		}
 		p.last = {
 			page : p.page,
@@ -959,10 +991,16 @@ tsp = ts.pager = {
 		}
 		$.data(table, 'pagerLastPage', p.page);
 		if (p.initialized && pageMoved !== false) {
+			if (c.debug) {
+				ts.log('Pager: Triggering pageMoved');
+			}
 			c.$table
 				.trigger('pageMoved', c)
 				.trigger('applyWidgets');
 			if (!p.ajax && table.isUpdating) {
+				if (c.debug) {
+					ts.log('Pager: Triggering updateComplete');
+				}
 				c.$table.trigger('updateComplete', [ table, true ]);
 			}
 		}
@@ -1039,7 +1077,7 @@ tsp = ts.pager = {
 			tsp.setPageSize(table, p.size, c);
 			tsp.hideRowsSetup(table, c);
 			if (c.debug) {
-				ts.log('pager enabled');
+				ts.log('Pager: Enabled');
 			}
 		}
 	},

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

@@ -10,7 +10,7 @@
 
 	Resizable scroller widget for the jQuery tablesorter plugin
 
-	Version 2.0 - modified by Rob Garrison 4/12/2013; updated 2/7/2015 (v2.19.0)
+	Version 2.0 - modified by Rob Garrison 4/12/2013; updated 3/5/2015 (v2.21.0)
 	Requires jQuery v1.7+
 	Requires the tablesorter plugin, v2.8+, available at http://mottie.github.com/tablesorter/docs/
 
@@ -57,10 +57,11 @@ $(function(){
 		'.tablesorter-scroller { text-align: left; overflow: hidden;  }' +
 		'.tablesorter-scroller-header { overflow: hidden; }' +
 		'.tablesorter-scroller-header table.tablesorter { margin-bottom: 0; }' +
+		'.tablesorter-scroller-footer table.tablesorter thead { visibility: hidden, height: 0; overflow: hidden; }' +
 		'.tablesorter-scroller-table { overflow-y: scroll; }' +
-		'.tablesorter-scroller-table table.tablesorter { margin-top: 0; overflow: scroll; } ' +
-		'.tablesorter-scroller-table .tablesorter-filter-row, .tablesorter-scroller-table tfoot { display: none; }' +
-		'.tablesorter-scroller-table table.tablesorter thead tr.tablesorter-headerRow * {' +
+		'.tablesorter-scroller-table table.tablesorter { margin-top: 0; margin-bottom: 0; overflow: scroll; } ' +
+		'.tablesorter-scroller-table .tablesorter-filter-row,.tablesorter-scroller-footer .tablesorter-filter-row,.tablesorter-scroller-table tfoot { display: none; }' +
+		'.tablesorter-scroller-table table.tablesorter thead tr.tablesorter-headerRow *,.tablesorter-scroller-footer table.tablesorter thead * {' +
 			'line-height:0;height:0;border:none;background-image:none;padding-top:0;padding-bottom:0;margin-top:0;margin-bottom:0;overflow:hidden;' +
 		'}</style>';
 	$(s).appendTo('body');
@@ -95,24 +96,37 @@ ts.addWidget({
 			});
 	},
 	format: function(table, c, wo) {
-		var maxHt, tbHt, $hdr, resize, getBarWidth, $cells,
+		var maxHt, tbHt, $hdr, $t, resize, getBarWidth, $hCells, $fCells,
+			$ft = [],
 			// c.namespace contains a unique tablesorter ID, per table
 			id = c.namespace.slice(1) + 'tsscroller',
 			$win = $(window),
 			$tbl = c.$table;
 
 		if (!c.isScrolling) {
+			// force developer to set fixedWidth to maintain column widths
+			c.widthFixed = true;
 			maxHt = wo.scroller_height || 300;
 			tbHt = $tbl.children('tbody').height();
 			if (tbHt !== 0 && maxHt > tbHt) { maxHt = tbHt + 10; }  // Table is less than h px
 
 			$hdr = $('<table class="' + $tbl.attr('class') + '" cellpadding=0 cellspacing=0>' +
-				'<thead>' + $tbl.find('thead:first').html() + '</thead>' +
+				$tbl.children('thead')[0].outerHTML +
 				'</table>');
+
+			$t = $tbl.children('tfoot');
+			if ($t.length) {
+				$ft = $('<table class="' + $tbl.attr('class') + '" cellpadding=0 cellspacing=0 style="margin-top:0"></table>')
+					.append( $t.clone(true) ) // maintain any bindings on the tfoot cells
+					.append( $tbl.children('thead')[0].outerHTML )
+					.wrap('<div class="tablesorter-scroller-footer"/>');
+				$fCells = $ft.children('tfoot').eq(0).children('tr').children();
+			}
+
 			if (c.$extraTables && c.$extraTables.length) {
-				c.$extraTables = c.$extraTables.add($hdr);
+				c.$extraTables = c.$extraTables.add($hdr).add($ft);
 			} else {
-				c.$extraTables = $hdr;
+				c.$extraTables = $hdr.add($ft);
 			}
 			$tbl
 				.wrap('<div id="' + id + '" class="tablesorter-scroller" />')
@@ -120,15 +134,20 @@ ts.addWidget({
 				// shrink filter row but don't completely hide it because the inputs/selectors may distort the columns
 				.find('.tablesorter-filter-row').addClass('hideme');
 
-			$cells = $hdr
-				.wrap('<div class="tablesorter-scroller-header" style="width:' + $tbl.width() + ';" />')
+			if ($ft.length) {
+				// $ft.parent() to include <div> wrapper
+				$tbl.after( $ft.parent() );
+			}
+
+			$hCells = $hdr
+				.wrap('<div class="tablesorter-scroller-header" />')
 				.find('.' + ts.css.header);
 
 			// use max-height, so the height resizes dynamically while filtering
-			$tbl.wrap('<div class="tablesorter-scroller-table" style="max-height:' + maxHt + 'px;width:' + $tbl.width() + ';" />');
+			$tbl.wrap('<div class="tablesorter-scroller-table" style="max-height:' + maxHt + 'px;" />');
 
 			// make scroller header sortable
-			ts.bindEvents(table, $cells);
+			ts.bindEvents(table, $hCells);
 
 			// look for filter widget
 			if ($tbl.hasClass('hasFilters')) {
@@ -145,7 +164,7 @@ ts.addWidget({
 			};
 
 			resize = function(){
-				var d, b, $h, $th, w,
+				var d, b, $h, w,
 					// Hide other scrollers so we can resize
 					$div = $('div.tablesorter-scroller[id != "' + id + '"]').hide();
 
@@ -153,8 +172,7 @@ ts.addWidget({
 				// only remove colgroup if it was added by the plugin
 				// the $.tablesorter.fixColumnWidth() function already does this (v2.19.0)
 				// but we need to get "accurate" resized measurements here - see issue #680
-				$tbl.children('colgroup.tablesorter-colgroup').remove();
-				$hdr.children('colgroup').remove();
+				$tbl.add( $hdr ).add( $ft ).children('colgroup').remove();
 
 				// Reset sizes so parent can resize.
 				$tbl
@@ -172,43 +190,24 @@ ts.addWidget({
 
 				// Shrink a bit to accommodate scrollbar
 				w = ( wo.scroller_barWidth || getBarWidth() ) + b;
-
 				d.width( d.parent().innerWidth() - ( d.parent().hasScrollBar() ? w : 0 ) );
 				w = d.innerWidth() - ( d.hasScrollBar() ? w : 0 );
-				$tbl.width( w );
-				$hdr.width( w );
-				$hdr.parent().width( w );
+				$tbl.add( $hdr ).add( $hdr.parent() ).add( $ft ).width( w );
 
 				$tbl
 					.closest('.tablesorter-scroller')
 					.find('.tablesorter-scroller-reset')
 					.removeClass('tablesorter-scroller-reset');
 
-				$h = $hdr.find('thead').children().children();
-
-				// adjust cloned header to match original table width - includes wrappers, headers, and header inner div
-				$tbl.children('thead').children().children().each(function(i, c){
-					$th = $(c).find('.tablesorter-header-inner');
-					if ($th.length) {
-						// I have no idea why this is in here anymore LOL
-						w = parseInt( $th.css('min-width').replace('auto', '0').replace(/(px|em)/, ''), 10 );
-						if ( $th.width() < w ) {
-							$th.width(w);
-						} else {
-							w = $th.width();
-						}
-
-						$h.eq(i)
-							.parent()
-							.width( $th.parent().width() - b );
-					}
-				});
-
 				// refresh colgroup & copy to cloned header
 				$.tablesorter.fixColumnWidth( table );
-				$h = $tbl.children('colgroup').clone();
+				$h = $tbl.children('colgroup');
 				if ($h.length) {
-					$hdr.prepend($h);
+					b = $h[0].outerHTML;
+					$hdr.prepend(b);
+					if ($ft.length) {
+						$ft.prepend(b);
+					}
 				}
 
 				// hide filter row because filterEnd event fires
@@ -250,6 +249,7 @@ ts.addWidget({
 		var $table = c.$table,
 			namespace = c.namespace + 'tsscroller';
 		$table.closest('.tablesorter-scroller').find('.tablesorter-scroller-header').remove();
+		$table.closest('.tablesorter-scroller').find('.tablesorter-scroller-footer').remove();
 		$table
 				.unwrap()
 				.find('.tablesorter-filter-row').removeClass('hideme').end()