jquery-tablesorter 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b894fbd38fd0b3ea6b2606395da5b3d9610e0164
-  data.tar.gz: 3f45a27f4f427e5f4596885a560587adae9a9a86
+  metadata.gz: acfcfbdcbf520532b495a3aa784033d4ec287a30
+  data.tar.gz: 002c5105872cb05cf0d4f7d2f78d027fc8fc7864
 SHA512:
-  metadata.gz: 3c8e1f14359f525dcaf865a6bcabf56589faa509ecf5c4d36a9fe9ef9ff79be759c123f03c9141604fdb825451f28b31a4fc40e2548dde68fba46bd3bc77bbc2
-  data.tar.gz: ed439ddc82f74905ca27944b83cf35d5d89e3838a3b6b13b0003aa9bc334edaaf7f4ce34dff9fb8d0a8288102604c8a5d51d18bc4552dca75278a629a35ea329
+  metadata.gz: 171363daa41553a03cbca64f9c58bac9810d9c3b4f87509eda0713bee18bc0989ee2beca7b29247987085c379ccd97735382dd3f54f03ed4ffaf9f8df1938815
+  data.tar.gz: 5c0a43f4f40e32e946ed3e500d9f7012ffffe50803fb6a880a51d4648672435cd5fcde8e3d5abb33abb57cf511d60acac63766db00f678f63015223266f79ed6

data/README.markdown

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.12 (10/18/2013), [documentation]
+Current tablesorter version: 2.13.2 (11/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.7.0"
+  VERSION = "1.8.0"
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter pager plugin
- * updated 10/18/2013
+ * updated 10/30/2013
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -65,6 +65,11 @@
 			// table row set to a height to compensate; default is false
 			fixedHeight: false,
 
+			// count child rows towards the set page size? (set true if it is a visible table row within the pager)
+			// if true, child row(s) may not appear to be attached to its parent row, may be split across pages or
+			// may distort the table if rowspan or cellspans are included.
+			countChildRows: false,
+
 			// remove rows from the table to speed up the sort of large tables.
 			// setting this to false, only hides the non-visible rows; needed if you plan to add/remove rows with the pager enabled.
 			removeRows: false, // removing rows in larger tables speeds up the sort
@@ -199,7 +204,7 @@
 					if ( !rows[i].className.match(f) ) {
 						rows[i].style.display = ( j >= s && j < e ) ? '' : 'none';
 						// don't count child rows
-						j += rows[i].className.match(c.cssChildRow + '|' + c.selectorRemove.slice(1)) ? 0 : 1;
+						j += rows[i].className.match(c.cssChildRow + '|' + c.selectorRemove.slice(1)) && !p.countChildRows ? 0 : 1;
 					}
 				}
 			}
@@ -524,10 +529,11 @@
 		};
 
 		$this.appender = function(table, rows) {
-			var p = table.config.pager;
+			var c = table.config,
+				p = c.pager;
 			if ( !p.ajax ) {
-				table.config.rowsCopy = rows;
-				p.totalRows = rows.length;
+				c.rowsCopy = rows;
+				p.totalRows = p.countChildRows ? c.$tbodies.eq(0).children().length : rows.length;
 				p.size = $.data(table, 'pagerLastSize') || p.size;
 				p.totalPages = Math.ceil( p.totalRows / ( p.size || 10 ) );
 				renderTable(table, rows, p);

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.12.0 - Client-side table sorting with ease!
+* TableSorter 2.13.2 - 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.12.0";
+			ts.version = "2.13.2";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -1066,11 +1066,10 @@
 				if (a === b) { return 0; }
 				var xN, xD, yN, yD, xF, yF, i, mx,
 					r = ts.regex;
-				// numeric or hex detection
-				yD = parseInt(b.match(r.hex), 16);
 				// first try and sort Hex codes
-				if (yD) {
+				if (r.hex.test(b)) {
 					xD = parseInt(a.match(r.hex), 16);
+					yD = parseInt(b.match(r.hex), 16);
 					if ( xD < yD ) { return -1; }
 					if ( xD > yD ) { return 1; }
 				}
@@ -1317,7 +1316,7 @@
 				}
 				if(/^\s*\([.\d]+\)/.test(s)) {
 					// make (#) into a negative number -> (10) = -10
-					s = s.replace(/^\s*\(/,'-').replace(/\)/,'');
+					s = s.replace(/^\s*\(([.\d]+)\)/, '-$1');
 				}
 				i = parseFloat(s);
 				// return the text instead of zero

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

@@ -1,4 +1,4 @@
-/*! Filter widget formatter functions - updated 10/10/2013
+/*! Filter widget formatter functions - updated 10/30/2013
  * requires: tableSorter 2.7.7+ and jQuery 1.4.3+
  *
  * uiSpinner (jQuery UI spinner)
@@ -519,7 +519,7 @@ $.tablesorter.filterFormatter = {
 		var localfrom = o.defaultDate = o.from || o.defaultDate;
 
 		closeFrom = o.onClose = function( selectedDate, ui ) {
-			var from = new Date( selectedDate ).getTime() || '',
+			var from = new Date( $cell.find('.dateFrom').datepicker('getDate') ).getTime() || '',
 				to = new Date( $cell.find('.dateTo').datepicker('getDate') ).getTime() || '',
 				range = from ? ( to ? from + ' - ' + to : '>=' + from ) : (to ? '<=' + to : '');
 			$cell
@@ -542,7 +542,7 @@ $.tablesorter.filterFormatter = {
 		o.defaultDate = o.to || '+7d'; // set to date +7 days from today (if not defined)
 		closeTo = o.onClose = function( selectedDate, ui ) {
 			var from = new Date( $cell.find('.dateFrom').datepicker('getDate') ).getTime() || '',
-				to = new Date( selectedDate ).getTime() || '',
+				to = new Date( $cell.find('.dateTo').datepicker('getDate') ).getTime() || '',
 				range = from ? ( to ? from + ' - ' + to : '>=' + from ) : (to ? '<=' + to : '');
 			$cell
 				.find('.dateRange').val(range)
@@ -608,7 +608,7 @@ $.tablesorter.filterFormatter = {
 		$number = $('<input type="number" style="visibility:hidden;" value="test">').appendTo($cell),
 		// test if HTML5 number is supported - from Modernizr
 		numberSupported = o.skipTest || $number.attr('type') === 'number' && $number.val() !== 'test',
-		t, l, $shcell = [],
+		l, $shcell = [],
 		c = $cell.closest('table')[0].config,
 
 		updateCompare = function(v) {

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.8+ widgets - updated 10/18/2013
+/*! tableSorter 2.8+ widgets - updated 11/2/2013
  *
  * Column Styles
  * Column Filters
@@ -123,7 +123,7 @@ ts.addHeaderResizeEvent = function(table, disable, options){
 		wo.resize_flag = true;
 		headers = [];
 		c.$headers.each(function(){
-			var d = $.data(this, 'savedSizes'),
+			var d = $.data(this, 'savedSizes') || [0,0], // fixes #394
 				w = this.offsetWidth,
 				h = this.offsetHeight;
 			if (w !== d[0] || h !== d[1]) {
@@ -134,14 +134,14 @@ ts.addHeaderResizeEvent = function(table, disable, options){
 		if (headers.length) { c.$table.trigger('resize', [ headers ]); }
 		wo.resize_flag = false;
 	};
+	c.$headers.each(function(){
+		$.data(this, 'savedSizes', [ this.offsetWidth, this.offsetHeight ]);
+	});
 	clearInterval(wo.resize_timer);
 	if (disable) {
 		wo.resize_flag = false;
 		return false;
 	}
-	c.$headers.each(function(){
-		$.data(this, 'savedSizes', [ this.offsetWidth, this.offsetHeight ]);
-	});
 	wo.resize_timer = setInterval(function(){
 		if (wo.resize_flag) { return; }
 		checkSizes();
@@ -399,7 +399,7 @@ ts.addWidget({
 				}
 			},
 			findRows = function(filter, v, cv){
-				var $tb, $tr, $td, cr, r, l, ff, time, r1, r2, searchFiltered;
+				var $tb, $tr, $td, cr, r, l, ff, fr, time, r1, r2, searchFiltered;
 				if (c.debug) { time = new Date(); }
 				for (k = 0; k < b.length; k++ ){
 					if (b.eq(k).hasClass(ts.css.info)) { continue; } // ignore info blocks, issue #264
@@ -477,11 +477,11 @@ ts.addWidget({
 										ff = val === '' ? true : !(wo.filter_startsWith ? s === 0 : s >= 0);
 									// Look for operators >, >=, < or <=
 									} else if (/^[<>]=?/.test(val)){
-										s = fmt(val.replace(wo.filter_regex.nondigit, '').replace(wo.filter_regex.operators,''), table);
+										s = fr = fmt(val.replace(wo.filter_regex.nondigit, '').replace(wo.filter_regex.operators,''), table);
 										// parse filter value in case we're comparing numbers (dates)
 										if (parsed[i] || c.parsers[i].type === 'numeric') {
 											rg = c.parsers[i].format('' + val.replace(wo.filter_regex.operators,''), table, $ths.eq(i), i);
-											s = (rg !== '' && !isNaN(rg)) ? rg : s;
+											s = (isNaN(s) && rg !== '' && !isNaN(rg)) ? rg : s;
 										}
 										// xi may be numeric - see issue #149;
 										// check if c.cache[k].normalized[j] is defined, because sometimes j goes out of range? (numeric columns)
@@ -489,7 +489,7 @@ ts.addWidget({
 											isNaN(xi) ? fmt(xi.replace(wo.filter_regex.nondigit, ''), table) : fmt(xi, table);
 										if (/>/.test(val)) { ff = />=/.test(val) ? rg >= s : rg > s; }
 										if (/</.test(val)) { ff = /<=/.test(val) ? rg <= s : rg < s; }
-										if (s === '') { ff = true; } // keep showing all rows if nothing follows the operator
+										if (!ff && fr === '') { ff = true; } // keep showing all rows if nothing follows the operator
 									// Look for an AND or && operator (logical and)
 									} else if (/\s+(AND|&&)\s+/g.test(v[i])) {
 										s = val.split(/(?:\s+(?:and|&&)\s+)/g);
@@ -533,7 +533,12 @@ ts.addWidget({
 							}
 							$tr[j].style.display = (r ? '' : 'none');
 							$tr.eq(j)[r ? 'removeClass' : 'addClass'](wo.filter_filteredRow);
-							if (cr.length) { cr[r ? 'show' : 'hide'](); }
+							if (cr.length) {
+								if (c.pager && c.pager.countChildRows || wo.pager_countChildRows) {
+									cr[r ? 'removeClass' : 'addClass'](wo.filter_filteredRow); // see issue #396
+								}
+								cr[r ? 'show' : 'hide']();
+							}
 						}
 					}
 					ts.processTbody(table, $tb, false);
@@ -754,9 +759,7 @@ ts.addWidget({
 								// $(':focus') needs jQuery 1.6+
 								if ($(document.activeElement).closest('tr')[0] !== ft[0]){
 									// get all filter values
-									all = $t.find('.tablesorter-filter').map(function(){
-										return $(this).val() || '';
-									}).get().join('');
+									all = ts.getFilters(table).join('');
 									// don't hide row if any filter has a value
 									if (all === ''){
 										ft.addClass('hideme');
@@ -770,7 +773,7 @@ ts.addWidget({
 						clearTimeout(st);
 						st = setTimeout(function(){
 							// don't hide row if any filter has a value
-							if ($t.find('.tablesorter-filter').map(function(){ return $(this).val() || ''; }).get().join('') === ''){
+							if (ts.getFilters(table).join('') === ''){
 								ft2[ e.type === 'focus' ? 'removeClass' : 'addClass']('hideme');
 							}
 						}, 200);
@@ -820,22 +823,22 @@ ts.addWidget({
 			$tb.children().removeClass(wo.filter_filteredRow).show();
 			ts.processTbody(table, $tb, false); // restore tbody
 		}
-		if (wo.filterreset) { $(document).undelegate(wo.filter_reset, 'click.tsfilter'); }
+		if (wo.filter_reset) { $(document).undelegate(wo.filter_reset, 'click.tsfilter'); }
 	}
 });
 ts.getFilters = function(table) {
 	var c = table ? $(table)[0].config : {};
 	if (c && c.widgetOptions && !c.widgetOptions.filter_columnFilters) { return $(table).data('lastSearch'); }
-	return c && c.$filters ? c.$filters.find('.tablesorter-filter').map(function(i, el) {
-		return $(el).val();
+	return c && c.$filters ? c.$filters.map(function(i, el) {
+		return $(el).find('.tablesorter-filter').val() || '';
 	}).get() || [] : false;
 };
 ts.setFilters = function(table, filter, apply) {
 	var $t = $(table),
 		c = $t.length ? $t[0].config : {},
-		valid = c && c.$filters ? c.$filters.find('.tablesorter-filter').each(function(i, el) {
-			$(el).val(filter[i] || '');
-		}).trigger('change.tsfilter') || false : false;
+		valid = c && c.$filters ? c.$filters.each(function(i, el) {
+			$(el).find('.tablesorter-filter').val(filter[i] || '');
+		}) || false : false;
 	if (apply) { $t.trigger('search', [filter, false]); }
 	return !!valid;
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties