jquery-tablesorter 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 352f918783831cc401eb8b3c9a8ed8d0b1dbf1aa
-  data.tar.gz: 8d49de1c504051729de9cb5a9434542c479a9f0c
+  metadata.gz: c94cde7d33b48778ade7b2c35ba5b58d74a53e04
+  data.tar.gz: 79075db7962f26823765fdb5b16f0dd9865381d7
 SHA512:
-  metadata.gz: 4e11a4e7722b7eb97301d93caa25eefcade3a83750f68cb0a9608947e0d728537db07e408af70ec553269994569b6b66819467fec67aa0e96da1d5ef27cb32de
-  data.tar.gz: 9e1d3646f6ce66a39135020b2a94359018c96f824834046fb21e302879b336d98a7b50e18252fa52f518824db5a184969cf981232a273cfc14adbf6725deb125
+  metadata.gz: 60e78ca094a503b9b4421f064372d0022fecf6848e432387d2f6b32f971aff3a240977ab4501c92dd3f9a57668cc53ebf8ba6682225e4663171412ddf897eacc
+  data.tar.gz: f84fd99b9a51abc82064926a0113fb356abbaa834477fb98d30119c887d60b6cbd4be14cac139875246ef38c89965c5965830afaee7202a06d52f1de99ab420e

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.18.0 (10/26/2014), [documentation]
+Current tablesorter version: 2.18.1 (11/3/2014), [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.13.0'
+  VERSION = '1.13.1'
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 10/26/2014 (v2.18.0)
+ * updated 11/3/2014 (v2.18.1)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -150,7 +150,7 @@
 		},
 
 		updatePageDisplay = function(table, p, completed) {
-			if ( !p.initialized ) { return; }
+			if ( p.initializing ) { return; }
 			var s, t, $out,
 				c = table.config,
 				sz = p.size || 10; // don't allow dividing by zero
@@ -328,7 +328,7 @@
 						} else {
 							rows[i].style.display = ( j >= s && j < e ) ? '' : 'none';
 							// don't count child rows
-							j += rows[i].className.match(c.cssChildRow + '|' + c.selectorRemove.replace(/^(\w+\.)/g,'')) && !p.countChildRows ? 0 : 1;
+							j += rows[i].className.match(c.cssChildRow + '|' + c.selectorRemove.slice(1)) && !p.countChildRows ? 0 : 1;
 							if ( j === e && rows[i].style.display !== 'none' && rows[i].className.match(ts.css.cssHasChild) ) {
 								lastIndex = i;
 							}
@@ -477,9 +477,11 @@
 			}
 			if (!p.initialized) {
 				p.initialized = true;
+				p.initializing = false;
 				$(table)
 					.trigger('applyWidgets')
 					.trigger('pagerInitialized', p);
+				updatePageDisplay(table, p);
 			}
 		},
 
@@ -499,6 +501,7 @@
 
 				counter = ++p.ajaxCounter;
 
+				p.last.ajaxUrl = url; // remember processed url
 				p.ajaxObject.url = url; // from the ajaxUrl option and modified by customAjaxUrl
 				p.ajaxObject.success = function(data, status, jqxhr) {
 					// Refuse to process old ajax commands that were overwritten by new ones - see #443
@@ -602,7 +605,7 @@
 				}
 				ts.processTbody(table, $tb, false);
 			}
-			updatePageDisplay(table, p, true);
+			updatePageDisplay(table, p);
 			if (table.isUpdating) {
 				$t.trigger('updateComplete', [ table, true ]);
 			}
@@ -659,10 +662,13 @@
 			if ( pageMoved !== false && p.initialized && $.isEmptyObject(c.cache)) {
 				return updateCache(table);
 			}
+			// abort page move if the table has filters and has not been initialized
+			if (p.ajax && ts.hasWidget(table, 'filter') && !c.widgetOptions.filter_initialized) { return; }
 			calcFilters(table, p);
 			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;
@@ -746,7 +752,7 @@
 			table.config.appender = null; // remove pager appender function
 			p.initialized = false;
 			delete table.config.rowsCopy;
-			$(table).unbind('destroy.pager sortEnd.pager filterEnd.pager enable.pager disable.pager');
+			$(table).unbind('filterInit filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '));
 			if (ts.storage) {
 				ts.storage(table, p.storageKey, '');
 			}
@@ -812,12 +818,7 @@
 				}
 				p.oldAjaxSuccess = p.oldAjaxSuccess || p.ajaxObject.success;
 				c.appender = $this.appender;
-				if (ts.filter && $.inArray('filter', c.widgets) >= 0) {
-					// get any default filter settings (data-value attribute) fixes #388
-					p.currentFilters = c.$table.data('lastSearch') || ts.filter.setDefaults(table, c, c.widgetOptions) || [];
-					// set, but don't apply current filters
-					ts.setFilters(table, p.currentFilters, false);
-				}
+				p.initializing = true;
 				if (p.savePages && ts.storage) {
 					t = ts.storage(table, p.storageKey) || {}; // fixes #387
 					p.page = isNaN(t.page) ? p.page : t.page;
@@ -826,20 +827,21 @@
 				}
 
 				// skipped rows
-				p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.replace(/^(\w+\.)/g,'') + '|' + c.cssChildRow + ')');
+				p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.slice(1) + '|' + c.cssChildRow + ')');
 
 				$t
-					.unbind('filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '))
-					.bind('filterStart.pager', function(e, filters) {
-						p.currentFilters = filters;
-						// don't change page is filters are the same (pager updating, etc)
-						if (p.pageReset !== false && (c.lastCombinedFilter || '') !== (filters || []).join('')) {
+					.unbind('filterInit filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '))
+					.bind('filterInit.pager filterStart.pager', function() {
+						p.currentFilters = c.$table.data('lastSearch');
+						// don't change page if filters are the same (pager updating, etc)
+						if (p.pageReset !== false && (c.lastCombinedFilter || '') !== (p.currentFilters || []).join('')) {
 							p.page = p.pageReset; // fixes #456 & #565
 						}
 					})
 					// update pager after filter widget completes
 					.bind('filterEnd.pager sortEnd.pager', function() {
-						if (p.initialized) {
+						p.currentFilters = c.$table.data('lastSearch');
+						if (p.initialized || p.initializing) {
 							if (c.delayInit && c.rowsCopy && c.rowsCopy.length === 0) {
 								// make sure we have a copy of all table rows once the cache has been built
 								updateCache(table);
@@ -946,7 +948,6 @@
 				$t.trigger('pagerBeforeInitialized', p);
 
 				enablePager(table, p, false);
-
 				if ( typeof(p.ajaxUrl) === 'string' ) {
 					// ajax pager; interact with database
 					p.ajax = true;
@@ -962,10 +963,14 @@
 				}
 
 				// pager initialized
-				if (!p.ajax) {
+				if (!p.ajax && !p.initialized) {
+					p.initializing = false;
 					p.initialized = true;
-					updatePageDisplay(table, p, true);
+					moveToPage(table, p);
 					$(table).trigger('pagerInitialized', p);
+					if ( !( c.widgetOptions.filter_initialized && ts.hasWidget(table, 'filter') ) ) {
+						updatePageDisplay(table, c, false);
+					}
 				}
 			});
 		};
@@ -988,7 +993,7 @@
 						})
 						// add error row to thead instead of tbody, or clicking on the header will result in a parser error
 						.appendTo( c.$table.find('thead:first') )
-						.addClass( errorRow + ' ' + c.selectorRemove.replace(/^(\w+\.)/g,'') )
+						.addClass( errorRow + ' ' + c.selectorRemove.slice(1) )
 						.attr({
 							role : 'alert',
 							'aria-live' : 'assertive'

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.18.0 - Client-side table sorting with ease!
+* TableSorter 2.18.1 - 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.18.0";
+			ts.version = "2.18.1";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -92,6 +92,7 @@
 				cssChildRow      : 'tablesorter-childRow', // class name indiciating that a row is to be attached to the its parent 
 				cssIcon          : 'tablesorter-icon',     //  if this class exists, a <i> will be added to the header automatically
 				cssInfoBlock     : 'tablesorter-infoOnly', // don't sort tbody with this class name (only one class name allowed here!)
+				cssAllowClicks   : 'tablesorter-allowClicks', // class name added to table header which allows clicks to bubble up
 
 				// *** selectors
 				selectorHeaders  : '> thead th, > thead td',
@@ -1159,13 +1160,11 @@
 				}
 				for (k in obj) {
 					if (typeof k === 'string') {
-						if (getCell) {
-							// get header cell
-							$h = c.$headers.eq(indx).filter(k);
-						} else {
-							// get column indexed cell
-							$h = c.$headers.filter('[data-column="' + indx + '"]:last').filter(k);
-						}
+						$h = c.$headers.filter('[data-column="' + indx + '"]:last')
+							// header cell with class/id
+							.filter(k)
+							// find elements within the header cell with cell/id
+							.add( c.$headers.filter('[data-column="' + indx + '"]:last').find(k) );
 						if ($h.length) {
 							return obj[k];
 						}
@@ -1286,7 +1285,9 @@
 					// set timer on mousedown
 					if (type === 'mousedown') {
 						downTime = new Date().getTime();
-						return /(input|select|button|textarea)/i.test(e.target.tagName) ? '' : !c.cancelSelection;
+						return /(input|select|button|textarea)/i.test(e.target.tagName) ||
+							// allow clicks to contents of selected cells
+							$(e.target).closest('td,th').hasClass(c.cssAllowClicks) ? '' : !c.cancelSelection;
 					}
 					if (c.delayInit && isEmptyObject(c.cache)) { buildCache(table); }
 					// jQuery v1.2.6 doesn't have closest()

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.16+ widgets - updated 10/26/2014 (v2.18.0)
+/*! tableSorter 2.16+ widgets - updated 11/3/2014 (v2.18.1)
  *
  * Column Styles
  * Column Filters
@@ -206,8 +206,9 @@ ts.addWidget({
 				.children('tfoot');
 			if ($tfoot.length) {
 				$tfoot
-					.children('tr').removeClass(oldtheme.footerRow).addClass(themes.footerRow)
-					.children('th, td').removeClass(oldtheme.footerCells).addClass(themes.footerCells);
+					// if oldtheme.footerRow or oldtheme.footerCells are undefined, all class names are removed
+					.children('tr').removeClass(oldtheme.footerRow || '').addClass(themes.footerRow)
+					.children('th, td').removeClass(oldtheme.footerCells || '').addClass(themes.footerCells);
 			}
 			// update header classes
 			$headers
@@ -595,7 +596,6 @@ ts.filter = {
 		wo.filter_initTimer = null;
 		wo.filter_formatterCount = 0;
 		wo.filter_formatterInit = [];
-		wo.filter_initializing = true;
 		wo.filter_anyColumnSelector = '[data-column="all"],[data-column="any"]';
 		wo.filter_multipleColumnSelector = '[data-column*="-"],[data-column*=","]';
 
@@ -722,7 +722,7 @@ ts.filter = {
 		c.filteredRows = c.totalRows;
 
 		// add default values
-		c.$table.bind('tablesorter-initialized pagerInitialized', function() {
+		c.$table.bind('tablesorter-initialized pagerBeforeInitialized', function() {
 			// redefine "wo" as it does not update properly inside this callback
 			var wo = this.config.widgetOptions;
 			filters = ts.filter.setDefaults(table, c, wo) || [];
@@ -762,11 +762,9 @@ ts.filter = {
 		var wo = c.widgetOptions,
 			count = 0,
 			completed = function(){
-				// set initializing false first so findRows will process
-				wo.filter_initializing = false;
-				ts.filter.findRows(c.table, c.$table.data('lastSearch'), null);
 				wo.filter_initialized = true;
 				c.$table.trigger('filterInit', c);
+				ts.filter.findRows(c.table, c.$table.data('lastSearch'), null);
 			};
 		$.each( wo.filter_formatterInit, function(i, val) {
 			if (val === 1) {
@@ -1095,7 +1093,7 @@ ts.filter = {
 		return columns;
 	},
 	findRows: function(table, filters, combinedFilters) {
-		if (table.config.lastCombinedFilter === combinedFilters || table.config.widgetOptions.filter_initializing) { return; }
+		if (table.config.lastCombinedFilter === combinedFilters || !table.config.widgetOptions.filter_initialized) { return; }
 		var len, $rows, rowIndex, tbodyIndex, $tbody, $cells, $cell, columnIndex,
 			childRow, lastSearch, hasSelect, matches, result, showRow, time, val, indx,
 			notFiltered, searchFiltered, filterMatched, excludeMatch, fxn, ffxn,
@@ -1527,7 +1525,7 @@ ts.filter = {
 };
 
 ts.getFilters = function(table, getRaw, setFilters, skipFirst) {
-	var i, f, $filters, $column, cols,
+	var i, $filters, $column, cols,
 		filters = false,
 		c = table ? $(table)[0].config : '',
 		wo = c ? c.widgetOptions : '';

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

@@ -1,4 +1,4 @@
-/* Column Selector/Responsive table widget (beta) for TableSorter - 10/26/2014 (v2.18.0)
+/* Column Selector/Responsive table widget (beta) for TableSorter - 11/3/2014 (v2.18.1)
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Justin Hallett & Rob Garrison
  */
@@ -120,7 +120,6 @@ tsColSel = ts.columnSelector = {
 		if (wo.columnSelector_mediaquery) {
 			// used by window resize function
 			colSel.lastIndex = -1;
-			wo.columnSelector_breakpoints.sort();
 			tsColSel.updateBreakpoints(c, wo);
 			c.$table
 				.off('updateAll' + namespace)

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

@@ -1,4 +1,4 @@
-/*! tablesorter CSS Sticky Headers widget - updated 10/26/2014 (v2.18.0)
+/*! tablesorter CSS Sticky Headers widget - updated 11/3/2014 (v2.18.1)
 * Requires a modern browser, tablesorter v2.8+
 */
 /*jshint jquery:true, unused:false */
@@ -19,6 +19,7 @@
 		},
 		init : function(table, thisWidget, c, wo) {
 			var isIE = 'ActiveXObject' in window, // target all versions of IE
+				isFF = navigator.userAgent.toLowerCase().indexOf('firefox') > -1,
 				$table = c.$table,
 				$attach = $(wo.cssStickyHeaders_attachTo),
 				namespace = c.namespace + 'cssstickyheader ',
@@ -26,45 +27,66 @@
 				$caption = $table.children('caption'),
 				$win = $attach.length ? $attach : $(window),
 				$parent = $table.parent().closest('table.' + ts.css.table),
-				$parentThead = $parent.length && ts.hasWidget($parent[0], 'cssStickyHeaders') ? $parent.children('thead') : [];
+				$parentThead = $parent.length && ts.hasWidget($parent[0], 'cssStickyHeaders') ? $parent.children('thead') : [],
+				lastCaptionSetting = wo.cssStickyHeaders_addCaption;
 
 			$win
 			.unbind('scroll resize '.split(' ').join(namespace))
 			.bind('scroll resize '.split(' ').join(namespace), function() {
+				// make sure "wo" is current otherwise changes to widgetOptions
+				// are not dynamic (like the add caption button in the demo)
+				wo = c.widgetOptions;
 				var top = $attach.length ? $attach.offset().top : $win.scrollTop(),
 				// add caption height; include table padding top & border-spacing or text may be above the fold (jQuery UI themes)
 				// border-spacing needed in Firefox, but not webkit... not sure if I should account for that
-				captionHeight = wo.cssStickyHeaders_addCaption ? ( $caption.outerHeight(true) || 0 ) +
-					( parseInt( $table.css('padding-top'), 10 ) || 0 ) + ( parseInt( $table.css('border-spacing'), 10 ) || 0 ) : 0,
+				captionHeight = ( $caption.outerHeight(true) || 0 ) +
+					( parseInt( $table.css('padding-top'), 10 ) || 0 ) +
+					( parseInt( $table.css('border-spacing'), 10 ) || 0 ),
+
+				bottom = $table.height() - $thead.height() - ( $table.children('tfoot').height() || 0 ) - ( wo.cssStickyHeaders_addCaption ? captionHeight : 0 ),
+
+				parentTheadHeight = $parentThead.length ? $parentThead.height() : 0,
 
-				bottom = $table.height() - $thead.height() - ( $table.children('tfoot').height() || 0 ) - captionHeight,
 				// get bottom of nested sticky headers
-				nestedStickyTop = $parentThead.length ? ( isIE ? $parent.data('cssStickyHeaderTop') : $parentThead.offset().top ) +
-					$parentThead.height() - $win.scrollTop() : 0,
+				nestedStickyBottom = $parentThead.length ? (
+						isIE ? $parent.data('cssStickyHeaderBottom') + parentTheadHeight :
+						$parentThead.offset().top + parentTheadHeight - $win.scrollTop()
+					) : 0,
 
 				// Detect nested tables - fixes #724
-				deltaY = top - $table.offset().top + nestedStickyTop + ( parseInt( $table.css('border-top-width'), 10 ) || 0 ) +
+				deltaY = top - $table.offset().top + nestedStickyBottom +
+					( parseInt( $table.css('border-top-width'), 10 ) || 0 ) +
+					( wo.cssStickyHeaders_offset || 0 ) +
 					// Again, I dislike browser sniffing... but I have no idea why I need to include a captionHeight
 					// for Firefox here and not for Chrome. Even IE behaves, sorta!
-					( wo.cssStickyHeaders_offset || 0 ) + ( navigator.userAgent.toLowerCase().indexOf('firefox') > -1 ? captionHeight : 0 ),
+					( wo.cssStickyHeaders_addCaption ? ( isFF ? captionHeight : 0 ) : -captionHeight ),
 
 				finalY = deltaY > 0 && deltaY <= bottom ? deltaY : 0,
 
 				// All IE (even IE11) can only transform header cells - fixes #447 thanks to @gakreol!
 				$cells = isIE ? $thead.children().children() : $thead;
 
-				// more crazy IE stuff.. somehow the second nested table is completely ignored
+				// more crazy IE stuff...
 				if (isIE) {
-					c.$table.data('cssStickyHeaderTop', finalY - ( $parentThead.length ? $parentThead.height() : 0 ));
-					if ($parentThead.length) {
-						top = $parent.data('cssStickyHeaderTop') - $parentThead.height();
-						finalY = top > 0 && top <= bottom ? top : 0;
-					}
+					// I didn't bother testing 3 nested tables deep in IE, because I hate it
+					c.$table.data( 'cssStickyHeaderBottom', ( $parentThead.length ? parentTheadHeight : 0 ) -
+						( wo.cssStickyHeaders_addCaption ? captionHeight : 0 ) );
 				}
 
 				if (wo.cssStickyHeaders_addCaption) {
 					$cells = $cells.add($caption);
 				}
+				if (lastCaptionSetting !== wo.cssStickyHeaders_addCaption) {
+					lastCaptionSetting = wo.cssStickyHeaders_addCaption;
+					// reset caption position if addCaption option is dynamically changed to false
+					if (!lastCaptionSetting) {
+						$caption.css({
+							'transform' : '',
+							'-ms-transform' : '',
+							'-webkit-transform' : ''
+						});
+					}
+				}
 
 				$cells.css({
 					'transform' : finalY === 0 ? '' : 'translate(0px,' + finalY + 'px)',

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

@@ -1,4 +1,4 @@
-/* Pager widget for TableSorter 10/26/2014 (v2.18.0) - requires jQuery 1.7+ */
+/* Pager widget for TableSorter 11/3/2014 (v2.18.1) - requires jQuery 1.7+ */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($){
 "use strict";
@@ -159,12 +159,7 @@ tsp = ts.pager = {
 		p.totalRows = c.$tbodies.eq(0).children('tr').not( wo.pager_countChildRows ? '' : '.' + c.cssChildRow ).length;
 		p.oldAjaxSuccess = p.oldAjaxSuccess || wo.pager_ajaxObject.success;
 		c.appender = tsp.appender;
-		if (ts.filter && $.inArray('filter', c.widgets) >= 0) {
-			// get any default filter settings (data-value attribute) fixes #388
-			p.currentFilters = c.$table.data('lastSearch') || [];
-			// set, but don't apply current filters
-			ts.setFilters(table, p.currentFilters, false);
-		}
+		p.initializing = true;
 		if (wo.pager_savePages && ts.storage) {
 			t = ts.storage(table, wo.pager_storageKey) || {}; // fixes #387
 			p.page = isNaN(t.page) ? p.page : t.page;
@@ -173,7 +168,7 @@ tsp = ts.pager = {
 		}
 
 		// skipped rows
-		p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.replace(/^(\w+\.)/g,'') + '|' + c.cssChildRow + ')');
+		p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.slice(1) + '|' + c.cssChildRow + ')');
 
 		// clear initialized flag
 		p.initialized = false;
@@ -209,9 +204,13 @@ tsp = ts.pager = {
 
 		// pager initialized
 		p.initialized = true;
+		p.initializing = false;
 		p.isInitializing = false;
 		c.$table.trigger('pagerInitialized', c);
-		tsp.updatePageDisplay(table, 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') ) ) {
+			tsp.updatePageDisplay(table, c, false);
+		}
 	},
 
 	bindEvents: function(table, c){
@@ -221,23 +220,23 @@ tsp = ts.pager = {
 			s = wo.pager_selectors;
 
 		c.$table
-			.off('filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '))
-			.on('filterStart.pager', function(e, filters) {
-				p.currentFilters = filters;
-				// don't change page is filters are the same (pager updating, etc)
-				if (wo.pager_pageReset !== false && (c.lastCombinedFilter || '') !== (filters || []).join('')) {
+			.off('filterInit filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '))
+			.on('filterInit.pager filterStart.pager', function() {
+				p.currentFilters = c.$table.data('lastSearch');
+				// don't change page if filters are the same (pager updating, etc)
+				if (wo.pager_pageReset !== false && (c.lastCombinedFilter || '') !== (p.currentFilters || []).join('')) {
 					p.page = wo.pager_pageReset; // fixes #456 & #565
 				}
 			})
 			// update pager after filter widget completes
 			.on('filterEnd.pager sortEnd.pager', function() {
-				if (p.initialized) {
+				p.currentFilters = c.$table.data('lastSearch');
+				if (p.initialized || p.initializing) {
 					if (c.delayInit && c.rowsCopy && c.rowsCopy.length === 0) {
 						// make sure we have a copy of all table rows once the cache has been built
 						tsp.updateCache(table);
 					}
 					// tsp.moveToPage(table, p, false); <-- called when applyWidgets is triggered
-					c.pager.last.page = -1;
 					c.$table.trigger('applyWidgets');
 					tsp.updatePageDisplay(table, c, false);
 				}
@@ -372,6 +371,7 @@ tsp = ts.pager = {
 	},
 
 	updatePageDisplay: function(table, c, completed) {
+		if ( c.pager.initializing ) { return; }
 		var s, t, $out,
 			wo = c.widgetOptions,
 			p = c.pager,
@@ -554,7 +554,7 @@ tsp = ts.pager = {
 					} else {
 						rows[i].style.display = ( j >= s && j < e ) ? '' : 'none';
 						// don't count child rows
-						j += rows[i].className.match(c.cssChildRow + '|' + c.selectorRemove.replace(/^(\w+\.)/g,'')) && !wo.pager_countChildRows ? 0 : 1;
+						j += rows[i].className.match(c.cssChildRow + '|' + c.selectorRemove.slice(1)) && !wo.pager_countChildRows ? 0 : 1;
 						if ( j === e && rows[i].style.display !== 'none' && rows[i].className.match(ts.css.cssHasChild) ) {
 							lastIndex = i;
 						}
@@ -682,6 +682,7 @@ tsp = ts.pager = {
 			p.last.totalRows = p.totalRows;
 			p.last.currentFilters = p.currentFilters;
 			p.last.sortList = (c.sortList || []).join(',');
+			p.initializing = false;
 			tsp.updatePageDisplay(table, c);
 			$t.trigger('updateCache', [function(){
 				if (p.initialized) {
@@ -714,6 +715,7 @@ tsp = ts.pager = {
 				$doc.off('ajaxError.pager');
 			});
 			counter = ++p.ajaxCounter;
+			p.last.ajaxUrl = url; // remember processed url
 			p.ajaxObject.url = url; // from the ajaxUrl option and modified by customAjaxUrl
 			p.ajaxObject.success = function(data, status, jqxhr) {
 				// Refuse to process old ajax commands that were overwritten by new ones - see #443
@@ -887,10 +889,15 @@ tsp = ts.pager = {
 		var pg, c = table.config,
 			wo = c.widgetOptions,
 			l = p.last;
+
+		// abort page move if the table has filters and has not been initialized
+		if (p.ajax && !wo.filter_initialized && ts.hasWidget(table, 'filter')) { return; }
+
 		tsp.calcFilters(table, c);
 		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 current filter is [] and the other is ['','',''],
 		// making the next if comparison think the filters as different. Fixes #202.
 		l.currentFilters = (l.currentFilters || []).join('') === '' ? [] : l.currentFilters;
@@ -978,7 +985,7 @@ tsp = ts.pager = {
 		c.appender = null; // remove pager appender function
 		p.initialized = false;
 		delete table.config.rowsCopy;
-		c.$table.off('destroy.pager sortEnd.pager filterEnd.pager enable.pager disable.pager');
+		c.$table.off('filterInit filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '));
 		if (ts.storage) {
 			ts.storage(table, c.widgetOptions.pager_storageKey, '');
 		}
@@ -1045,7 +1052,7 @@ ts.showError = function(table, message){
 					})
 					// add error row to thead instead of tbody, or clicking on the header will result in a parser error
 					.appendTo( c.$table.find('thead:first') )
-					.addClass( errorRow + ' ' + c.selectorRemove.replace(/^(\w+\.)/g,'') )
+					.addClass( errorRow + ' ' + c.selectorRemove.slice(1) )
 					.attr({
 						role : 'alert',
 						'aria-live' : 'assertive'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Simple integration of jquery-tablesorter (Mottie's fork) into the Rails asset