jquery-tablesorter 1.18.2 → 1.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886efa143e551b3b1b348bfc4a5ceb244cba60d1
-  data.tar.gz: b3ae2ede803d0ef6014d497114a502a3128b4d27
+  metadata.gz: a142ba049c8283ad5701ebc22af25c6f2a0a186e
+  data.tar.gz: 01d9fbb2e17cd989c67376e6f71aa809ed3c3639
 SHA512:
-  metadata.gz: 5a526f91f99c7d413b1d4c92b5b3ff03cb539bc4fda82e6f23cee1ffb162338b698b2c7ab91c5779fd824e52813f7eb4747e7dbd37ec7d9cc3f7d9f83cbb26d3
-  data.tar.gz: e42ae380bbddbca7bb6c7ccb74d2581cad6eb2d5273cd07f39bbd2ec804dec5ac2b8a63080b37e9eda3d236d8fdfd51c8fdb47dd19cf8cc6b4af7dbacddbe72f
+  metadata.gz: f0dafc07d7437a3af57ab0542226dd55d5cd0f1cbb4ad86290d1326644337a091b597cf03f98b20ab7cf8c3fbb8327024f16c4dbe59f226b1ea3a527e69337cd
+  data.tar.gz: 0c23865e29959b6c0ea505cb026ed5635d39e1b760b902bd25a2f0dc29c6553875a1b07899349353afc907d0d356fd716119cbb0d4e3799643a0bf4a78469f4c

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.23.2 (8/23/2015), [documentation]
+Current tablesorter version: 2.23.3 (9/1/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.18.2'
+  VERSION = '1.18.3'
 end

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 08-23-2015 (v2.23.2)*/
+/*! tablesorter (FORK) - updated 09-01-2015 (v2.23.3)*/
 /* 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.23.2 *//*
+/*! TableSorter (FORK) v2.23.3 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -35,7 +35,6 @@
 * @contributor Rob Garrison - https://github.com/Mottie/tablesorter
 */
 /*jshint browser:true, jquery:true, unused:false, expr: true */
-/*global console:false */
 ;(function($){
 	'use strict';
 	$.extend({
@@ -44,7 +43,7 @@
 
 			var ts = this;
 
-			ts.version = '2.23.2';
+			ts.version = '2.23.3';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -576,8 +575,10 @@
 				for (i = 0; i < len; i++) {
 					// direction = 2 means reset!
 					if (list[i][1] !== 2) {
-						// multicolumn sorting updating - choose the :last in case there are nested columns
-						f = c.$headers.not('.sorter-false').filter('[data-column="' + list[i][0] + '"]' + (len === 1 ? ':last' : '') );
+						// multicolumn sorting updating - see #1005
+						f = c.lastClickedIndex > 0 ? c.$headers.filter(':gt(' + ( c.lastClickedIndex - 1 ) + ')') : c.$headers;
+						// choose the :last in case there are nested columns
+						f = f.not('.sorter-false').filter('[data-column="' + list[i][0] + '"]' + (len === 1 ? ':last' : '') );
 						if (f.length) {
 							for (j = 0; j < f.length; j++) {
 								if (!f[j].sortDisabled) {
@@ -1306,7 +1307,10 @@
 					$cell = $.fn.closest ? $(this).closest('th, td') : /TH|TD/.test(this.nodeName) ? $(this) : $(this).parents('th, td');
 					// reference original table headers and find the same cell
 					// don't use $headers or IE8 throws an error - see #987
-					cell = c.$headers[ $cell.prevAll().length ];
+					temp = $headers.index( $cell );
+					c.lastClickedIndex = ( temp < 0 ) ? $cell.attr('data-column') : temp;
+					// use column index if $headers is undefined
+					cell = c.$headers[ c.lastClickedIndex ];
 					if (cell && !cell.sortDisabled) {
 						initSort(table, cell, e);
 					}
@@ -2714,7 +2718,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 8/23/2015 (v2.23.2) *//*
+/*! Widget: filter - updated 9/1/2015 (v2.23.3) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -2777,7 +2781,7 @@
 					.split( ' ' ).join( c.namespace + 'filter ' );
 			$table
 				.removeClass( 'hasFilters' )
-				// add .tsfilter namespace to all BUT search
+				// add filter namespace to all BUT search
 				.unbind( events.replace( ts.regex.spaces, ' ' ) )
 				// remove the filter row even if refreshing, because the column might have been moved
 				.find( '.' + tscss.filterRow ).remove();
@@ -2788,7 +2792,7 @@
 				ts.processTbody( table, $tbody, false ); // restore tbody
 			}
 			if ( wo.filter_reset ) {
-				$( document ).undelegate( wo.filter_reset, 'click.tsfilter' );
+				$( document ).undelegate( wo.filter_reset, 'click' + c.namespace + 'filter' );
 			}
 		}
 	});
@@ -3158,8 +3162,8 @@
 				} else if ( $( wo.filter_reset ).length ) {
 					// reset is a jQuery selector, use event delegation
 					$( document )
-						.undelegate( wo.filter_reset, 'click.tsfilter' )
-						.delegate( wo.filter_reset, 'click.tsfilter', function() {
+						.undelegate( wo.filter_reset, 'click' + c.namespace + 'filter' )
+						.delegate( wo.filter_reset, 'click' + c.namespace + 'filter', function() {
 							// trigger a reset event, so other functions ( filter_formatter ) know when to reset
 							c.$table.trigger( 'filterReset' );
 						});
@@ -3474,8 +3478,8 @@
 				// don't get cached data, in case data-column changes dynamically
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				// don't allow 'change' event to process if the input value is the same - fixes #685
-				if ( event.which === 13 || event.type === 'search' ||
-					event.type === 'change' && this.value !== c.lastSearch[column] ) {
+				if ( wo.filter_initialized && ( event.which === 13 || event.type === 'search' ||
+					event.type === 'change' && this.value !== c.lastSearch[column] ) ) {
 					event.preventDefault();
 					// init search with no delay
 					$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
@@ -4321,7 +4325,8 @@
 							}
 							$column
 								.val( setFilters[ i ] )
-								.trigger( 'change.tsfilter' );
+								// must include a namespace here; but not c.namespace + 'filter'?
+								.trigger( 'change' + c.namespace );
 						} else {
 							filters[i] = $column.val() || '';
 							// don't change the first... it will move the cursor

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

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.23.2 *//*
+/*! TableSorter (FORK) v2.23.3 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -17,7 +17,6 @@
 * @contributor Rob Garrison - https://github.com/Mottie/tablesorter
 */
 /*jshint browser:true, jquery:true, unused:false, expr: true */
-/*global console:false */
 ;(function($){
 	'use strict';
 	$.extend({
@@ -26,7 +25,7 @@
 
 			var ts = this;
 
-			ts.version = '2.23.2';
+			ts.version = '2.23.3';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -558,8 +557,10 @@
 				for (i = 0; i < len; i++) {
 					// direction = 2 means reset!
 					if (list[i][1] !== 2) {
-						// multicolumn sorting updating - choose the :last in case there are nested columns
-						f = c.$headers.not('.sorter-false').filter('[data-column="' + list[i][0] + '"]' + (len === 1 ? ':last' : '') );
+						// multicolumn sorting updating - see #1005
+						f = c.lastClickedIndex > 0 ? c.$headers.filter(':gt(' + ( c.lastClickedIndex - 1 ) + ')') : c.$headers;
+						// choose the :last in case there are nested columns
+						f = f.not('.sorter-false').filter('[data-column="' + list[i][0] + '"]' + (len === 1 ? ':last' : '') );
 						if (f.length) {
 							for (j = 0; j < f.length; j++) {
 								if (!f[j].sortDisabled) {
@@ -1288,7 +1289,10 @@
 					$cell = $.fn.closest ? $(this).closest('th, td') : /TH|TD/.test(this.nodeName) ? $(this) : $(this).parents('th, td');
 					// reference original table headers and find the same cell
 					// don't use $headers or IE8 throws an error - see #987
-					cell = c.$headers[ $cell.prevAll().length ];
+					temp = $headers.index( $cell );
+					c.lastClickedIndex = ( temp < 0 ) ? $cell.attr('data-column') : temp;
+					// use column index if $headers is undefined
+					cell = c.$headers[ c.lastClickedIndex ];
 					if (cell && !cell.sortDisabled) {
 						initSort(table, cell, e);
 					}

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 08-23-2015 (v2.23.2)*/
+/*! tablesorter (FORK) - updated 09-01-2015 (v2.23.3)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -372,7 +372,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 8/23/2015 (v2.23.2) *//*
+/*! Widget: filter - updated 9/1/2015 (v2.23.3) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -435,7 +435,7 @@
 					.split( ' ' ).join( c.namespace + 'filter ' );
 			$table
 				.removeClass( 'hasFilters' )
-				// add .tsfilter namespace to all BUT search
+				// add filter namespace to all BUT search
 				.unbind( events.replace( ts.regex.spaces, ' ' ) )
 				// remove the filter row even if refreshing, because the column might have been moved
 				.find( '.' + tscss.filterRow ).remove();
@@ -446,7 +446,7 @@
 				ts.processTbody( table, $tbody, false ); // restore tbody
 			}
 			if ( wo.filter_reset ) {
-				$( document ).undelegate( wo.filter_reset, 'click.tsfilter' );
+				$( document ).undelegate( wo.filter_reset, 'click' + c.namespace + 'filter' );
 			}
 		}
 	});
@@ -816,8 +816,8 @@
 				} else if ( $( wo.filter_reset ).length ) {
 					// reset is a jQuery selector, use event delegation
 					$( document )
-						.undelegate( wo.filter_reset, 'click.tsfilter' )
-						.delegate( wo.filter_reset, 'click.tsfilter', function() {
+						.undelegate( wo.filter_reset, 'click' + c.namespace + 'filter' )
+						.delegate( wo.filter_reset, 'click' + c.namespace + 'filter', function() {
 							// trigger a reset event, so other functions ( filter_formatter ) know when to reset
 							c.$table.trigger( 'filterReset' );
 						});
@@ -1132,8 +1132,8 @@
 				// don't get cached data, in case data-column changes dynamically
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				// don't allow 'change' event to process if the input value is the same - fixes #685
-				if ( event.which === 13 || event.type === 'search' ||
-					event.type === 'change' && this.value !== c.lastSearch[column] ) {
+				if ( wo.filter_initialized && ( event.which === 13 || event.type === 'search' ||
+					event.type === 'change' && this.value !== c.lastSearch[column] ) ) {
 					event.preventDefault();
 					// init search with no delay
 					$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
@@ -1979,7 +1979,8 @@
 							}
 							$column
 								.val( setFilters[ i ] )
-								.trigger( 'change.tsfilter' );
+								// must include a namespace here; but not c.namespace + 'filter'?
+								.trigger( 'change' + c.namespace );
 						} else {
 							filters[i] = $column.val() || '';
 							// don't change the first... it will move the cursor

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

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 8/23/2015 (v2.23.2) *//*
+/*! Widget: filter - updated 9/1/2015 (v2.23.3) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -61,7 +61,7 @@
 					.split( ' ' ).join( c.namespace + 'filter ' );
 			$table
 				.removeClass( 'hasFilters' )
-				// add .tsfilter namespace to all BUT search
+				// add filter namespace to all BUT search
 				.unbind( events.replace( ts.regex.spaces, ' ' ) )
 				// remove the filter row even if refreshing, because the column might have been moved
 				.find( '.' + tscss.filterRow ).remove();
@@ -72,7 +72,7 @@
 				ts.processTbody( table, $tbody, false ); // restore tbody
 			}
 			if ( wo.filter_reset ) {
-				$( document ).undelegate( wo.filter_reset, 'click.tsfilter' );
+				$( document ).undelegate( wo.filter_reset, 'click' + c.namespace + 'filter' );
 			}
 		}
 	});
@@ -442,8 +442,8 @@
 				} else if ( $( wo.filter_reset ).length ) {
 					// reset is a jQuery selector, use event delegation
 					$( document )
-						.undelegate( wo.filter_reset, 'click.tsfilter' )
-						.delegate( wo.filter_reset, 'click.tsfilter', function() {
+						.undelegate( wo.filter_reset, 'click' + c.namespace + 'filter' )
+						.delegate( wo.filter_reset, 'click' + c.namespace + 'filter', function() {
 							// trigger a reset event, so other functions ( filter_formatter ) know when to reset
 							c.$table.trigger( 'filterReset' );
 						});
@@ -758,8 +758,8 @@
 				// don't get cached data, in case data-column changes dynamically
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				// don't allow 'change' event to process if the input value is the same - fixes #685
-				if ( event.which === 13 || event.type === 'search' ||
-					event.type === 'change' && this.value !== c.lastSearch[column] ) {
+				if ( wo.filter_initialized && ( event.which === 13 || event.type === 'search' ||
+					event.type === 'change' && this.value !== c.lastSearch[column] ) ) {
 					event.preventDefault();
 					// init search with no delay
 					$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
@@ -1605,7 +1605,8 @@
 							}
 							$column
 								.val( setFilters[ i ] )
-								.trigger( 'change.tsfilter' );
+								// must include a namespace here; but not c.namespace + 'filter'?
+								.trigger( 'change' + c.namespace );
 						} else {
 							filters[i] = $column.val() || '';
 							// don't change the first... it will move the cursor

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

@@ -1,4 +1,4 @@
-/*! Widget: grouping - updated 3/5/2015 (v2.21.0) *//*
+/*! Widget: grouping - updated 9/1/2015 (v2.23.3) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -55,10 +55,13 @@
 		update : function(table, c, wo){
 			if ($.isEmptyObject(c.cache)) { return; }
 			var rowIndex, tbodyIndex, currentGroup, $rows, groupClass, grouping, norm_rows, saveName, direction,
-				lang = wo.grouping_language,
+				hasSort = typeof c.sortList[0] !== 'undefined',
 				group = '',
+				groupIndex = 0,
 				savedGroup = false,
-				column = c.sortList[0] ? c.sortList[0][0] : -1;
+				column = typeof wo.group_forceColumn[0] !== 'undefined' ?
+					( wo.group_enforceSort && !hasSort ? -1 : wo.group_forceColumn[0] ) :
+					( hasSort ? c.sortList[0][0] : -1 );
 			c.$table
 				.find('tr.group-hidden').removeClass('group-hidden').end()
 				.find('tr.group-header').remove();
@@ -66,7 +69,7 @@
 				// clear pager saved spacer height (in case the rows are collapsed)
 				c.$table.data('pagerSavedHeight', 0);
 			}
-			if (column >= 0 && !c.$headerIndexed[column].hasClass('group-false')) {
+			if (column >= 0 && column < c.columns && !c.$headerIndexed[column].hasClass('group-false')) {
 				wo.group_currentGroup = ''; // save current groups
 				wo.group_currentGroups = {};
 
@@ -78,10 +81,10 @@
 				// save current grouping
 				if (wo.group_collapsible && wo.group_saveGroups && ts.storage) {
 					wo.group_currentGroups = ts.storage( table, 'tablesorter-groups' ) || {};
-					// include direction when grouping numbers > 1 (reversed direction shows different range values)
-					direction = (grouping[1] === 'number' && grouping[2] > 1) ? 'dir' + c.sortList[0][1] : '';
+					// include direction when saving groups (reversed numbers shows different range values)
+					direction = 'dir' + c.sortList[0][1];
 					// combine column, sort direction & grouping as save key
-					saveName = wo.group_currentGroup = '' + column + direction + grouping.join('');
+					saveName = wo.group_currentGroup = '' + c.sortList[0][0] + direction + grouping.join('');
 					if (!wo.group_currentGroups[saveName]) {
 						wo.group_currentGroups[saveName] = [];
 					} else {
@@ -98,7 +101,7 @@
 							if (ts.grouping.types[grouping[1]]) {
 								currentGroup = norm_rows[rowIndex] ?
 									ts.grouping.types[grouping[1]]( c, c.$headerIndexed[column], norm_rows[rowIndex][column], /date/.test(groupClass) ?
-									grouping[2] : parseInt(grouping[2] || 1, 10) || 1, group, lang ) : currentGroup;
+									grouping[2] : parseInt(grouping[2] || 1, 10) || 1, group ) : currentGroup;
 								if (group !== currentGroup) {
 									group = currentGroup;
 									// show range if number > 1
@@ -110,9 +113,11 @@
 										currentGroup = wo.group_formatter((currentGroup || '').toString(), column, table, c, wo) || currentGroup;
 									}
 									$rows.eq(rowIndex).before('<tr class="group-header ' + c.selectorRemove.slice(1) +
-										'" unselectable="on"' + ( c.tabIndex ? ' tabindex="0"' : '' ) + '><td colspan="' +
-										c.columns + '">' + (wo.group_collapsible ? '<i/>' : '') + '<span class="group-name">' +
-										currentGroup + '</span><span class="group-count"></span></td></tr>');
+										'" unselectable="on" ' + ( c.tabIndex ? 'tabindex="0" ' : '' ) + 'data-group-index="' +
+										( groupIndex++ ) + '"><td colspan="' + c.columns + '">' +
+										( wo.group_collapsible ? '<i/>' : '' ) +
+										'<span class="group-name">' + currentGroup + '</span>' +
+										'<span class="group-count"></span></td></tr>');
 									if (wo.group_saveGroups && !savedGroup && wo.group_collapsed && wo.group_collapsible) {
 										// all groups start collapsed
 										wo.group_currentGroups[wo.group_currentGroup].push(currentGroup);
@@ -139,8 +144,8 @@
 							}
 						}
 					}
-					if (wo.group_saveGroups && wo.group_currentGroups.length && wo.group_currentGroups[wo.group_currentGroup].length) {
-						name = $row.find('.group-name').text().toLowerCase();
+					if (wo.group_saveGroups && !$.isEmptyObject(wo.group_currentGroups) && wo.group_currentGroups[wo.group_currentGroup].length) {
+						name = $row.find('.group-name').text().toLowerCase() + $row.attr('data-group-index');
 						isHidden = $.inArray( name, wo.group_currentGroups[wo.group_currentGroup] ) > -1;
 						$row.toggleClass('collapsed', isHidden);
 						$rows.toggleClass('group-hidden', isHidden);
@@ -163,7 +168,7 @@
 					if (event.type === 'keyup' && event.which !== 13) { return; }
 					var isCollapsed, $groups, indx,
 						$this = $(this),
-						name = $this.find('.group-name').text().toLowerCase();
+						name = $this.find('.group-name').text().toLowerCase() + $this.attr('data-group-index');
 					// use shift-click to toggle ALL groups
 					if (event.shiftKey && (event.type === 'click' || event.type === 'keyup')) {
 						$this.siblings('.group-header').trigger('toggleGroup');
@@ -221,6 +226,10 @@
 			group_callback    : null, // function($cell, $rows, column, table){}, callback allowing modification of the group header labels
 			group_complete    : 'groupingComplete', // event triggered on the table when the grouping widget has finished work
 
+			// apply the grouping widget only to selected column
+			group_forceColumn : [],   // only the first value is used; set as an array for future expansion
+			group_enforceSort : true, // only apply group_forceColumn when a sort is applied to the table
+
 			// checkbox parser text used for checked/unchecked values
 			group_checkbox    : [ 'checked', 'unchecked' ],
 			// change these default date names based on your language preferences

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.18.3
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple integration of jquery-tablesorter (Mottie's fork) into the Rails asset