jquery-tablesorter 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d8960dc57d66b1ac1b240f8ec2a50bcd85a130d
-  data.tar.gz: 2ff7b825a32d597efe45f28ae8f52bc32a73f222
+  metadata.gz: 434be6c4bd88f3d84bbfaa574aa004a6db18abdb
+  data.tar.gz: 21eb848f7fd16cfb5642470af727a6fc858438c9
 SHA512:
-  metadata.gz: 38e32b180cae97a545ddc52cf7f2f93fd5a5cf1a20d7a280b5a2e0cf2d7fcee64d0b9532ec17b9b63ff0a07ccfcdab5dc847171fe345bb883d818cd30c43938b
-  data.tar.gz: 0054a4c0676789cccb11959b59aa81c2dceb4e33b46a58cf496915f9ea954e768f27b7956446bde7c25596d86938a2316a2a3b90a34492da4dfb7d3e359ac142
+  metadata.gz: cb3b3737c7de96e57b09385a612d5c1100125ffbd5c31007e1df38b563c7dbc7bc177dfcd958c8ffdb01a6a5ea24b857e8eacbe930d52547c80206b11fdf0b2f
+  data.tar.gz: 68cd1f4205072697210c3cacc18e078666bd9b1144b13968b944d30912f957530925f6d2a315cd7db2b2ec3475dccbb12931cfe8f030c150b21b35065c1847eb

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.19.1 (2/9/2015), [documentation]
+Current tablesorter version: 2.20.1 (2/20/2015), [documentation]
 
 Any issue associated with the js/css files, please report to [Mottie's fork].
 
@@ -24,7 +24,7 @@ Or install it yourself as:
 
 ## Requirements
 
-Rails 3.1 and higher (tested up to 4.2)
+Rails 3.2 and higher (tested up to 4.2)
 
 Tested with ruby 1.9.3 - 2.2.0
 

data/lib/jquery-tablesorter/version.rb

@@ -1,3 +1,3 @@
 module JqueryTablesorter
-  VERSION = '1.14.1'
+  VERSION = '1.15.0'
 end

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

@@ -1,3 +1,3 @@
-//= require jquery-tablesorter/jquery.metadata
+//= require jquery-tablesorter/extras/jquery.metadata
 //= require jquery-tablesorter/jquery.tablesorter
 //= require jquery-tablesorter/jquery.tablesorter.widgets

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

@@ -135,18 +135,15 @@
 		},
 
 		calcFilters = function(table, p) {
-			var tbodyIndex,
-				c = table.config,
+			var c = table.config,
 				hasFilters = c.$table.hasClass('hasFilters');
 			if (hasFilters && !p.ajaxUrl) {
 				if ($.isEmptyObject(c.cache)) {
 					// delayInit: true so nothing is in the cache
 					p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( p.countChildRows ? '' : '.' + c.cssChildRow ).length;
 				} else {
-					// just in case the pager tbody isn't the first tbody
-					tbodyIndex = c.$table.children('tbody').index( c.$tbodies.eq(0) );
 					p.filteredRows = 0;
-					$.each(c.cache[tbodyIndex].normalized, function(i, el) {
+					$.each(c.cache[0].normalized, function(i, el) {
 						p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
 					});
 				}
@@ -659,8 +656,7 @@
 			c.$table.trigger('updateCache', [ function(){
 				var i,
 					rows = [],
-					tbodyIndex = c.$table.children('tbody').index( c.$tbodies.eq(0) ),
-					n = table.config.cache[tbodyIndex].normalized;
+					n = table.config.cache[0].normalized;
 				p.totalRows = n.length;
 				for (i = 0; i < p.totalRows; i++) {
 					rows.push(n[i][c.columns].$row);
@@ -768,7 +764,7 @@
 			table.config.appender = null; // remove pager appender function
 			p.initialized = false;
 			delete table.config.rowsCopy;
-			$(table).unbind( $.trim(pagerEvents.split(' ').join('.pager ')) );
+			$(table).unbind( pagerEvents.split(' ').join('.pager ').replace(/\s+/g, ' ') );
 			if (ts.storage) {
 				ts.storage(table, p.storageKey, '');
 			}
@@ -848,7 +844,7 @@
 				p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.slice(1) + '|' + c.cssChildRow + ')');
 
 				$t
-					.unbind( $.trim(pagerEvents.split(' ').join('.pager ')) )
+					.unbind( pagerEvents.split(' ').join('.pager ').replace(/\s+/g, ' ') )
 					.bind('filterInit.pager filterStart.pager', function(e, filters) {
 						p.currentFilters = $.isArray(filters) ? filters : c.$table.data('lastSearch');
 						// don't change page if filters are the same (pager updating, etc)

data/vendor/assets/javascripts/jquery-tablesorter/extras/jquery.dragtable.mod.js

@@ -198,15 +198,12 @@
     }
   };
 
-/*!
- * dragtable
+/*! dragtable v2.0.14 Mod *//*
  *  _____       _
  * |     |___ _| |
  * | | | | . | . |
  * |_|_|_|___|___|
  *
- * @Version 2.0.14 MOD
- *
  * Copyright (c) 2010-2013, Andres akottr@gmail.com
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.

data/vendor/assets/javascripts/jquery-tablesorter/{jquery.metadata.js → extras/jquery.metadata.js}

@@ -92,6 +92,7 @@ $.extend({
 
 			if ( data.indexOf( '{' ) <0 ) { data = "{" + data + "}"; }
 
+			/*jshint evil:true */
 			data = eval("(" + data + ")");
 
 			$.data( elem, settings.single, data );

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

@@ -32,7 +32,7 @@
 			prepareQuery: function (val) {
 				return val.toLowerCase().split(' ');
 			},
-			testQuery: function (query, txt, _row) {
+			testQuery: function (query, txt) {
 				for (var i = 0; i < query.length; i += 1) {
 					if (txt.indexOf(query[i]) === -1) {
 						return false;
@@ -44,13 +44,13 @@
 
 		this.go = function () {
 
-			var i = 0,
+			var len, i = 0,
 			numMatchedRows = 0,
 			noresults = true,
 			query = options.prepareQuery(val),
 			val_empty = (val.replace(' ', '').length === 0);
 
-			for (var i = 0, len = rowcache.length; i < len; i++) {
+			for (i = 0, len = rowcache.length; i < len; i++) {
 				if (val_empty || options.testQuery(query, cache[i], rowcache[i]) ||
 					($(rowcache[i]).hasClass(options.childRow) && $(rowcache[i > 1 ? i - 1 : 0]).is(':visible'))) {
 					options.show.apply(rowcache[i]);
@@ -125,7 +125,11 @@
 
 		this.loader = function (bool) {
 			if (typeof options.loader === "string" && options.loader !== "") {
-				(bool) ? $(options.loader).show() : $(options.loader).hide();
+				if (bool) {
+					$(options.loader).show();
+				} else {
+					$(options.loader).hide();
+				}
 			}
 			return this;
 		};

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

@@ -1,8 +1,10 @@
-/**!
-* TableSorter (FORK) 2.19.1 - Client-side table sorting with ease!
+/*! TableSorter (FORK) v{{version}} *//*
+* Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
+* fork maintained by Rob Garrison
+*
 * Examples and docs at: http://tablesorter.com
 * Dual licensed under the MIT and GPL licenses:
 * http://www.opensource.org/licenses/mit-license.php
@@ -11,8 +13,8 @@
 * @type jQuery
 * @name tablesorter (FORK)
 * @cat Plugins/Tablesorter
-* @author Christian Bach/christian.bach@polyester.se
-* @contributor Rob Garrison/https://github.com/Mottie/tablesorter
+* @author Christian Bach - christian.bach@polyester.se
+* @contributor Rob Garrison - https://github.com/Mottie/tablesorter
 */
 /*jshint browser:true, jquery:true, unused:false, expr: true */
 /*global console:false, alert:false, require:false, define:false, module:false */
@@ -32,7 +34,7 @@
 
 			var ts = this;
 
-			ts.version = '2.19.1';
+			ts.version = '{{version}}';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -104,7 +106,7 @@
 				cssIconAsc       : '', // class name added to the icon when the column has an ascending sort
 				cssIconDesc      : '', // class name added to the icon when the column has a descending sort
 				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
+				cssNoSort        : 'tablesorter-noSort',      // class name added to element inside header; clicking on it won't cause a sort
 				cssIgnoreRow     : 'tablesorter-ignoreRow',   // header row to ignore; cells within this row will not be added to c.$headers
 
 				// *** selectors
@@ -136,7 +138,6 @@
 				headerRow  : 'tablesorter-headerRow',
 				headerIn   : 'tablesorter-header-inner',
 				icon       : 'tablesorter-icon',
-				info       : 'tablesorter-infoOnly',
 				processing : 'tablesorter-processing',
 				sortAsc    : 'tablesorter-headerAsc',
 				sortDesc   : 'tablesorter-headerDesc',
@@ -180,37 +181,39 @@
 				return true;
 			}
 
-			function getElementText(table, node, cellIndex) {
+			ts.getElementText = function(c, node, cellIndex) {
 				if (!node) { return ''; }
 				var te,
-					$node = $(node),
-					c = table.config,
-					t = c.textExtraction || '';
+					t = c.textExtraction || '',
+					// node could be a jquery object
+					// http://jsperf.com/jquery-vs-instanceof-jquery/2
+					$node = node.jquery ? node : $(node);
 				if (typeof(t) === 'string') {
 					// check data-attribute first when set to 'basic'; don't use node.innerText - it's really slow!
-					return $.trim( (t === 'basic' ? $node.attr(c.textAttribute) || node.textContent : node.textContent ) || $node.text() || '' );
+					return $.trim( ( t === 'basic' ? $node.attr(c.textAttribute) || node.textContent : node.textContent ) || $node.text() || '' );
 				} else {
 					if (typeof(t) === 'function') {
-						return $.trim( t(node, table, cellIndex) );
-					} else if (typeof (te = ts.getColumnData( table, t, cellIndex )) === 'function') {
-						return $.trim( te(node, table, cellIndex) );
+						return $.trim( t($node[0], c.table, cellIndex) );
+					} else if (typeof (te = ts.getColumnData( c.table, t, cellIndex )) === 'function') {
+						return $.trim( te($node[0], c.table, cellIndex) );
 					}
 				}
 				// fallback
-				return $.trim( node.textContent || $node.text() || '' );
-			}
+				return $.trim( $node[0].textContent || $node.text() || '' );
+			};
 
 			function detectParserForColumn(table, rows, rowIndex, cellIndex) {
 				var cur, $node,
-				i = ts.parsers.length,
-				node = false,
-				nodeValue = '',
-				keepLooking = true;
+					c = table.config,
+					i = ts.parsers.length,
+					node = false,
+					nodeValue = '',
+					keepLooking = true;
 				while (nodeValue === '' && keepLooking) {
 					rowIndex++;
 					if (rows[rowIndex]) {
 						node = rows[rowIndex].cells[cellIndex];
-						nodeValue = getElementText(table, node, cellIndex);
+						nodeValue = ts.getElementText(c, node, cellIndex);
 						$node = $(node);
 						if (table.config.debug) {
 							log('Checking if value was empty on row ' + rowIndex + ', column: ' + cellIndex + ': "' + nodeValue + '"');
@@ -293,10 +296,10 @@
 
 			/* utils */
 			function buildCache(table) {
-				var cc, t, tx, v, i, j, k, $row, rows, cols, cacheTime,
+				var cc, t, tx, v, i, j, k, $row, cols, cacheTime,
 					totalRows, rowData, colMax,
 					c = table.config,
-					$tb = c.$table.children('tbody'),
+					$tb = c.$tbodies,
 					extractors = c.extractors,
 					parsers = c.parsers;
 				c.cache = {};
@@ -319,68 +322,65 @@
 						// colMax: #   // added at the end
 					};
 
-					// ignore tbodies with class name from c.cssInfoBlock
-					if (!$tb.eq(k).hasClass(c.cssInfoBlock)) {
-						totalRows = ($tb[k] && $tb[k].rows.length) || 0;
-						for (i = 0; i < totalRows; ++i) {
-							rowData = {
-								// order: original row order #
-								// $row : jQuery Object[]
-								child: [], // child row text (filter widget)
-								raw: []    // original row text
-							};
-							/** Add the table data to main data array */
-							$row = $($tb[k].rows[i]);
-							rows = [ new Array(c.columns) ];
-							cols = [];
-							// if this is a child row, add it to the last row's children and continue to the next row
-							// ignore child row class, if it is the first row
-							if ($row.hasClass(c.cssChildRow) && i !== 0) {
-								t = cc.normalized.length - 1;
-								cc.normalized[t][c.columns].$row = cc.normalized[t][c.columns].$row.add($row);
-								// add 'hasChild' class name to parent row
-								if (!$row.prev().hasClass(c.cssChildRow)) {
-									$row.prev().addClass(ts.css.cssHasChild);
+					totalRows = ($tb[k] && $tb[k].rows.length) || 0;
+					for (i = 0; i < totalRows; ++i) {
+						rowData = {
+							// order: original row order #
+							// $row : jQuery Object[]
+							child: [], // child row text (filter widget)
+							raw: []    // original row text
+						};
+						/** Add the table data to main data array */
+						$row = $($tb[k].rows[i]);
+						cols = [];
+						// if this is a child row, add it to the last row's children and continue to the next row
+						// ignore child row class, if it is the first row
+						if ($row.hasClass(c.cssChildRow) && i !== 0) {
+							t = cc.normalized.length - 1;
+							cc.normalized[t][c.columns].$row = cc.normalized[t][c.columns].$row.add($row);
+							// add 'hasChild' class name to parent row
+							if (!$row.prev().hasClass(c.cssChildRow)) {
+								$row.prev().addClass(ts.css.cssHasChild);
+							}
+							// save child row content (un-parsed!)
+							rowData.child[t] = $.trim( $row[0].textContent || $row.text() || '' );
+							// go to the next for loop
+							continue;
+						}
+						rowData.$row = $row;
+						rowData.order = i; // add original row position to rowCache
+						for (j = 0; j < c.columns; ++j) {
+							if (typeof parsers[j] === 'undefined') {
+								if (c.debug) {
+									log('No parser found for cell:', $row[0].cells[j], 'does it have a header?');
 								}
-								// save child row content (un-parsed!)
-								rowData.child[t] = $.trim( $row[0].textContent || $row.text() || '' );
-								// go to the next for loop
 								continue;
 							}
-							rowData.$row = $row;
-							rowData.order = i; // add original row position to rowCache
-							for (j = 0; j < c.columns; ++j) {
-								if (typeof parsers[j] === 'undefined') {
-									if (c.debug) {
-										log('No parser found for cell:', $row[0].cells[j], 'does it have a header?');
-									}
-									continue;
-								}
-								t = getElementText(table, $row[0].cells[j], j);
-								rowData.raw.push(t); // save original row text
-								// do extract before parsing if there is one
-								if (typeof extractors[j].id === 'undefined') {
-									tx = t;
-								} else {
-									tx = extractors[j].format(t, table, $row[0].cells[j], j);
-								}
-								// allow parsing if the string is empty, previously parsing would change it to zero,
-								// in case the parser needs to extract data from the table cell attributes
-								v = parsers[j].id === 'no-parser' ? '' : parsers[j].format(tx, table, $row[0].cells[j], j);
-								cols.push( c.ignoreCase && typeof v === 'string' ? v.toLowerCase() : v );
-								if ((parsers[j].type || '').toLowerCase() === 'numeric') {
-									// determine column max value (ignore sign)
-									colMax[j] = Math.max(Math.abs(v) || 0, colMax[j] || 0);
-								}
+							t = ts.getElementText(c, $row[0].cells[j], j);
+							rowData.raw.push(t); // save original row text
+							// do extract before parsing if there is one
+							if (typeof extractors[j].id === 'undefined') {
+								tx = t;
+							} else {
+								tx = extractors[j].format(t, table, $row[0].cells[j], j);
+							}
+							// allow parsing if the string is empty, previously parsing would change it to zero,
+							// in case the parser needs to extract data from the table cell attributes
+							v = parsers[j].id === 'no-parser' ? '' : parsers[j].format(tx, table, $row[0].cells[j], j);
+							cols.push( c.ignoreCase && typeof v === 'string' ? v.toLowerCase() : v );
+							if ((parsers[j].type || '').toLowerCase() === 'numeric') {
+								// determine column max value (ignore sign)
+								colMax[j] = Math.max(Math.abs(v) || 0, colMax[j] || 0);
 							}
-							// ensure rowData is always in the same location (after the last column)
-							cols[c.columns] = rowData;
-							cc.normalized.push(cols);
 						}
-						cc.colMax = colMax;
-						// total up rows, not including child rows
-						c.totalRows += cc.normalized.length;
+						// ensure rowData is always in the same location (after the last column)
+						cols[c.columns] = rowData;
+						cc.normalized.push(cols);
 					}
+					cc.colMax = colMax;
+					// total up rows, not including child rows
+					c.totalRows += cc.normalized.length;
+
 				}
 				if (c.showProcessing) {
 					ts.isProcessing(table); // remove processing icon
@@ -394,7 +394,7 @@
 			function appendToTable(table, init) {
 				var c = table.config,
 					wo = c.widgetOptions,
-					b = table.tBodies,
+					$tbodies = c.$tbodies,
 					rows = [],
 					cc = c.cache,
 					n, totalRows, $bk, $tb,
@@ -408,9 +408,9 @@
 				if (c.debug) {
 					appendTime = new Date();
 				}
-				for (k = 0; k < b.length; k++) {
-					$bk = $(b[k]);
-					if ($bk.length && !$bk.hasClass(c.cssInfoBlock)) {
+				for (k = 0; k < $tbodies.length; k++) {
+					$bk = $tbodies.eq(k);
+					if ($bk.length) {
 						// get tbody
 						$tb = ts.processTbody(table, $bk, true);
 						n = cc[k].normalized;
@@ -752,23 +752,23 @@
 			// sort multiple columns
 			function multisort(table) { /*jshint loopfunc:true */
 				var i, k, num, col, sortTime, colMax,
-					cache, order, sort, x, y,
+					rows, order, sort, x, y,
 					dir = 0,
 					c = table.config,
 					cts = c.textSorter || '',
 					sortList = c.sortList,
 					l = sortList.length,
-					bl = table.tBodies.length;
+					bl = c.$tbodies.length;
 				if (c.serverSideSorting || isEmptyObject(c.cache)) { // empty table - fixes #206/#346
 					return;
 				}
 				if (c.debug) { sortTime = new Date(); }
 				for (k = 0; k < bl; k++) {
 					colMax = c.cache[k].colMax;
-					cache = c.cache[k].normalized;
+					rows = c.cache[k].normalized;
 
-					cache.sort(function(a, b) {
-						// cache is undefined here in IE, so don't use it!
+					rows.sort(function(a, b) {
+						// rows is undefined here in IE, so don't use it!
 						for (i = 0; i < l; i++) {
 							col = sortList[i][0];
 							order = sortList[i][1];
@@ -851,12 +851,12 @@
 			function bindMethods(table){
 				var c = table.config,
 					$table = c.$table,
-					events = 'sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache ' +
-						'updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave '.split(' ')
+					events = ('sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache ' +
+						'updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ').split(' ')
 						.join(c.namespace + ' ');
 				// apply easy methods that trigger bound events
 				$table
-				.unbind( $.trim(events) )
+				.unbind( events.replace(/\s+/g, ' ') )
 				.bind('sortReset' + c.namespace, function(e, callback){
 					e.stopPropagation();
 					c.sortList = [];
@@ -889,7 +889,7 @@
 					$table.find(c.selectorRemove).remove();
 					// get position from the dom
 					var v, t, row, icell,
-					$tb = $table.find('tbody'),
+					$tb = c.$tbodies,
 					$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');
@@ -902,9 +902,9 @@
 						icell = $cell.index();
 						c.cache[tbdy].normalized[row][c.columns].$row = $row;
 						if (typeof c.extractors[icell].id === 'undefined') {
-							t = getElementText(table, cell, icell);
+							t = ts.getElementText(c, cell, icell);
 						} else {
-							t = c.extractors[icell].format( getElementText(table, cell, icell), table, cell, icell );
+							t = c.extractors[icell].format( ts.getElementText(c, cell, icell), table, cell, icell );
 						}
 						v = c.parsers[icell].id === 'no-parser' ? '' :
 							c.parsers[icell].format( t, table, cell, icell );
@@ -938,7 +938,7 @@
 						$row = $($row).attr('role', 'row'); // make sure we're using a jQuery object
 						var i, j, l, t, v, rowData, cells,
 						rows = $row.filter('tr').length,
-						tbdy = $table.find('tbody').index( $row.parents('tbody').filter(':first') );
+						tbdy = c.$tbodies.index( $row.parents('tbody').filter(':first') );
 						// fixes adding rows to an empty table - see issue #179
 						if (!(c.parsers && c.parsers.length)) {
 							buildParserCache(table);
@@ -955,9 +955,9 @@
 							// add each cell
 							for (j = 0; j < l; j++) {
 								if (typeof c.extractors[j].id === 'undefined') {
-									t = getElementText(table, $row[i].cells[j], j);
+									t = ts.getElementText(c, $row[i].cells[j], j);
 								} else {
-									t = c.extractors[j].format( getElementText(table, $row[i].cells[j], j), table, $row[i].cells[j], j );
+									t = c.extractors[j].format( ts.getElementText(c, $row[i].cells[j], j), table, $row[i].cells[j], j );
 								}
 								v = c.parsers[j].id === 'no-parser' ? '' :
 									c.parsers[j].format( t, table, $row[i].cells[j], j );
@@ -1198,7 +1198,7 @@
 					colgroup = $('<colgroup class="' + ts.css.colgroup + '">');
 					overallWidth = c.$table.width();
 					// only add col for visible columns - fixes #371
-					$(table.tBodies).not('.' + c.cssInfoBlock).find('tr:first').children(':visible').each(function() {
+					c.$tbodies.find('tr:first').children(':visible').each(function() {
 						percent = parseInt( ( $(this).width() / overallWidth ) * 1000, 10 ) / 10 + '%';
 						colgroup.append( $('<col>').css('width', percent) );
 					});
@@ -1330,9 +1330,11 @@
 				$headers
 				// http://stackoverflow.com/questions/5312849/jquery-find-self;
 				.find(c.selectorSort).add( $headers.filter(c.selectorSort) )
-				.unbind( $.trim('mousedown mouseup sort keyup '.split(' ').join(c.namespace + ' ')) )
-				.bind( $.trim('mousedown mouseup sort keyup '.split(' ').join(c.namespace + ' ')), function(e, external) {
-					var cell, type = e.type;
+				.unbind( ('mousedown mouseup sort keyup '.split(' ').join(c.namespace + ' ')).replace(/\s+/g, ' ') )
+				.bind( 'mousedown mouseup sort keyup '.split(' ').join(c.namespace + ' '), function(e, external) {
+					var cell,
+						$target = $(e.target),
+						type = e.type;
 					// only recognize left clicks or enter
 					if ( ((e.which || e.button) !== 1 && !/sort|keyup/.test(type)) || (type === 'keyup' && e.which !== 13) ) {
 						return;
@@ -1342,9 +1344,16 @@
 					// set timer on mousedown
 					if (type === 'mousedown') {
 						downTime = new Date().getTime();
-						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;
+						return;
+					}
+					cell = $.fn.closest ? $target.closest('td,th') : $target.parents('td,th').filter(':first');
+					// prevent sort being triggered on form elements
+					if ( /(input|select|button|textarea)/i.test(e.target.tagName) ||
+						// nosort class name, or elements within a nosort container
+						$target.hasClass(c.cssNoSort) || $target.parents('.' + c.cssNoSort).length > 0 ||
+						// elements within a button
+						$target.parents('button').length > 0 ) {
+						return !c.cancelSelection;
 					}
 					if (c.delayInit && isEmptyObject(c.cache)) { buildCache(table); }
 					// jQuery v1.2.6 doesn't have closest()
@@ -1406,13 +1415,13 @@
 					.join(c.namespace + ' ');
 				$t
 					.removeData('tablesorter')
-					.unbind( $.trim(events) );
+					.unbind( events.replace(/\s+/g, ' ') );
 				c.$headers.add($f)
 					.removeClass( [ts.css.header, c.cssHeader, c.cssAsc, c.cssDesc, ts.css.sortAsc, ts.css.sortDesc, ts.css.sortNone].join(' ') )
 					.removeAttr('data-column')
 					.removeAttr('aria-label')
 					.attr('aria-disabled', 'true');
-				$r.find(c.selectorSort).unbind( $.trim('mousedown mouseup keypress '.split(' ').join(c.namespace + ' ')) );
+				$r.find(c.selectorSort).unbind( ('mousedown mouseup keypress '.split(' ').join(c.namespace + ' ')).replace(/\s+/g, ' ') );
 				ts.restoreHeaders(table);
 				$t.toggleClass(ts.css.table + ' ' + c.tableClass + ' tablesorter-' + c.theme, removeClasses === false);
 				// clear flag in case the plugin is initialized again