jquery-tablesorter 1.10.4 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e9c4b55e83f583df24a50e72e50dd3193625600
-  data.tar.gz: 2242d68bf7499163fd6f4839b673655f703e9df8
+  metadata.gz: 6ae86c5a6be578e3345d4a9d6d360139e14f5117
+  data.tar.gz: 86e5f16bcbace09e8eab622aa11a1bc7403f7ba3
 SHA512:
-  metadata.gz: 53eba97a412635392168b9375f97cd76ec45cc0e1c056ad3a07a17bde3fda060724577b03b0b1e923944aa441a674dabc4c37f01c295050819d74a0fd90fb3bf
-  data.tar.gz: 702b8fb3e5342484899fa7938e68c4fd1c5be5d9f88c2bd40b8dae7ade36dcb90895c8c2955bd6a0693d501a7e9a50895f2aa3933a5296c54dc604cbb95a4ed5
+  metadata.gz: b86a226432a4b741a8b54e6f73180924524876e1a4a21b46f192f1c7e1f24fdd727c017cb1f05ff4a448944b88751177db793d1c95e765966a7809aae0beb441
+  data.tar.gz: 7898210ee3314a69b1c330bf9dfa9fc364288c59769f5976f6ccc4f293a9527d2dd7c22bd374e5269c03643a2cdda18ce5aecbb8444ae8ef6acb22afe3901a0f

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.15.6 (3/7/2014), [documentation]
+Current tablesorter version: 2.15.7 (3/10/2014), [documentation]
 
 Any issue associate with the js/css files, please report to [Mottie's fork].
 
@@ -26,7 +26,7 @@ Or install it yourself as:
 
 Rails 3.1 and higher (tested up to 4.1)
 
-Tested with ruby 1.9.3 - 2.1.0
+Tested with ruby 1.9.3 - 2.1.1
 
 ## Usage
 

data/lib/jquery-tablesorter/version.rb

@@ -1,3 +1,3 @@
 module JqueryTablesorter
-  VERSION = "1.10.4"
+  VERSION = "1.10.5"
 end

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

@@ -1,5 +1,5 @@
 /**!
-* TableSorter 2.15.6 - Client-side table sorting with ease!
+* TableSorter 2.15.7 - 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.15.6";
+			ts.version = "2.15.7";
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -783,15 +783,15 @@
 					$table = c.$table;
 				// apply easy methods that trigger bound events
 				$table
-				.unbind('sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave '.split(' ').join('.tablesorter '))
-				.bind("sortReset.tablesorter", function(e){
+				.unbind('sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave '.split(' ').join(c.namespace + ' '))
+				.bind("sortReset" + c.namespace, function(e){
 					e.stopPropagation();
 					c.sortList = [];
 					setHeadersCss(table);
 					multisort(table);
 					appendToTable(table);
 				})
-				.bind("updateAll.tablesorter", function(e, resort, callback){
+				.bind("updateAll" + c.namespace, function(e, resort, callback){
 					e.stopPropagation();
 					table.isUpdating = true;
 					ts.refreshWidgets(table, true, true);
@@ -801,14 +801,14 @@
 					bindMethods(table);
 					commonUpdate(table, resort, callback);
 				})
-				.bind("update.tablesorter updateRows.tablesorter", function(e, resort, callback) {
+				.bind("update" + c.namespace + " updateRows" + c.namespace, function(e, resort, callback) {
 					e.stopPropagation();
 					table.isUpdating = true;
 					// update sorting (if enabled/disabled)
 					updateHeader(table);
 					commonUpdate(table, resort, callback);
 				})
-				.bind("updateCell.tablesorter", function(e, cell, resort, callback) {
+				.bind("updateCell" + c.namespace, function(e, cell, resort, callback) {
 					e.stopPropagation();
 					table.isUpdating = true;
 					$table.find(c.selectorRemove).remove();
@@ -830,7 +830,7 @@
 						checkResort($table, resort, callback);
 					}
 				})
-				.bind("addRows.tablesorter", function(e, $row, resort, callback) {
+				.bind("addRows" + c.namespace, function(e, $row, resort, callback) {
 					e.stopPropagation();
 					table.isUpdating = true;
 					if (isEmptyObject(c.cache)) {
@@ -863,10 +863,10 @@
 						checkResort($table, resort, callback);
 					}
 				})
-				.bind("updateComplete.tablesorter", function(){
+				.bind("updateComplete" + c.namespace, function(){
 					table.isUpdating = false;
 				})
-				.bind("sorton.tablesorter", function(e, list, callback, init) {
+				.bind("sorton" + c.namespace, function(e, list, callback, init) {
 					var c = table.config;
 					e.stopPropagation();
 					$table.trigger("sortStart", this);
@@ -885,14 +885,14 @@
 						callback(table);
 					}
 				})
-				.bind("appendCache.tablesorter", function(e, callback, init) {
+				.bind("appendCache" + c.namespace, function(e, callback, init) {
 					e.stopPropagation();
 					appendToTable(table, init);
 					if (typeof callback === "function") {
 						callback(table);
 					}
 				})
-				.bind("updateCache.tablesorter", function(e, callback){
+				.bind("updateCache" + c.namespace, function(e, callback){
 					// rebuild parsers
 					if (!c.parsers) {
 						buildParserCache(table);
@@ -903,20 +903,20 @@
 						callback(table);
 					}
 				})
-				.bind("applyWidgetId.tablesorter", function(e, id) {
+				.bind("applyWidgetId" + c.namespace, function(e, id) {
 					e.stopPropagation();
 					ts.getWidgetById(id).format(table, c, c.widgetOptions);
 				})
-				.bind("applyWidgets.tablesorter", function(e, init) {
+				.bind("applyWidgets" + c.namespace, function(e, init) {
 					e.stopPropagation();
 					// apply widgets
 					ts.applyWidget(table, init);
 				})
-				.bind("refreshWidgets.tablesorter", function(e, all, dontapply){
+				.bind("refreshWidgets" + c.namespace, function(e, all, dontapply){
 					e.stopPropagation();
 					ts.refreshWidgets(table, all, dontapply);
 				})
-				.bind("destroy.tablesorter", function(e, c, cb){
+				.bind("destroy" + c.namespace, function(e, c, cb){
 					e.stopPropagation();
 					ts.destroy(table, c, cb);
 				});
@@ -932,8 +932,9 @@
 					if (!table.hasInitialized && ts.buildTable && this.tagName !== 'TABLE') {
 						// return the table (in case the original target is the table's container)
 						ts.buildTable(table, c);
+					} else {
+						ts.setup(table, c);
 					}
-					ts.setup(table, c);
 				});
 			};
 
@@ -972,11 +973,19 @@
 				c.$table = $table
 					.addClass(ts.css.table + ' ' + c.tableClass + k)
 					.attr({ role : 'grid'});
+
+				// give the table a unique id, which will be used in namespace binding
+				if (!c.namespace) {
+					c.namespace = '.tablesorter' + Math.random().toString(16).slice(2);
+				} else {
+					// make sure namespace starts with a period & doesn't have weird characters
+					c.namespace = '.' + c.namespace.replace(/\W/g,'');
+				}
+
 				c.$tbodies = $table.children('tbody:not(.' + c.cssInfoBlock + ')').attr({
 					'aria-live' : 'polite',
 					'aria-relevant' : 'all'
 				});
-				//
 				if (c.$table.find('caption').length) {
 					c.$table.attr('aria-labelledby', 'theCaption');
 				}
@@ -1017,8 +1026,8 @@
 				// show processesing icon
 				if (c.showProcessing) {
 					$table
-					.unbind('sortBegin.tablesorter sortEnd.tablesorter')
-					.bind('sortBegin.tablesorter sortEnd.tablesorter', function(e) {
+					.unbind('sortBegin' + c.namespace + ' sortEnd' + c.namespace)
+					.bind('sortBegin' + c.namespace + ' sortEnd' + c.namespace, function(e) {
 						ts.isProcessing(table, e.type === 'sortBegin');
 					});
 				}
@@ -1084,8 +1093,8 @@
 				$headers
 				// http://stackoverflow.com/questions/5312849/jquery-find-self;
 				.find(c.selectorSort).add( $headers.filter(c.selectorSort) )
-				.unbind('mousedown.tablesorter mouseup.tablesorter sort.tablesorter keyup.tablesorter')
-				.bind('mousedown.tablesorter mouseup.tablesorter sort.tablesorter keyup.tablesorter', function(e, external) {
+				.unbind('mousedown mouseup sort keyup '.split(' ').join(c.namespace + ' '))
+				.bind('mousedown mouseup sort keyup '.split(' ').join(c.namespace + ' '), function(e, external) {
 					var cell, type = e.type;
 					// only recognize left clicks or enter
 					if ( ((e.which || e.button) !== 1 && !/sort|keyup/.test(type)) || (type === 'keyup' && e.which !== 13) ) {
@@ -1146,11 +1155,11 @@
 				// disable tablesorter
 				$t
 					.removeData('tablesorter')
-					.unbind('sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd '.split(' ').join('.tablesorter '));
+					.unbind('sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd '.split(' ').join(c.namespace + ' '));
 				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');
-				$r.find(c.selectorSort).unbind('mousedown.tablesorter mouseup.tablesorter keypress.tablesorter');
+				$r.find(c.selectorSort).unbind('mousedown mouseup keypress '.split(' ').join(c.namespace + ' '));
 				ts.restoreHeaders(table);
 				if (removeClasses !== false) {
 					$t.removeClass(ts.css.table + ' ' + c.tableClass + ' tablesorter-' + c.theme);
@@ -1166,8 +1175,7 @@
 			// regex used in natural sort
 			ts.regex = {
 				chunk : /(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi, // chunk/tokenize numbers & letters
-				schunk: /^\\0/, // start chunk
-				echunk: /\\0$/, // end chunk
+				chunks: /(^\\0|\\0$)/, // replace chunks @ ends
 				hex: /^0x[0-9a-f]+$/i // hex
 			};
 
@@ -1184,8 +1192,8 @@
 					if ( xD > yD ) { return 1; }
 				}
 				// chunk/tokenize
-				xN = a.replace(r.chunk, '\\0$1\\0').replace(r.echunk, '').replace(r.schunk, '').split('\\0');
-				yN = b.replace(r.chunk, '\\0$1\\0').replace(r.echunk, '').replace(r.schunk, '').split('\\0');
+				xN = a.replace(r.chunk, '\\0$1\\0').replace(r.chunks, '').split('\\0');
+				yN = b.replace(r.chunk, '\\0$1\\0').replace(r.chunks, '').split('\\0');
 				mx = Math.max(xN.length, yN.length);
 				// natural sorting through split numeric strings and default strings
 				for (i = 0; i < mx; i++) {

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

@@ -1,4 +1,4 @@
-/*! Filter widget formatter functions - updated 2/19/2014 (v2.15)
+/*! Filter widget formatter functions - updated 3/9/2014 (v2.15.7)
  * requires: tableSorter 2.15+ and jQuery 1.4.3+
  *
  * uiSpinner (jQuery UI spinner)
@@ -73,8 +73,8 @@ tsff = ts.filterFormatter = {
 		// Add a hidden input to hold the range values
 		$input = $('<input class="filter" type="hidden">')
 			.appendTo($cell)
-			// hidden filter update (.tsfilter) namespace trigger by filter widget
-			.bind('change.tsfilter', function(){
+			// hidden filter update namespace trigger by filter widget
+			.bind('change' + c.namespace + 'filter', function(){
 				updateSpinner({ value: this.value, delayed: false });
 			}),
 		$shcell = [],
@@ -230,8 +230,8 @@ tsff = ts.filterFormatter = {
 		// Add a hidden input to hold the range values
 		$input = $('<input class="filter" type="hidden">')
 			.appendTo($cell)
-			// hidden filter update (.tsfilter) namespace trigger by filter widget
-			.bind('change.tsfilter', function(){
+			// hidden filter update namespace trigger by filter widget
+			.bind('change' + c.namespace + 'filter', function(){
 				updateSlider({ value: this.value });
 			}),
 		$shcell = [],
@@ -368,8 +368,8 @@ tsff = ts.filterFormatter = {
 		// Add a hidden input to hold the range values
 		$input = $('<input class="filter" type="hidden">')
 			.appendTo($cell)
-			// hidden filter update (.tsfilter) namespace trigger by filter widget
-			.bind('change.tsfilter', function(){
+			// hidden filter update namespace trigger by filter widget
+			.bind('change' + c.namespace + 'filter', function(){
 				getRange();
 			}),
 		$shcell = [],
@@ -500,8 +500,8 @@ tsff = ts.filterFormatter = {
 		// Add a hidden input to hold the range values
 		$input = $('<input class="dateCompare" type="hidden">')
 			.appendTo($cell)
-			// hidden filter update (.tsfilter) namespace trigger by filter widget
-			.bind('change.tsfilter', function(){
+			// hidden filter update namespace trigger by filter widget
+			.bind('change' + c.namespace + 'filter', function(){
 				var v = this.value;
 				if (v) {
 					o.onClose(v);
@@ -632,8 +632,8 @@ tsff = ts.filterFormatter = {
 		// Add a hidden input to hold the range values
 		$input = $('<input class="dateRange" type="hidden">')
 			.appendTo($cell)
-			// hidden filter update (.tsfilter) namespace trigger by filter widget
-			.bind('change.tsfilter', function(){
+			// hidden filter update namespace trigger by filter widget
+			.bind('change' + c.namespace + 'filter', function(){
 				var v = this.value;
 				if (v.match(' - ')) {
 					v = v.split(' - ');
@@ -940,8 +940,8 @@ tsff = ts.filterFormatter = {
 				.addClass('filter-parsed') // get exact numbers from column
 				// add span to header for the current slider value
 				.find('.tablesorter-header-inner').append('<span class="curvalue" />');
-			// hidden filter update (.tsfilter) namespace trigger by filter widget
-			$input = $cell.find('input[type=hidden]').bind('change.tsfilter', function(){
+			// hidden filter update namespace trigger by filter widget
+			$input = $cell.find('input[type=hidden]').bind('change' + c.namespace + 'filter', function(){
 				/*jshint eqeqeq:false */
 				var v = this.value,
 					compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '';
@@ -1085,8 +1085,8 @@ tsff = ts.filterFormatter = {
 				updateColor( $cell.find('.colorpicker').val() );
 			});
 
-			// hidden filter update (.tsfilter) namespace trigger by filter widget
-			$input = $cell.find('input[type=hidden]').bind('change.tsfilter', function(){
+			// hidden filter update namespace trigger by filter widget
+			$input = $cell.find('input[type=hidden]').bind('change' + c.namespace + 'filter', function(){
 				updateColor( this.value );
 			});
 

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

@@ -1,4 +1,4 @@
-/*! tableSorter 2.8+ widgets - updated 3/7/2014 (v2.15.6)
+/*! tableSorter 2.15+ widgets - updated 3/9/2014 (v2.15.7)
  *
  * Column Styles
  * Column Filters
@@ -125,7 +125,7 @@ ts.storage = function(table, key, value, options) {
 			document.cookie = key + '=' + (JSON.stringify(values)).replace(/\"/g,'\"') + '; expires=' + date.toGMTString() + '; path=/';
 		}
 	} else {
-		return values && values[url] ? values[url][id] : {};
+		return values && values[url] ? values[url][id] : '';
 	}
 };
 
@@ -380,7 +380,7 @@ ts.addWidget({
 		$table
 			.removeClass('hasFilters')
 			// add .tsfilter namespace to all BUT search
-			.unbind('addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join('.tsfilter '))
+			.unbind('addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join(c.namespace + 'filter '))
 			.find('.' + ts.css.filterRow).remove();
 		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
 			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true); // remove tbody
@@ -558,7 +558,7 @@ ts.filter = {
 			ts.filter.buildRow(table, c, wo);
 		}
 
-		c.$table.bind('addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join('.tsfilter '), function(event, filter) {
+		c.$table.bind('addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join(c.namespace + 'filter '), function(event, filter) {
 			c.$table.find('.' + ts.css.filterRow).toggle( !(wo.filter_hideEmpty && $.isEmptyObject(c.cache)) ); // fixes #450
 			if ( !/(search|filter)/.test(event.type) ) {
 				event.stopPropagation();
@@ -628,7 +628,7 @@ ts.filter = {
 
 		// show processing icon
 		if (c.showProcessing) {
-			c.$table.bind('filterStart.tsfilter filterEnd.tsfilter', function(event, columns) {
+			c.$table.bind('filterStart' + c.namespace + 'filter filterEnd' + c.namespace + 'filter', function(event, columns) {
 				// only add processing to certain columns to all columns
 				$header = (columns) ? c.$table.find('.' + ts.css.header).filter('[data-column]').filter(function() {
 					return columns[$(this).data('column')] !== '';
@@ -751,9 +751,9 @@ ts.filter = {
 		$el
 		// use data attribute instead of jQuery data since the head is cloned without including the data/binding
 		.attr('data-lastSearchTime', new Date().getTime())
-		.unbind('keyup search change')
+		.unbind('keyup search change '.split(' ').join(c.namespace + 'filter '))
 		// include change for select - fixes #473
-		.bind('keyup search change', function(event, filters) {
+		.bind('keyup search change '.split(' ').join(c.namespace + 'filter '), function(event, filters) {
 			$(this).attr('data-lastSearchTime', new Date().getTime());
 			// emulate what webkit does.... escape clears the filter
 			if (event.which === 27) {

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

@@ -32,14 +32,18 @@ tsColSel = ts.columnSelector = {
 
 		// build column selector/state array
 		colSel = c.selector = { $container : $(wo.columnSelector_container || '<div>') };
+		colSel.$style = $('<style></style>').prop('disabled', true).appendTo('head');
+		colSel.$breakpoints = $('<style></style>').prop('disabled', true).appendTo('head');
+
+		colSel.isInitializing = true;
 		tsColSel.setupSelector(table, c, wo);
 
 		if (wo.columnSelector_mediaquery) {
 			tsColSel.setupBreakpoints(c, wo);
 		}
 
+		colSel.isInitializing = false;
 		if (colSel.$container.length) {
-			colSel.$style = $('<style></style>').prop('disabled', true).appendTo('head');
 			tsColSel.updateCols(c, wo);
 		}
 
@@ -49,10 +53,13 @@ tsColSel = ts.columnSelector = {
 		var name,
 			colSel = c.selector,
 			$container = colSel.$container,
+			useStorage = wo.columnSelector_saveColumns && ts.storage,
 			// get stored column states
-			saved = wo.columnSelector_saveColumns && ts.storage ? ts.storage( table, 'tablesorter-columnSelector' ) : [];
+			saved = useStorage ? ts.storage( table, 'tablesorter-columnSelector' ) : [],
+			state = useStorage ? ts.storage( table, 'tablesorter-columnSelector-auto') : {};
 
 		// initial states
+		colSel.auto = $.isEmptyObject(state) || $.type(state.auto) !== "boolean" ? wo.columnSelector_mediaqueryState : state.auto;
 		colSel.states = [];
 		colSel.$column = [];
 		colSel.$wrapper = [];
@@ -99,14 +106,13 @@ tsColSel = ts.columnSelector = {
 	},
 
 	setupBreakpoints: function(c, wo){
-		var $auto, colSel = c.selector;
+		var colSel = c.selector;
 
 		// add responsive breakpoints
 		if (wo.columnSelector_mediaquery) {
 			// used by window resize function
 			colSel.lastIndex = -1;
 			wo.columnSelector_breakpoints.sort();
-			colSel.$breakpoints = $('<style></style>').prop('disabled', true).appendTo('head');
 			tsColSel.updateBreakpoints(c, wo);
 			c.$table.unbind('updateAll' + namespace).bind('updateAll' + namespace, function(){
 				tsColSel.updateBreakpoints(c, wo);
@@ -116,22 +122,24 @@ tsColSel = ts.columnSelector = {
 
 		if (colSel.$container.length) {
 			// Add media queries toggle
-			if (wo.columnSelector_mediaquery && wo.columnSelector_mediaquery) {
-				$auto = $( wo.columnSelector_layout.replace(/\{name\}/g, wo.columnSelector_mediaqueryName) ).prependTo(colSel.$container);
-				$auto
+			if (wo.columnSelector_mediaquery) {
+				colSel.$auto = $( wo.columnSelector_layout.replace(/\{name\}/g, wo.columnSelector_mediaqueryName) ).prependTo(colSel.$container);
+				colSel.$auto
 					// needed in case the input in the layout is not wrapped
-					.find('input').add( $auto.filter('input') )
+					.find('input').add( colSel.$auto.filter('input') )
 					.attr('data-column', 'auto')
-					.prop('checked', wo.columnSelector_mediaqueryState)
+					.prop('checked', colSel.auto)
 					.bind('change', function(){
-						wo.columnSelector_mediaqueryState = this.checked;
+						colSel.auto = this.checked;
 						$.each( colSel.$checkbox, function(i, $cb){
 							if ($cb) {
-								$cb[0].disabled = wo.columnSelector_mediaqueryState;
-								colSel.$wrapper[i].toggleClass('disabled', wo.columnSelector_mediaqueryState);
+								$cb[0].disabled = colSel.auto;
+								colSel.$wrapper[i].toggleClass('disabled', colSel.auto);
 							}
 						});
-						tsColSel.updateBreakpoints(c, wo);
+						if (wo.columnSelector_mediaquery) {
+							tsColSel.updateBreakpoints(c, wo);
+						}
 						tsColSel.updateCols(c, wo);
 						// copy the column selector to a popup/tooltip
 						if (c.selector.$popup) {
@@ -139,9 +147,12 @@ tsColSel = ts.columnSelector = {
 								.html( colSel.$container.html() )
 								.find('input').each(function(){
 									var indx = $(this).attr('data-column');
-									$(this).prop( 'checked', indx === 'auto' ? wo.columnSelector_mediaqueryState : colSel.states[indx] );
+									$(this).prop( 'checked', indx === 'auto' ? colSel.auto : colSel.states[indx] );
 								});
 						}
+						if (wo.columnSelector_saveColumns && ts.storage) {
+							ts.storage( c.$table[0], 'tablesorter-columnSelector-auto', { auto : colSel.auto } );
+						}
 					}).change();
 			}
 			// Add a bind on update to re-run col setup
@@ -157,7 +168,7 @@ tsColSel = ts.columnSelector = {
 			prefix = '.' + c.tableId,
 			mediaAll = [],
 			breakpts = '';
-		if (wo.columnSelector_mediaquery && !wo.columnSelector_mediaqueryState) {
+		if (wo.columnSelector_mediaquery && !colSel.auto) {
 			colSel.$breakpoints.prop('disabled', true);
 			colSel.$style.prop('disabled', false);
 			return;
@@ -188,13 +199,14 @@ tsColSel = ts.columnSelector = {
 	},
 
 	updateCols: function(c, wo) {
-		if (wo.columnSelector_mediaquery && wo.columnSelector_mediaqueryState) {
+		if (wo.columnSelector_mediaquery && c.selector.auto || c.selector.isInitializing) {
 			return;
 		}
 		var column,
+			colSel = c.selector,
 			styles = [],
 			prefix = '.' + c.tableId;
-		c.selector.$container.find('input[data-column]').filter('[data-column!="auto"]').each(function(){
+		colSel.$container.find('input[data-column]').filter('[data-column!="auto"]').each(function(){
 			if (!this.checked) {
 				column = parseInt( $(this).attr('data-column'), 10 ) + 1;
 				styles.push(prefix + ' tr th:nth-child(' + column + ')');
@@ -202,13 +214,13 @@ tsColSel = ts.columnSelector = {
 			}
 		});
 		if (wo.columnSelector_mediaquery){
-			c.selector.$breakpoints.prop('disabled', true);
+			colSel.$breakpoints.prop('disabled', true);
 		}
-		if (c.selector.$style) {
-			c.selector.$style.prop('disabled', false).html( styles.length ? styles.join(',') + ' { display: none; }' : '' );
+		if (colSel.$style) {
+			colSel.$style.prop('disabled', false).html( styles.length ? styles.join(',') + ' { display: none; }' : '' );
 		}
 		if (wo.columnSelector_saveColumns && ts.storage) {
-			ts.storage( c.$table[0], 'tablesorter-columnSelector', c.selector.states );
+			ts.storage( c.$table[0], 'tablesorter-columnSelector', colSel.states );
 		}
 	},
 
@@ -228,7 +240,7 @@ tsColSel = ts.columnSelector = {
 				.html( colSel.$container.html() )
 				.find('input').each(function(){
 					var indx = $(this).attr('data-column');
-					$(this).prop( 'checked', indx === 'auto' ? wo.columnSelector_mediaqueryState : colSel.states[indx] );
+					$(this).prop( 'checked', indx === 'auto' ? colSel.auto : colSel.states[indx] );
 				});
 			colSel.$popup = $popup.on('change', 'input', function(){
 				// data input

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

@@ -6,26 +6,85 @@
 /*global jQuery: false */
 ;(function($){
 "use strict";
+var ts = $.tablesorter;
 
-	$.tablesorter.addWidget({
+	ts.addWidget({
 		id: 'headerTitles',
 		options: {
-			headerTitle_prefix  : 'Sort: ',
-			headerTitle_text    : [ 'A - Z', 'Z - A' ],
-			headerTitle_numeric : [ '0 - 9', '9 - 0' ]
+			// use aria-label text
+			// e.g. "First Name: Ascending sort applied, activate to apply a descending sort"
+			headerTitle_useAria  : false,
+			// add tooltip class
+			headerTitle_tooltip  : '',
+			// custom titles [ ascending, descending, unsorted ]
+			headerTitle_cur_text     : [ ' sort: A - Z', ' sort: Z - A', 'ly unsorted' ],
+			headerTitle_cur_numeric  : [ ' sort: 0 - 9', ' sort: 9 - 0', 'ly unsorted' ],
+			headerTitle_nxt_text     : [ ' sort: A - Z', ' sort: Z - A', 'remove sort' ],
+			headerTitle_nxt_numeric  : [ ' sort: 0 - 9', ' sort: 9 - 0', 'remove sort' ],
+
+			// title display; {prefix} adds above prefix
+			// {type} adds the current sort order from above (text or numeric)
+			// {next} adds the next sort direction using the sort order above
+			headerTitle_output_sorted   : 'current{current}; activate to {next}',
+			headerTitle_output_unsorted : 'current{current}; activate to {next} ',
+			headerTitle_output_nosort   : 'No sort available',
+			// use this type to override the parser detection result
+			// e.g. use for numerically parsed columns (e.g. dates), but you
+			// want the user to see a text sort, e.g. [ 'text', 'numeric' ]
+			headerTitle_type     : [],
+			// manipulate the title as desired
+			headerTitle_callback : null // function($cell, txt) { return txt; }
+		},
+		init: function(table, thisWidget, c, wo){
+			// force refresh
+			c.$table.on('refreshHeaderTitle', function(){
+				thisWidget.format(table, c, wo);
+			});
+			// add tooltip class
+			if ($.isArray(wo.headerTitle_tooltip)) {
+				c.$headers.each(function(){
+					$(this).addClass( wo.headerTitle_tooltip[this.column] || '' );
+				});
+			} else if (wo.headerTitle_tooltip !== '') {
+				c.$headers.addClass( wo.headerTitle_tooltip );
+			}
 		},
 		format: function (table, c, wo) {
 			var txt;
-			// clear out all titles
-			c.$headers.attr('title', '');
-			// only add titles to sorted columns
-			$.each(c.sortList, function(indx, group) {
-				txt = wo.headerTitle_prefix + wo['headerTitle_' + (c.parsers[ group[0] ].type || 'text')][ group[1] ];
-				c.$headers.filter('[data-column="' + group[0] + '"]').attr('title', txt);
+			c.$headers.each(function(){
+				var t = this,
+					$this = $(this),
+					sortType = wo.headerTitle_type[t.column] || c.parsers[ t.column ].type || 'text',
+					sortDirection = $this.hasClass(ts.css.sortAsc) ? 0 : $this.hasClass(ts.css.sortDesc) ? 1 : 2,
+					sortNext = t.order[(t.count + 1) % (c.sortReset ? 3 : 2)];
+				if (wo.headerTitle_useAria) {
+					txt = $this.hasClass('sorter-false') ? wo.headerTitle_output_nosort : $this.attr('aria-label') || '';
+				} else {
+					txt = (wo.headerTitle_prefix || '') + // now deprecated
+						($this.hasClass('sorter-false') ? wo.headerTitle_output_nosort :
+						ts.isValueInArray( t.column, c.sortList ) >= 0 ? wo.headerTitle_output_sorted : wo.headerTitle_output_unsorted);
+					txt = txt.replace(/\{(current|next|name)\}/gi, function(m){
+						return {
+							'{name}'    : $this.text(),
+							'{current}' : wo[ 'headerTitle_cur_' + sortType ][ sortDirection ] || '',
+							'{next}'    : wo[ 'headerTitle_nxt_' + sortType ][ sortNext ] || ''
+						}[m.toLowerCase()];
+					});
+				}
+				$this.attr('title', $.isFunction(wo.headerTitle_callback) ? wo.headerTitle_callback($this, txt) : txt);
 			});
 		},
-		remove: function (table, c) {
+		remove: function (table, c, wo) {
 			c.$headers.attr('title', '');
+			c.$table.off('refreshHeaderTitle');
+			// remove tooltip class
+			if ($.isArray(wo.headerTitle_tooltip)) {
+				c.$headers.each(function(){
+					$(this).removeClass( wo.headerTitle_tooltip[this.column] || '' );
+				});
+			} else if (wo.headerTitle_tooltip !== '') {
+				c.$headers.removeClass( wo.headerTitle_tooltip );
+			}
 		}
 	});
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.10.5
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties