jquery-tablesorter 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d639b535865896da6a17f2df96f4e9f91955d3c
-  data.tar.gz: 65db0875623d6c2dd8d394ca82f4b8a1ddbb6900
+  metadata.gz: f67ead0cc7ee473fc13eba000fc6fa881e1f5055
+  data.tar.gz: a35b216de9c3d6374d1e23fbcf902ed14ecc3530
 SHA512:
-  metadata.gz: 607932c25ac349c0a182932789532f7967f7587a7a5bbac50321c8cf9da397f26dc22d2cf5dc4891a2d3daf4b5a40759da1e3af1fa743f20b86c142fd69808f4
-  data.tar.gz: bafbde9cfdda3b9e8f9f086c2004f1f7310bf52aeaf9896d6c5cd2f3f6e0481f85bb11059e3e3729cc3e01593f3c6b3d00f0f5de3e25fa1e02d4263f6fb401bf
+  metadata.gz: 3ad77cc7413bd4780c15d580097503bc60844b9ab05cebe4a27ced3f8d4f387c27efcd09ef4160b8c818eda24a3729fee1d0dbe9fce28173c0fecd7fd322a5d0
+  data.tar.gz: 41a29044a40b804f5c2c18950a7855e3cb7f353df1333739f4d964dba51e1a26a67366b49b67c10a4b2d050557e3775d5db03817333acc97684e7525b1bcbd16

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.16.2 (4/27/2014), [documentation]
+Current tablesorter version: 2.16.3 (4/30/2014), [documentation]
 
 Any issue associate 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.11.1'
+  VERSION = '1.11.2'
 end

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.16.2 - Client-side table sorting with ease!
+* TableSorter 2.16.3 - Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
@@ -24,7 +24,7 @@
 
 			var ts = this;
 
-			ts.version = "2.16.2";
+			ts.version = "2.16.3";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -219,7 +219,7 @@
 				var c = table.config,
 					// update table bodies in case we start with an empty table
 					tb = c.$tbodies = c.$table.children('tbody:not(.' + c.cssInfoBlock + ')'),
-					rows, list, l, i, h, ch, p, time,
+					rows, list, l, i, h, ch, p, time, indx,
 					j = 0,
 					parsersDebug = "",
 					len = tb.length;
@@ -240,7 +240,9 @@
 							h = c.$headers.filter(':not([colspan])');
 							h = h.add( c.$headers.filter('[colspan="1"]') ) // ie8 fix
 								.filter('[data-column="' + i + '"]:last');
-							ch = c.headers[i];
+							// get headers option corrected index
+							indx = c.$headers.index(h);
+							ch = c.headers[indx];
 							// get column parser
 							p = ts.getParserById( ts.getData(h, ch, 'sorter') );
 							// empty cells behaviour - keeping emptyToBottom for backwards compatibility
@@ -804,8 +806,8 @@
 					$cell = $(cell),
 					// update cache - format: function(s, table, cell, cellIndex)
 					// no closest in jQuery v1.2.6 - tbdy = $tb.index( $(cell).closest('tbody') ),$row = $(cell).closest('tr');
-					tbdy = $tb.index( $cell.parents('tbody').filter(':first') ),
-					$row = $cell.parents('tr').filter(':first');
+					tbdy = $tb.index( $.fn.closest ? $cell.closest('tbody') : $cell.parents('tbody').filter(':first') ),
+					$row = $.fn.closest ? $cell.closest('tr') : $cell.parents('tr').filter(':first');
 					cell = $cell[0]; // in case cell is a jQuery object
 					// tbody may not exist if update is initialized while tbody is removed for processing
 					if ($tb.length && tbdy >= 0) {
@@ -1019,9 +1021,7 @@
 					setHeadersCss(table);
 					if (c.initWidgets) {
 						// apply widget format
-						setTimeout(function(){
-							ts.applyWidget(table, false);
-						}, 0);
+						ts.applyWidget(table, false);
 					}
 				}
 
@@ -1030,7 +1030,13 @@
 					$table
 					.unbind('sortBegin' + c.namespace + ' sortEnd' + c.namespace)
 					.bind('sortBegin' + c.namespace + ' sortEnd' + c.namespace, function(e) {
-						ts.isProcessing(table, e.type === 'sortBegin');
+						clearTimeout(c.processTimer);
+						ts.isProcessing(table);
+						if (e.type === 'sortBegin') {
+							c.processTimer = setTimeout(function(){
+								ts.isProcessing(table, true);
+							}, 500);
+						}
 					});
 				}
 
@@ -1044,7 +1050,6 @@
 				if (typeof c.initialized === 'function') { c.initialized(table); }
 			};
 
-
 			// computeTableHeaderCellIndexes from:
 			// http://www.javascripttoolbox.com/lib/table/examples.php
 			// http://www.javascripttoolbox.com/temp/table_cellindex.html
@@ -1161,7 +1166,7 @@
 					}
 					if (c.delayInit && isEmptyObject(c.cache)) { buildCache(table); }
 					// jQuery v1.2.6 doesn't have closest()
-					cell = /TH|TD/.test(this.tagName) ? this : $(this).parents('th, td')[0];
+					cell = $.fn.closest ? $(this).closest('th, td')[0] : /TH|TD/.test(this.tagName) ? this : $(this).parents('th, td')[0];
 					// reference original table headers and find the same cell
 					cell = c.$headers[ $headers.index( cell ) ];
 					if (!cell.sortDisabled) {
@@ -1238,6 +1243,8 @@
 			};
 
 			// Natural sort - https://github.com/overset/javascript-natural-sort (date sorting removed)
+			// this function will only accept strings, or you'll see "TypeError: undefined is not a function"
+			// I could add a = a.toString(); b = b.toString(); but it'll slow down the sort overall
 			ts.sortNatural = function(a, b) {
 				if (a === b) { return 0; }
 				var xN, xD, yN, yD, xF, yF, i, mx,

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

@@ -1,4 +1,4 @@
-/*! Filter widget formatter functions - updated 4/22/2014 (v2.16.1-beta)
+/*! Filter widget formatter functions - updated 4/30/2014 (v2.16.3)
  * requires: jQuery 1.7.2+, tableSorter 2.16+, filter widget 2.16+ and select2 v3.4.6+ plugin
  */
 /*jshint browser:true, jquery:true, unused:false */
@@ -17,6 +17,7 @@ ts.filterFormatter.select2 = function($cell, indx, select2Def) {
 		// select2 filter formatter options
 		cellText : '', // Text (wrapped in a label element)
 		match : true, // adds "filter-match" to header
+		value : '',
 		// include ANY select2 options below
 		multiple : true,
 		width : '100%'
@@ -31,21 +32,23 @@ ts.filterFormatter.select2 = function($cell, indx, select2Def) {
 	// hidden filter update namespace trigger by filter widget
 	.bind('change' + c.namespace + 'filter', function(){
 		var val = this.value;
-		val = val.replace(/[/()$]/g, '').split('|');
-		updateSelect2(val);
+		val = val.replace(/[/()$^]/g, '').split('|');
+		$cell.find('.select2').select2('val', val);
+		updateSelect2();
 	}),
 	$header = c.$headers.filter('[data-column="' + indx + '"]:last'),
 	onlyAvail = $header.hasClass(wo.filter_onlyAvail),
 	$shcell = [],
-	match = o.match ? '' : '$',
+	matchPrefix = o.match ? '' : '^',
+	matchSuffix = o.match ? '' : '$',
 
 	// this function updates the hidden input and adds the current values to the header cell text
-	updateSelect2 = function(v, notrigger) {
-		v = typeof v === "undefined" || v === '' ? $cell.find('.select2').select2('val') || o.value || '' : v || '';
+	updateSelect2 = function() {
+		var v = $cell.find('.select2').select2('val') || o.value || '';
 		$input
-		// add equal to the beginning, so we filter exact numbers
-		.val( $.isArray(v) && v.length ? '/(' + (v || []).join(match + '|') + match + ')/' : '' )
-		.trigger( notrigger ? '' : 'search' ).end()
+		// add regex, so we filter exact numbers
+		.val( $.isArray(v) && v.length && v.join('') !== '' ? '/(' + matchPrefix + (v || []).join(matchSuffix + '|' + matchPrefix) + matchSuffix + ')/' : '' )
+		.trigger('search').end()
 		.find('.select2').select2('val', v);
 		// update sticky header cell
 		if ($shcell.length) {
@@ -94,11 +97,11 @@ ts.filterFormatter.select2 = function($cell, indx, select2Def) {
 
 	// update select2 from filter hidden input, in case of saved filters
 	c.$table.bind('filterFomatterUpdate', function(){
-		// value = '/(x$|y$)/' => 'x,y'
+		// value = '/(^x$|^y$)/' => 'x,y'
 		var val = c.$table.data('lastSearch')[indx] || '';
-		val = val.replace(/[/()$]/g, '').split('|');
+		val = val.replace(/[/()$^]/g, '').split('|');
 		$cell.find('.select2').select2('val', val);
-		updateSelect2(val, true);
+		updateSelect2();
 	});
 
 	// has sticky headers?

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.16+ widgets - updated 4/27/2014 (v2.16.2)
+/*! tableSorter 2.16+ widgets - updated 4/30/2014 (v2.16.3)
  *
  * Column Styles
  * Column Filters
@@ -817,7 +817,7 @@ ts.filter = {
 	},
 	hideFilters: function(table, c) {
 		var $filterRow, $filterRow2, timer;
-		c.$table
+		$(table)
 			.find('.' + ts.css.filterRow)
 			.addClass('hideme')
 			.bind('mouseenter mouseleave', function(e) {
@@ -846,7 +846,7 @@ ts.filter = {
 				var event = e;
 				timer = setTimeout(function() {
 					// don't hide row if any filter has a value
-					if (ts.getFilters(table).join('') === '') {
+					if (ts.getFilters(c.$table).join('') === '') {
 						$filterRow2[ event.type === 'focus' ? 'removeClass' : 'addClass']('hideme');
 					}
 				}, 200);
@@ -854,7 +854,7 @@ ts.filter = {
 	},
 	findRows: function(table, filters, combinedFilters) {
 		if (table.config.lastCombinedFilter === combinedFilters) { return; }
-		var cached, len, $rows, cacheIndex, rowIndex, tbodyIndex, $tbody, $cells, columnIndex,
+		var cached, len, $rows, rowIndex, tbodyIndex, $tbody, $cells, columnIndex,
 			childRow, childRowText, exact, iExact, iFilter, lastSearch, matches, result,
 			notFiltered, searchFiltered, filterMatched, showRow, time,
 			anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache,
@@ -866,9 +866,10 @@ ts.filter = {
 			anyMatchNotAllowedTypes = [ 'range', 'notMatch',  'operators' ],
 			// parse columns after formatter, in case the class is added at that point
 			parsed = c.$headers.map(function(columnIndex) {
-				return c.parsers && c.parsers[columnIndex] && c.parsers[columnIndex].parsed || ( ts.getData ?
-					ts.getData(c.$headers.filter('[data-column="' + columnIndex + '"]:last'), c.headers[columnIndex], 'filter') === 'parsed' :
-					$(this).hasClass('filter-parsed') );
+				return c.parsers && c.parsers[columnIndex] && c.parsers[columnIndex].parsed ||
+					// getData won't return "parsed" if other "filter-" class names exist (e.g. <th class="filter-select filter-parsed">)
+					ts.getData && ts.getData(c.$headers.filter('[data-column="' + columnIndex + '"]:last'), c.headers[columnIndex], 'filter') === 'parsed' ||
+					$(this).hasClass('filter-parsed');
 			}).get();
 		if (c.debug) { time = new Date(); }
 		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
@@ -913,7 +914,6 @@ ts.filter = {
 					iAnyMatch = anyMatch.toLowerCase();
 				}
 				// loop through the rows
-				cacheIndex = 0;
 				for (rowIndex = 0; rowIndex < len; rowIndex++) {
 					childRow = $rows[rowIndex].className;
 					// skip child rows & already filtered rows
@@ -932,7 +932,7 @@ ts.filter = {
 						rowArray = $cells.map(function(i){
 							var txt;
 							if (parsed[i]) {
-								txt = c.cache[tbodyIndex].normalized[cacheIndex][i];
+								txt = c.cache[tbodyIndex].normalized[rowIndex][i];
 							} else {
 								txt = wo.filter_ignoreCase ? $(this).text().toLowerCase() : $(this).text();
 								if (c.sortLocaleCompare) {
@@ -943,7 +943,7 @@ ts.filter = {
 						}).get();
 						rowText = rowArray.join(' ');
 						iRowText = rowText.toLowerCase();
-						rowCache = c.cache[tbodyIndex].normalized[cacheIndex].slice(0,-1).join(' ');
+						rowCache = c.cache[tbodyIndex].normalized[rowIndex].slice(0,-1).join(' ');
 						filterMatched = null;
 						$.each(ts.filter.types, function(type, typeFunction) {
 							if ($.inArray(type, anyMatchNotAllowedTypes) < 0) {
@@ -964,7 +964,7 @@ ts.filter = {
 					for (columnIndex = 0; columnIndex < columns; columnIndex++) {
 						// ignore if filter is empty or disabled
 						if (filters[columnIndex]) {
-							cached = c.cache[tbodyIndex].normalized[cacheIndex][columnIndex];
+							cached = c.cache[tbodyIndex].normalized[rowIndex][columnIndex];
 							// check if column data should be from the cell or from parsed data
 							if (wo.filter_useParsedData || parsed[columnIndex]) {
 								exact = cached;
@@ -1020,7 +1020,6 @@ ts.filter = {
 					if (childRow.length) {
 						childRow.toggleClass(wo.filter_filteredRow, !showRow);
 					}
-					cacheIndex++;
 				}
 			}
 			ts.processTbody(table, $tbody, false);
@@ -1040,8 +1039,10 @@ ts.filter = {
 		}, 0);
 	},
 	getOptionSource: function(table, column, onlyAvail) {
-		var c = table.config,
+		var cts,
+			c = table.config,
 			wo = c.widgetOptions,
+			parsed = [],
 			arry = false,
 			source = wo.filter_selectSource;
 
@@ -1064,7 +1065,43 @@ ts.filter = {
 		arry = $.grep(arry, function(value, indx) {
 			return $.inArray(value, arry) === indx;
 		});
-		return (ts.sortNatural) ? arry.sort(function(a, b) { return ts.sortNatural(a, b); }) : arry.sort(true);
+
+		if (c.$headers.filter('[data-column="' + column + '"]:last').hasClass('filter-select-nosort')) {
+			// unsorted select options
+			return arry;
+		} else {
+			// parse select option values
+			$.each(arry, function(i, v){
+				// parse array data using set column parser; this DOES NOT pass the original
+				// table cell to the parser format function
+				parsed.push({ t : v, p : c.parsers && c.parsers[column].format( v, table, [], column ) || v });
+			});
+
+			// sort parsed select options
+			cts = c.textSorter || '';
+			parsed.sort(function(a, b){
+				// sortNatural breaks if you don't pass it strings
+				var x = a.p.toString(), y = b.p.toString();
+				if ($.isFunction(cts)) {
+					// custom OVERALL text sorter
+					return cts(x, y, true, column, table);
+				} else if (typeof(cts) === 'object' && cts.hasOwnProperty(column)) {
+					// custom text sorter for a SPECIFIC COLUMN
+					return cts[column](x, y, true, column, table);
+				} else if (ts.sortNatural) {
+					// fall back to natural sort
+					return ts.sortNatural(x, y);
+				}
+				// using an older version! do a basic sort
+				return true;
+			});
+			// rebuild arry from sorted parsed data
+			arry = [];
+			$.each(parsed, function(i, v){
+				arry.push(v.t);
+			});
+			return arry;
+		}
 	},
 	getOptions: function(table, column, onlyAvail) {
 		var rowIndex, tbodyIndex, len, row, cache, cell,
@@ -1282,10 +1319,7 @@ ts.addWidget({
 						// some wibbly-wobbly... timey-wimey... stuff, to make columns line up in Firefox
 						offset = nonwkie && $(this).attr('data-column') === ( '' + parseInt(c.columns/2, 10) ) ? 1 : 0;
 					$(this)
-						.css({
-							width: $cell.width() - spacing,
-							height: $cell.height()
-						})
+						.css({ width: $cell.width() - spacing })
 						.find(innerHeader).width( $cell.find(innerHeader).width() - offset );
 				});
 			};
@@ -1364,6 +1398,10 @@ ts.addWidget({
 				}
 			});
 			ts.filter.bindSearch( $table, $stickyCells.find('.' + ts.css.filter) );
+			// support hideFilters
+			if (wo.filter_hideFilters) {
+				ts.filter.hideFilters($stickyTable, c);
+			}
 		}
 
 		$table.trigger('stickyHeadersInit');
@@ -1477,7 +1515,7 @@ ts.addWidget({
 		})
 		.find('.' + ts.css.resizer + ',.' + ts.css.grip)
 		.bind('mousedown', function(event) {
-			// save header cell and mouse position; closest() not supported by jQuery v1.2.6
+			// save header cell and mouse position
 			$target = $(event.target).closest('th');
 			var $header = c.$headers.filter('[data-column="' + $target.attr('data-column') + '"]');
 			if ($header.length > 1) { $target = $target.add($header); }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties