jquery-tablesorter 1.16.1 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829c54cea1f515c1cfa40720c377143067718de0
-  data.tar.gz: 77e79f0f644401ad0dba7ed025fbc41b6176bc65
+  metadata.gz: ccbde787981d827d7b3dbc159fe3da131a047d40
+  data.tar.gz: efc7453655e3b187b2c188993c64f540ed38dd2d
 SHA512:
-  metadata.gz: 18a6169fa726b92e7634f1fa2ddef07ba134c61bae955de9f7290a8f25cabbfad689797fa61a166445990ee802f18d4d2ffe86330d7b0a1708c6e4bb47670998
-  data.tar.gz: a5874b4304c01c4899b21a79ca2df2efa86121093769ad4890c7ab8e253d176f8d9017b6ef093abc9f39908f79b2aaa4848d5732021a05e01518b0693193134e
+  metadata.gz: 281fb01a0cd7b6605bf22f5d026c7523fe1f89a9fad5aad4d3b700b5a6d439beeed1e8d333b1d7dbcc93465736cc04826e3d9453b04d9630a25e81fb4e308fbf
+  data.tar.gz: af6d1fc76d055a5f4005adb808cfc408ad81f77322370b4d040ccb885f7bc468d511069849619cbe2c204130f85a9de786c64e2a4ae3829ea70cfa8f79107552

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.21.1 (3/10/2015), [documentation]
+Current tablesorter version: 2.21.2 (3/13/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.16.1'
+  VERSION = '1.16.2'
 end

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

@@ -705,7 +705,6 @@
 			pg = Math.min( p.totalPages, p.filteredPages );
 			if ( p.page < 0 ) { p.page = 0; }
 			if ( p.page > ( pg - 1 ) && pg !== 0 ) { p.page = pg - 1; }
-
 			// fixes issue where one currentFilter is [] and the other is ['','',''],
 			// making the next if comparison think the filters are different (joined by commas). Fixes #202.
 			l.currentFilters = (l.currentFilters || []).join('') === '' ? [] : l.currentFilters;
@@ -911,7 +910,8 @@
 					.bind('updateComplete.pager', function(e, table, triggered){
 						e.stopPropagation();
 						// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
-						if ( !table || triggered ) { return; }
+						// don't recalculate total rows/pages if using ajax
+						if ( !table || triggered || p.ajax ) { return; }
 						var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
 						p.totalRows = $rows.length - ( p.countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
 						p.totalPages = Math.ceil( p.totalRows / p.size );

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

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.21.1 *//*
+/*! TableSorter (FORK) v2.21.2 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -34,7 +34,7 @@
 
 			var ts = this;
 
-			ts.version = '2.21.1';
+			ts.version = '2.21.2';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -1252,7 +1252,6 @@
 			ts.computeColumnIndex = function(trs) {
 				var matrix = [],
 				lookup = {},
-				cols = 0, // determine the number of columns
 				i, j, k, l, $cell, cell, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow;
 				for (i = 0; i < trs.length; i++) {
 					cells = trs[i].cells;
@@ -1274,7 +1273,6 @@
 							}
 						}
 						lookup[cellId] = firstAvailCol;
-						cols = Math.max(firstAvailCol, cols);
 						// add data-column
 						$cell.attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex
 						for (k = rowIndex; k < rowIndex + rowSpan; k++) {
@@ -1288,8 +1286,7 @@
 						}
 					}
 				}
-				// may not be accurate if # header columns !== # tbody columns
-				return cols + 1; // add one because it's a zero-based index
+				return matrixrow.length;
 			};
 
 			// *** Process table ***

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) widgets - updated 03-10-2015 (v2.21.1)*/
+/*! tablesorter (FORK) widgets - updated 03-13-2015 (v2.21.2)*/
 /* Includes: storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort */
 (function(factory) {
   if (typeof define === 'function' && define.amd) {
@@ -244,10 +244,8 @@ ts.addWidget({
 						hdr = [themes.sortDesc, themes.active].join(' ');
 						icon = themes.iconSortDesc;
 					}
-					$h
-						.addClass(hdr)
-						.find('.' + ts.css.icon)
-						.addClass(icon || '');
+					$header.addClass(hdr);
+					$icon.addClass(icon || '');
 				}
 			}
 		}
@@ -501,7 +499,7 @@ ts.filter = {
 		notMatch: function( c, data ) {
 			if ( /^\!/.test(data.iFilter) ) {
 				var indx,
-					filter = ts.filter.parseFilter(c, data.iFilter.replace('!', ''), data.index, data.parsed[data.index]);
+					filter = ts.filter.parseFilter(c, data.iFilter.replace('!', ''), data.index, data.parsed[data.index]) || '';
 				if (ts.filter.regex.exact.test(filter)) {
 					// look for exact not matches - see #628
 					filter = filter.replace(ts.filter.regex.exact, '');
@@ -517,7 +515,7 @@ ts.filter = {
 		exact: function( c, data ) {
 			/*jshint eqeqeq:false */
 			if (ts.filter.regex.exact.test(data.iFilter)) {
-				var filter = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.exact, ''), data.index, data.parsed[data.index]);
+				var filter = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.exact, ''), data.index, data.parsed[data.index]) || '';
 				return data.anyMatch ? $.inArray(filter, data.rowArray) >= 0 : filter == data.iExact;
 			}
 			return null;
@@ -547,8 +545,8 @@ ts.filter = {
 					parsed = data.parsed[index],
 					// make sure the dash is for a range and not indicating a negative number
 					query = data.iFilter.split( ts.filter.regex.toSplit ),
-					range1 = ts.formatFloat( ts.filter.parseFilter(c, query[0].replace(ts.filter.regex.nondigit, ''), index, parsed), table ),
-					range2 = ts.formatFloat( ts.filter.parseFilter(c, query[1].replace(ts.filter.regex.nondigit, ''), index, parsed), table );
+					range1 = ts.formatFloat( ts.filter.parseFilter(c, query[0].replace(ts.filter.regex.nondigit, '') || '', index, parsed), table ),
+					range2 = ts.formatFloat( ts.filter.parseFilter(c, query[1].replace(ts.filter.regex.nondigit, '') || '', index, parsed), table );
 					// parse filter value in case we're comparing numbers (dates)
 				if (parsed || c.parsers[index].type === 'numeric') {
 					result = c.parsers[index].format('' + query[0], table, c.$headers.eq(index), index);
@@ -569,7 +567,7 @@ ts.filter = {
 			if ( /[\?\*\|]/.test(data.iFilter) || ts.filter.regex.orReplace.test(data.filter) ) {
 				var index = data.index,
 					parsed = data.parsed[index],
-					query = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed);
+					query = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed) || '';
 				// look for an exact match with the "or" unless the "filter-match" class is found
 				if (!c.$headerIndexed[index].hasClass('filter-match') && /\|/.test(query)) {
 					// show all results while using filter match. Fixes #727
@@ -587,7 +585,7 @@ ts.filter = {
 				var indx,
 					patternIndx = 0,
 					len = data.iExact.length,
-					pattern = ts.filter.parseFilter(c, data.iFilter.slice(1), data.index, data.parsed[data.index]);
+					pattern = ts.filter.parseFilter(c, data.iFilter.slice(1), data.index, data.parsed[data.index]) || '';
 				for (indx = 0; indx < len; indx++) {
 					if (data.iExact[indx] === pattern[patternIndx]) {
 						patternIndx += 1;

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

@@ -95,8 +95,8 @@ var tse = $.tablesorter.editable = {
 
 	bindEvents: function( c, wo ) {
 		c.$table
-			.off( ( 'updateComplete pagerComplete '.split( ' ' ).join( '.tseditable' ) ).replace( /\s+/g, ' ' ) )
-			.on( 'updateComplete pagerComplete '.split( ' ' ).join( '.tseditable' ), function() {
+			.off( ( 'updateComplete pagerComplete '.split( ' ' ).join( '.tseditable ' ) ).replace( /\s+/g, ' ' ) )
+			.on( 'updateComplete pagerComplete '.split( ' ' ).join( '.tseditable ' ), function() {
 				tse.update( c, c.widgetOptions );
 			});
 

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

@@ -142,7 +142,7 @@ ts.filter = {
 		notMatch: function( c, data ) {
 			if ( /^\!/.test(data.iFilter) ) {
 				var indx,
-					filter = ts.filter.parseFilter(c, data.iFilter.replace('!', ''), data.index, data.parsed[data.index]);
+					filter = ts.filter.parseFilter(c, data.iFilter.replace('!', ''), data.index, data.parsed[data.index]) || '';
 				if (ts.filter.regex.exact.test(filter)) {
 					// look for exact not matches - see #628
 					filter = filter.replace(ts.filter.regex.exact, '');
@@ -158,7 +158,7 @@ ts.filter = {
 		exact: function( c, data ) {
 			/*jshint eqeqeq:false */
 			if (ts.filter.regex.exact.test(data.iFilter)) {
-				var filter = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.exact, ''), data.index, data.parsed[data.index]);
+				var filter = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.exact, ''), data.index, data.parsed[data.index]) || '';
 				return data.anyMatch ? $.inArray(filter, data.rowArray) >= 0 : filter == data.iExact;
 			}
 			return null;
@@ -188,8 +188,8 @@ ts.filter = {
 					parsed = data.parsed[index],
 					// make sure the dash is for a range and not indicating a negative number
 					query = data.iFilter.split( ts.filter.regex.toSplit ),
-					range1 = ts.formatFloat( ts.filter.parseFilter(c, query[0].replace(ts.filter.regex.nondigit, ''), index, parsed), table ),
-					range2 = ts.formatFloat( ts.filter.parseFilter(c, query[1].replace(ts.filter.regex.nondigit, ''), index, parsed), table );
+					range1 = ts.formatFloat( ts.filter.parseFilter(c, query[0].replace(ts.filter.regex.nondigit, '') || '', index, parsed), table ),
+					range2 = ts.formatFloat( ts.filter.parseFilter(c, query[1].replace(ts.filter.regex.nondigit, '') || '', index, parsed), table );
 					// parse filter value in case we're comparing numbers (dates)
 				if (parsed || c.parsers[index].type === 'numeric') {
 					result = c.parsers[index].format('' + query[0], table, c.$headers.eq(index), index);
@@ -210,7 +210,7 @@ ts.filter = {
 			if ( /[\?\*\|]/.test(data.iFilter) || ts.filter.regex.orReplace.test(data.filter) ) {
 				var index = data.index,
 					parsed = data.parsed[index],
-					query = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed);
+					query = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed) || '';
 				// look for an exact match with the "or" unless the "filter-match" class is found
 				if (!c.$headerIndexed[index].hasClass('filter-match') && /\|/.test(query)) {
 					// show all results while using filter match. Fixes #727
@@ -228,7 +228,7 @@ ts.filter = {
 				var indx,
 					patternIndx = 0,
 					len = data.iExact.length,
-					pattern = ts.filter.parseFilter(c, data.iFilter.slice(1), data.index, data.parsed[data.index]);
+					pattern = ts.filter.parseFilter(c, data.iFilter.slice(1), data.index, data.parsed[data.index]) || '';
 				for (indx = 0; indx < len; indx++) {
 					if (data.iExact[indx] === pattern[patternIndx]) {
 						patternIndx += 1;

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

@@ -16,13 +16,13 @@ output = ts.output = {
 	event      : 'outputTable',
 
 	// wrap line breaks & tabs in quotes
-	regexQuote : /([\n\t]|<[^<]+>)/,    // test
+	regexQuote : /([\n\t\x09\x0d\x0a]|<[^<]+>)/, // test if cell needs wrapping quotes
 	regexBR    : /(<br([\s\/])?>|\n)/g, // replace
 	regexIMG   : /<img[^>]+alt\s*=\s*['"]([^'"]+)['"][^>]*>/i, // match
 	regexHTML  : /<[^<]+>/g, // replace
 
-	replaceCR  : '\\n',
-	replaceTab : '\\t',
+	replaceCR  : '\x0d\x0a',
+	replaceTab : '\x09',
 
 	popupTitle : 'Output',
 	popupStyle : 'width:100%;height:100%;', // for textarea

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

@@ -268,7 +268,8 @@ tsp = ts.pager = {
 			.on('updateComplete.pager', function(e, table, triggered){
 				e.stopPropagation();
 				// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
-				if (!table || triggered) { return; }
+				// don't recalculate total rows/pages if using ajax
+				if (!table || triggered || p.ajax) { return; }
 				var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
 				p.totalRows = $rows.length - ( wo.pager_countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
 				p.totalPages = Math.ceil( p.totalRows / p.size );

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

@@ -149,10 +149,8 @@ ts.addWidget({
 						hdr = [themes.sortDesc, themes.active].join(' ');
 						icon = themes.iconSortDesc;
 					}
-					$h
-						.addClass(hdr)
-						.find('.' + ts.css.icon)
-						.addClass(icon || '');
+					$header.addClass(hdr);
+					$icon.addClass(icon || '');
 				}
 			}
 		}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.2
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties