jquery-tablesorter 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c94cde7d33b48778ade7b2c35ba5b58d74a53e04
-  data.tar.gz: 79075db7962f26823765fdb5b16f0dd9865381d7
+  metadata.gz: 4ca1be22fc4f48f78994645c994a19b4a81532eb
+  data.tar.gz: 4b116d3b7cca561fc5ba97c329be6312588836ca
 SHA512:
-  metadata.gz: 60e78ca094a503b9b4421f064372d0022fecf6848e432387d2f6b32f971aff3a240977ab4501c92dd3f9a57668cc53ebf8ba6682225e4663171412ddf897eacc
-  data.tar.gz: f84fd99b9a51abc82064926a0113fb356abbaa834477fb98d30119c887d60b6cbd4be14cac139875246ef38c89965c5965830afaee7202a06d52f1de99ab420e
+  metadata.gz: 53ed8c07aad40c2a6499f8fc6bd4469d23f80301f0e45e8f884b281036ca3afadc578cf6876107767b85c2bf684d27353b4d0eb3099d14df23555b64745e660c
+  data.tar.gz: 8dd105b6bd4e7d4a996872088b4b3d8549642fa2d570254dcb5d23a28ce39c2d55de46be65d97b497b86c09a61c2a88b3cea71119a0f1da14ee45afb7104e011

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.18.1 (11/3/2014), [documentation]
+Current tablesorter version: 2.18.2 (11/3/2014), [documentation]
 
 Any issue associated with the js/css files, please report to [Mottie's fork].
 
@@ -75,6 +75,7 @@ Avaliable theme names:
 * theme.grey
 * theme.ice
 * theme.jui
+* theme.metro-dark
 
 pager theme:
 

data/lib/jquery-tablesorter/version.rb

@@ -1,3 +1,3 @@
 module JqueryTablesorter
-  VERSION = '1.13.1'
+  VERSION = '1.13.2'
 end

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

@@ -1,6 +1,6 @@
 /*!
- * tablesorter pager plugin
- * updated 11/3/2014 (v2.18.1)
+ * tablesorter (FORK) pager plugin
+ * updated 11/3/2014 (v2.18.2)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -161,7 +161,7 @@
 			c.filteredRows = p.filteredRows;
 			p.filteredPages = Math.ceil( p.filteredRows / sz ) || 0;
 			if ( Math.min( p.totalPages, p.filteredPages ) >= 0 ) {
-				t = (p.size * p.page > p.filteredRows);
+				t = (p.size * p.page > p.filteredRows) && completed;
 				p.startRow = (t) ? 1 : (p.filteredRows === 0 ? 0 : p.size * p.page + 1);
 				p.page = (t) ? 0 : p.page;
 				p.endRow = Math.min( p.filteredRows, p.totalRows, p.size * ( p.page + 1 ) );
@@ -831,10 +831,10 @@
 
 				$t
 					.unbind('filterInit filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '))
-					.bind('filterInit.pager filterStart.pager', function() {
+					.bind('filterInit.pager filterStart.pager', function(e) {
 						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('')) {
+						if (e.type === 'filterStart' && p.pageReset !== false && (c.lastCombinedFilter || '') !== (p.currentFilters || []).join('')) {
 							p.page = p.pageReset; // fixes #456 & #565
 						}
 					})
@@ -969,7 +969,7 @@
 					moveToPage(table, p);
 					$(table).trigger('pagerInitialized', p);
 					if ( !( c.widgetOptions.filter_initialized && ts.hasWidget(table, 'filter') ) ) {
-						updatePageDisplay(table, c, false);
+						updatePageDisplay(table, p, false);
 					}
 				}
 			});

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.18.1 - Client-side table sorting with ease!
+* TableSorter (FORK) 2.18.2 - Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
@@ -9,7 +9,7 @@
 * http://www.gnu.org/licenses/gpl.html
 *
 * @type jQuery
-* @name tablesorter
+* @name tablesorter (FORK)
 * @cat Plugins/Tablesorter
 * @author Christian Bach/christian.bach@polyester.se
 * @contributor Rob Garrison/https://github.com/Mottie/tablesorter
@@ -24,7 +24,7 @@
 
 			var ts = this;
 
-			ts.version = "2.18.1";
+			ts.version = "2.18.2";
 
 			ts.parsers = [];
 			ts.widgets = [];

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

@@ -1,5 +1,5 @@
 /*! Filter widget select2 formatter function - updated 7/17/2014 (v2.17.5)
- * requires: jQuery 1.7.2+, tableSorter 2.16+, filter widget 2.16+ and select2 v3.4.6+ plugin
+ * requires: jQuery 1.7.2+, tableSorter (FORK) 2.16+, filter widget 2.16+ and select2 v3.4.6+ plugin
  */
 /*jshint browser:true, jquery:true, unused:false */
 /*global jQuery: false */

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

@@ -1,5 +1,5 @@
 /*! Filter widget formatter functions - updated 7/17/2014 (v2.17.5)
- * requires: tableSorter 2.15+ and jQuery 1.4.3+
+ * requires: tableSorter (FORK) 2.15+ and jQuery 1.4.3+
  *
  * uiSpinner (jQuery UI spinner)
  * uiSlider (jQuery UI slider)

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.16+ widgets - updated 11/3/2014 (v2.18.1)
+/*! tableSorter (FORK) 2.16+ widgets - updated 11/3/2014 (v2.18.2)
  *
  * Column Styles
  * Column Filters
@@ -657,7 +657,7 @@ ts.filter = {
 				$(document)
 				.undelegate(wo.filter_reset, 'click.tsfilter')
 				.delegate(wo.filter_reset, 'click.tsfilter', function() {
-					// trigger a reset event, so other functions (filterFormatter) know when to reset
+					// trigger a reset event, so other functions (filter_formatter) know when to reset
 					c.$table.trigger('filterReset');
 				});
 			}
@@ -764,23 +764,27 @@ ts.filter = {
 			completed = function(){
 				wo.filter_initialized = true;
 				c.$table.trigger('filterInit', c);
-				ts.filter.findRows(c.table, c.$table.data('lastSearch'), null);
+				ts.filter.findRows(c.table, c.$table.data('lastSearch') || []);
 			};
-		$.each( wo.filter_formatterInit, function(i, val) {
-			if (val === 1) {
-				count++;
-			}
-		});
-		clearTimeout(wo.filter_initTimer);
-		if (!wo.filter_initialized && count === wo.filter_formatterCount) {
-			// filter widget initialized
+		if ( $.isEmptyObject( wo.filter_formatter ) ) {
 			completed();
-		} else if (!wo.filter_initialized) {
-			// fall back in case a filter_formatter doesn't call
-			// $.tablesorter.filter.formatterUpdated($cell, column), and the count is off
-			wo.filter_initTimer = setTimeout(function(){
+		} else {
+			$.each( wo.filter_formatterInit, function(i, val) {
+				if (val === 1) {
+					count++;
+				}
+			});
+			clearTimeout(wo.filter_initTimer);
+			if (!wo.filter_initialized && count === wo.filter_formatterCount) {
+				// filter widget initialized
 				completed();
-			}, 500);
+			} else if (!wo.filter_initialized) {
+				// fall back in case a filter_formatter doesn't call
+				// $.tablesorter.filter.formatterUpdated($cell, column), and the count is off
+				wo.filter_initTimer = setTimeout(function(){
+					completed();
+				}, 500);
+			}
 		}
 	},
 
@@ -1114,10 +1118,16 @@ ts.filter = {
 				$(this).hasClass('filter-parsed');
 		}).get();
 
-		if (c.debug) { time = new Date(); }
+		if (c.debug) {
+			ts.log('Starting filter widget search', filters);
+			time = new Date();
+		}
 		// filtered rows count
 		c.filteredRows = 0;
 		c.totalRows = 0;
+		// combindedFilters are undefined on init
+		combinedFilters = (filters || []).join('');
+
 		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
 			if ($tbodies.eq(tbodyIndex).hasClass(c.cssInfoBlock || ts.css.info)) { continue; } // ignore info blocks, issue #264
 			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true);

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

@@ -192,7 +192,6 @@ tsp = ts.pager = {
 			p.ajax = false;
 			// Regular pager; all rows stored in memory
 			c.$table.trigger("appendCache", [{}, true]);
-			tsp.hideRowsSetup(table, c);
 		}
 
 	},
@@ -202,6 +201,10 @@ tsp = ts.pager = {
 		tsp.bindEvents(table, c);
 		tsp.setPageSize(table, 0, c); // page size 0 is ignored
 
+		if (!p.ajax) {
+			tsp.hideRowsSetup(table, c);
+		}
+
 		// pager initialized
 		p.initialized = true;
 		p.initializing = false;
@@ -209,7 +212,8 @@ tsp = ts.pager = {
 		c.$table.trigger('pagerInitialized', 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);
+			// if ajax, then don't fire off pagerComplete
+			tsp.updatePageDisplay(table, c, !p.ajax);
 		}
 	},
 
@@ -221,10 +225,10 @@ tsp = ts.pager = {
 
 		c.$table
 			.off('filterInit filterStart filterEnd sortEnd disable enable destroy updateComplete pageSize pageSet '.split(' ').join('.pager '))
-			.on('filterInit.pager filterStart.pager', function() {
+			.on('filterInit.pager filterStart.pager', function(e) {
 				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('')) {
+				if (e.type === 'filterStart' && wo.pager_pageReset !== false && (c.lastCombinedFilter || '') !== (p.currentFilters || []).join('')) {
 					p.page = wo.pager_pageReset; // fixes #456 & #565
 				}
 			})
@@ -384,7 +388,7 @@ tsp = ts.pager = {
 		c.filteredRows = p.filteredRows;
 		p.filteredPages = Math.ceil( p.filteredRows / sz ) || 0;
 		if ( Math.min( p.totalPages, p.filteredPages ) >= 0 ) {
-			t = (p.size * p.page > p.filteredRows);
+			t = (p.size * p.page > p.filteredRows) && completed;
 			p.startRow = (t) ? 1 : (p.filteredRows === 0 ? 0 : p.size * p.page + 1);
 			p.page = (t) ? 0 : p.page;
 			p.endRow = Math.min( p.filteredRows, p.totalRows, p.size * ( p.page + 1 ) );
@@ -820,7 +824,6 @@ tsp = ts.pager = {
 			}
 			ts.processTbody(table, $tb, false);
 		}
-
 		tsp.updatePageDisplay(table, c);
 
 		wo.pager_startPage = p.page;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-04 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.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple integration of jquery-tablesorter (Mottie's fork) into the Rails asset