jquery-tablesorter 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8072fae98627808e5938c44867acc67f4da960
-  data.tar.gz: 0dcb8e09deb35384a953f5b410288544e0a3a0ff
+  metadata.gz: 549c6f6e362d81047b6a9082c4529dacaf1c5b71
+  data.tar.gz: 6e02e0c0162e732cb5a39ae23c88054ab408bec4
 SHA512:
-  metadata.gz: 76c00b6f9215ca57d8954e99a60cc3fb2fdb19c53129d8a70578c920bfb3ee8a01c378bc13b32ebacdea4fa837e61299081546bf19719e6c7cf999dac3647aa9
-  data.tar.gz: 4a5bdaf3fda234bc2dfe8b18fc88863750c8b6c500086ca62307fe02192bfdfe1e233057eb16fb4bdda898ab72ae3c6f9d2cf5714303881862f1ddf31267f4b5
+  metadata.gz: 57c564f0b5230be77f87fbe0850f51f61503da47636f55bf761b48649937e63ace422bc27570e14fe7dee8fedac93c9f0000754b993fd8dcb0da46720cec3b3a
+  data.tar.gz: 4fd4f5eb7fcc1b3799c3218160be416b6815da30e5c0436274854517bcebe952794892a4d580b0a4ac15f0f2ffab50ccde730bab03aab43a134c93bb2ded4ff1

data/README.markdown

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.14.2 (11/25/2013), [documentation]
+Current tablesorter version: 2.14.3 (12/2/2013), [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.9.2"
+  VERSION = "1.9.3"
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 11/22/2013 (v2.14.1)
+ * updated 12/2/2013 (v2.14.3)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -92,6 +92,7 @@
 			totalPages: 0,
 			filteredRows: 0,
 			filteredPages: 0,
+			ajaxCounter: 0,
 			currentFilters: [],
 			startRow: 0,
 			endRow: 0,
@@ -138,8 +139,12 @@
 					})
 					// {totalPages}, {extra}, {extra:0} (array) or {extra : key} (object)
 					.replace(/\{\w+(\s*:\s*\w+)?\}/gi, function(m){
-						var t = m.replace(/[{}\s]/g,''), a = t.split(':'), d = p.ajaxData;
-						return a.length > 1 && d && d[a[0]] ? d[a[0]][a[1]] : p[t] || (d ? d[t] : '') || '';
+						var str = m.replace(/[{}\s]/g,''),
+							extra = str.split(':'),
+							data = p.ajaxData,
+							// return zero for default page/row numbers
+							deflt = /(rows?|pages?)$/i.test(str) ? 0 : '';
+						return extra.length > 1 && data && data[extra[0]] ? data[extra[0]][extra[1]] : p[str] || (data ? data[str] : deflt) || deflt;
 					});
 				if (out.length) {
 					out[ (out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
@@ -278,8 +283,8 @@
 						for ( i = 0; i < l; i++ ) {
 							tds += '<tr>';
 							for ( j = 0; j < d[i].length; j++ ) {
-								// build tbody cells
-								tds += '<td>' + d[i][j] + '</td>';
+								// build tbody cells; watch for data containing HTML markup - see #434
+								tds += /^\s*<td/.test(d[i][j]) ? $.trim(d[i][j]) : '<td>' + d[i][j] + '</td>';
 							}
 							tds += '</tr>';
 						}
@@ -340,6 +345,7 @@
 		getAjax = function(table, p){
 			var url = getAjaxUrl(table, p),
 			$doc = $(document),
+			counter,
 			c = table.config;
 			if ( url !== '' ) {
 				if (c.showProcessing) {
@@ -349,8 +355,15 @@
 					renderAjax(null, table, p, xhr, exception);
 					$doc.unbind('ajaxError.pager');
 				});
+
+				counter = ++p.ajaxCounter;
+
 				p.ajaxObject.url = url; // from the ajaxUrl option and modified by customAjaxUrl
 				p.ajaxObject.success = function(data) {
+					// Refuse to process old ajax commands that were overwritten by new ones - see #443
+					if (counter < p.ajaxCounter){
+						return;
+					}
 					renderAjax(data, table, p);
 					$doc.unbind('ajaxError.pager');
 					if (typeof p.oldAjaxSuccess === 'function') {

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.14.2 - Client-side table sorting with ease!
+* TableSorter 2.14.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.14.2";
+			ts.version = "2.14.3";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -1284,11 +1284,11 @@
 							if (init || !(c.widgetInit[w.id])) {
 								if (w.hasOwnProperty('options')) {
 									wo = table.config.widgetOptions = $.extend( true, {}, w.options, wo );
-									c.widgetInit[w.id] = true;
 								}
 								if (w.hasOwnProperty('init')) {
 									w.init(table, w, c, wo);
 								}
+								c.widgetInit[w.id] = true;
 							}
 							if (!init && w.hasOwnProperty('format')) {
 								w.format(table, c, wo, false);
@@ -1311,7 +1311,8 @@
 				for (i = 0; i < l; i++){
 					if ( w[i] && w[i].id && (doAll || $.inArray( w[i].id, cw ) < 0) ) {
 						if (c.debug) { log( 'Refeshing widgets: Removing ' + w[i].id  ); }
-						if (w[i].hasOwnProperty('remove')) {
+						// only remove widgets that have been initialized - fixes #442
+						if (w[i].hasOwnProperty('remove') && c.widgetInit[w[i].id]) {
 							w[i].remove(table, c, c.widgetOptions);
 							c.widgetInit[w[i].id] = false;
 						}

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.8+ widgets - updated 11/24/2013 (v2.14.2)
+/*! tableSorter 2.8+ widgets - updated 12/2/2013 (v2.14.3)
  *
  * Column Styles
  * Column Filters
@@ -422,8 +422,8 @@ ts.filter = {
 		// Look for quotes or equals to get an exact match; ignore type since iExact could be numeric
 		exact: function( filter, iFilter, exact, iExact ) {
 			/*jshint eqeqeq:false */
-			if ( iFilter.replace(ts.filter.regex.exact, '') == iExact ) {
-				return true;
+			if (ts.filter.regex.exact.test(iFilter)) {
+				return iFilter.replace(ts.filter.regex.exact, '') == iExact;
 			}
 			return null;
 		},
@@ -479,7 +479,7 @@ ts.filter = {
 		// Look for a range (using " to " or " - ") - see issue #166; thanks matzhu!
 		range : function( filter, iFilter, exact, iExact, cached, index, table, wo, parsed ) {
 			if ( /\s+(-|to)\s+/.test(iFilter) ) {
-				var result,
+				var result, tmp,
 					c = table.config,
 					query = iFilter.split(/(?: - | to )/), // make sure the dash is for a range and not indicating a negative number
 					range1 = ts.formatFloat(query[0].replace(ts.filter.regex.nondigit, ''), table),
@@ -494,7 +494,7 @@ ts.filter = {
 				result = ( parsed[index] || c.parsers[index].type === 'numeric' ) && !isNaN(range1) && !isNaN(range2) ? cached :
 					isNaN(iExact) ? ts.formatFloat( iExact.replace(ts.filter.regex.nondigit, ''), table) :
 					ts.formatFloat( iExact, table );
-				if (range1 > range2) { result = range1; range1 = range2; range2 = result; } // swap
+				if (range1 > range2) { tmp = range1; range1 = range2; range2 = tmp; } // swap
 				return (result >= range1 && result <= range2) || (range1 === '' || range2 === '');
 			}
 			return null;
@@ -605,7 +605,7 @@ ts.filter = {
 		});
 
 		if (wo.filter_hideFilters) {
-			ts.filter.hideFilters(table, c, wo);
+			ts.filter.hideFilters(table, c);
 		}
 
 		// show processing icon
@@ -712,6 +712,7 @@ ts.filter = {
 		var external, wo = table.config.widgetOptions;
 		$el.unbind('keyup search filterReset')
 		.bind('keyup search', function(event, filter) {
+			var $this = $(this);
 			// emulate what webkit does.... escape clears the filter
 			if (event.which === 27) {
 				this.value = '';
@@ -722,7 +723,7 @@ ts.filter = {
 					return;
 			}
 			// external searches won't have a filter parameter, so grab the value
-			if ($(this).hasClass('tablesorter-filter')) {
+			if ($this.hasClass('tablesorter-filter') && !$this.hasClass('tablesorter-external-filter')) {
 				external = filter;
 			} else {
 				external = [];
@@ -766,7 +767,7 @@ ts.filter = {
 			return false;
 		}
 	},
-	hideFilters: function(table, c, wo) {
+	hideFilters: function(table, c) {
 		var $filterRow, $filterRow2, timer;
 		c.$table
 			.find('.tablesorter-filter-row')
@@ -824,7 +825,8 @@ ts.filter = {
 		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
 			if ($tbodies.eq(tbodyIndex).hasClass(ts.css.info)) { continue; } // ignore info blocks, issue #264
 			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true);
-			$rows = $tbody.children('tr').not('.' + c.cssChildRow).not('.group-header');
+			// skip child rows & widget added (removable) rows - fixes #448 thanks to @hempel!
+			$rows = $tbody.children('tr').not('.' + c.cssChildRow).not(c.selectorRemove);
 			len = $rows.length;
 			if (combinedFilters === '' || wo.filter_serversideFiltering) {
 				$tbody.children().show().removeClass(wo.filter_filteredRow);
@@ -1083,7 +1085,6 @@ ts.addWidget({
 			$stickyCells,
 			laststate = '',
 			spacing = 0,
-			updatingStickyFilters = false,
 			nonwkie = $table.css('border-collapse') !== 'collapse' && !/(webkit|msie)/i.test(navigator.userAgent),
 			resizeHeader = function() {
 				stickyOffset = $stickyOffset.length ? $stickyOffset.height() || 0 : parseInt(wo.stickyHeaders_offset, 10) || 0;
@@ -1193,24 +1194,20 @@ ts.addWidget({
 		}
 
 		// look for filter widget
-		$table.bind('filterEnd', function() {
-			if (updatingStickyFilters) { return; }
-			$stickyThead.find('.tablesorter-filter-row').children().each(function(indx) {
-				$(this).find(filterInputs).val( c.$filters.find(filterInputs).eq(indx).val() );
+		if ($table.hasClass('hasFilters')) {
+			$table.bind('filterEnd', function() {
+				// $(':focus') needs jQuery 1.6+
+				if ( $(document.activeElement).closest('thead')[0] !== $stickyThead[0] ) {
+					// don't update the stickyheader filter row if it already has focus
+					$stickyThead.find('.tablesorter-filter-row').children().each(function(indx) {
+						$(this).find(filterInputs).val( c.$filters.find(filterInputs).eq(indx).val() );
+					});
+				}
 			});
-		});
-		$stickyCells.find(filterInputs).bind('keyup search change', function(event) {
-			// ignore arrow and meta keys; allow backspace
-			if ((event.which < 32 && event.which !== 8) || (event.which >= 37 && event.which <=40)) { return; }
-			updatingStickyFilters = true;
-			var $f = $(this), column = $f.attr('data-column');
-			c.$filters.find(filterInputs).eq(column)
-				.val( $f.val() )
-				.trigger('search');
-			setTimeout(function() {
-				updatingStickyFilters = false;
-			}, wo.filter_searchDelay);
-		});
+
+			ts.filter.bindSearch( $table, $stickyCells.find('.tablesorter-filter').addClass('tablesorter-external-filter') );
+		}
+
 		$table.trigger('stickyHeadersInit');
 
 	},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties