jquery-tablesorter 1.16.2 → 1.16.3

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-input-select.js

@@ -1,5 +1,5 @@
-/*! input & select parsers for jQuery 1.7+ & tablesorter 2.7.11+
- * Updated 3/5/2015 (v2.21.0)
+/*! parser: input & select - updated 3/26/2015 (v2.21.3) *//*
+ * for jQuery 1.7+ & tablesorter 2.7.11+
  * Demo: http://mottie.github.com/tablesorter/docs/example-widget-grouping.html
  */
 /*jshint browser: true, jquery:true, unused:false */
@@ -111,7 +111,7 @@
 			// bind to .tablesorter (default class name)
 			$(this).children('tbody')
 			.on('mouseleave', function(e){
-				restoreValue(e.target.tagName === 'TBODY');
+				restoreValue(e.target.nodeName === 'TBODY');
 			})
 			.on('focus', 'select, input, textarea', function(){
 				$(this).data('ts-original-value', this.value);
@@ -129,7 +129,7 @@
 				}
 				// Update cell cache using... select: change, input: enter or textarea: alt + enter
 				if ( ( e.type === 'change' ) ||
-					( e.type === 'keyup' && e.which === 13 && ( e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA' && e.altKey ) ) ) {
+					( e.type === 'keyup' && e.which === 13 && ( e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' && e.altKey ) ) ) {
 					var undef,
 						$tar = $(e.target),
 						$cell = $tar.closest('td'),

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

@@ -1,4 +1,5 @@
-/*! Build Table widget for tableSorter v2.16.0; updated 2/7/2015 (v2.19.0)
+/*! Widget: Build Table - updated 3/26/2015 (v2.21.3) *//*
+ * for tableSorter v2.16.0+
  * by Rob Garrison
  */
 /*jshint browser:true, jquery:true, unused:false */
@@ -12,7 +13,7 @@ var ts = $.tablesorter = $.tablesorter || {},
 	// data.rows contains an array of rows which contains an array of cells
 	bt = ts.buildTable = function(tar, c){
 		// add table if one doesn't exist
-		var $tbl = tar.tagName === 'TABLE' ? $(tar) : $('<table>').appendTo(tar),
+		var $tbl = tar.nodeName === 'TABLE' ? $(tar) : $('<table>').appendTo(tar),
 			table = $tbl[0],
 			wo = c.widgetOptions = $.extend( true, {}, bt.defaults, c.widgetOptions ),
 			p = wo.build_processing,

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

@@ -1,4 +1,4 @@
-/*! Filter widget select2 formatter function - updated 2/7/2015 (v2.19.0)
+/*! Widget: Filter formatter function select2 - updated 3/26/2015 (v2.21.3) *//*
  * 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 */
@@ -52,7 +52,7 @@ ts.filterFormatter.select2 = function($cell, indx, select2Def) {
 			v = v.join('\u0000');
 		}
 		// escape special regex characters (http://stackoverflow.com/a/9310752/145346)
-		v = v.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+		v = v.replace(/[-[\]{}()*+?.,/\\^$|#\s]/g, '\\$&');
 		// convert string back into an array
 		if (arry) {
 			v = v.split('\u0000');

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

@@ -1,14 +1,17 @@
-/*! Widget: filter - updated 3/5/2015 (v2.21.0) *//*
+/*! Widget: filter - updated 3/26/2015 (v2.21.3) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
 ;(function ($) {
 'use strict';
-var ts = $.tablesorter = $.tablesorter || {};
+var ts = $.tablesorter = $.tablesorter || {},
+	tscss = ts.css;
 
-$.extend(ts.css, {
-	filterRow : 'tablesorter-filter-row',
-	filter    : 'tablesorter-filter'
+$.extend(tscss, {
+	filterRow      : 'tablesorter-filter-row',
+	filter         : 'tablesorter-filter',
+	filterDisabled : 'disabled',
+	filterRowHide  : 'hideme'
 });
 
 ts.addWidget({
@@ -58,7 +61,7 @@ ts.addWidget({
 			// add .tsfilter namespace to all BUT search
 			.unbind( events.replace(/\s+/g, ' ') )
 			// remove the filter row even if refreshing, because the column might have been moved
-			.find('.' + ts.css.filterRow).remove();
+			.find('.' + tscss.filterRow).remove();
 		if (refreshing) { return; }
 		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
 			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true); // remove tbody
@@ -286,13 +289,13 @@ ts.filter = {
 		c.$table.bind( txt, function(event, filter) {
 			val = (wo.filter_hideEmpty && $.isEmptyObject(c.cache) && !(c.delayInit && event.type === 'appendCache'));
 			// hide filter row using the "filtered" class name
-			c.$table.find('.' + ts.css.filterRow).toggleClass(wo.filter_filteredRow, val ); // fixes #450
+			c.$table.find('.' + tscss.filterRow).toggleClass(wo.filter_filteredRow, val ); // fixes #450
 			if ( !/(search|filter)/.test(event.type) ) {
 				event.stopPropagation();
 				ts.filter.buildDefault(table, true);
 			}
 			if (event.type === 'filterReset') {
-				c.$table.find('.' + ts.css.filter).add(wo.filter_$externalFilters).val('');
+				c.$table.find('.' + tscss.filter).add(wo.filter_$externalFilters).val('');
 				ts.filter.searching(table, []);
 			} else if (event.type === 'filterEnd') {
 				ts.filter.buildDefault(table, true);
@@ -355,7 +358,7 @@ ts.filter = {
 								options += '<option ' + (txt === val ? '' : 'data-function-name="' + string + '" ') + 'value="' + val + '">' + txt + '</option>';
 							}
 						}
-						c.$table.find('thead').find('select.' + ts.css.filter + '[data-column="' + column + '"]').append(options);
+						c.$table.find('thead').find('select.' + tscss.filter + '[data-column="' + column + '"]').append(options);
 					}
 				}
 			}
@@ -364,7 +367,7 @@ ts.filter = {
 		// it would append the same options twice.
 		ts.filter.buildDefault(table, true);
 
-		ts.filter.bindSearch( table, c.$table.find('.' + ts.css.filter), true );
+		ts.filter.bindSearch( table, c.$table.find('.' + tscss.filter), true );
 		if (wo.filter_external) {
 			ts.filter.bindSearch( table, wo.filter_external );
 		}
@@ -379,7 +382,7 @@ ts.filter = {
 				.unbind( ('filterStart filterEnd '.split(' ').join(c.namespace + 'filter ')).replace(/\s+/g, ' ') )
 				.bind( 'filterStart filterEnd '.split(' ').join(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() {
+				$header = (columns) ? c.$table.find('.' + tscss.header).filter('[data-column]').filter(function() {
 					return columns[$(this).data('column')] !== '';
 				}) : '';
 				ts.isProcessing(table, event.type === 'filterStart', columns ? $header : '');
@@ -493,7 +496,7 @@ ts.filter = {
 			// c.columns defined in computeThIndexes()
 			columns = c.columns,
 			arry = $.isArray(wo.filter_cellFilter),
-			buildFilter = '<tr role="row" class="' + ts.css.filterRow + '">';
+			buildFilter = '<tr role="row" class="' + tscss.filterRow + ' ' + c.cssIgnoreRow + '">';
 		for (column = 0; column < columns; column++) {
 			if (arry) {
 				buildFilter += '<td' + ( wo.filter_cellFilter[column] ? ' class="' + wo.filter_cellFilter[column] + '"' : '' ) + '></td>';
@@ -542,9 +545,9 @@ ts.filter = {
 				name = ( $.isArray(wo.filter_cssFilter) ?
 					(typeof wo.filter_cssFilter[column] !== 'undefined' ? wo.filter_cssFilter[column] || '' : '') :
 					wo.filter_cssFilter ) || '';
-				buildFilter.addClass( ts.css.filter + ' ' + name ).attr('data-column', column);
+				buildFilter.addClass( tscss.filter + ' ' + name ).attr('data-column', column);
 				if (disabled) {
-					buildFilter.attr('placeholder', '').addClass('disabled')[0].disabled = true; // disabled!
+					buildFilter.attr('placeholder', '').addClass(tscss.filterDisabled)[0].disabled = true; // disabled!
 				}
 			}
 		}
@@ -638,7 +641,7 @@ ts.filter = {
 		}
 		if (wo.filter_hideFilters) {
 			// show/hide filter row as needed
-			c.$table.find('.' + ts.css.filterRow).trigger( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
+			c.$table.find('.' + tscss.filterRow).trigger( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
 		}
 		// return if the last search is the same; but filter === false when updating the search
 		// see example-widget-filter.html filter toggle buttons
@@ -664,8 +667,8 @@ ts.filter = {
 	hideFilters: function(table, c) {
 		var $filterRow, $filterRow2, timer;
 		$(table)
-			.find('.' + ts.css.filterRow)
-			.addClass('hideme')
+			.find('.' + tscss.filterRow)
+			.addClass(tscss.filterRowHide)
 			.bind('mouseenter mouseleave', function(e) {
 				// save event object - http://bugs.jquery.com/ticket/12140
 				var event = e;
@@ -673,14 +676,14 @@ ts.filter = {
 				clearTimeout(timer);
 				timer = setTimeout(function() {
 					if ( /enter|over/.test(event.type) ) {
-						$filterRow.removeClass('hideme');
+						$filterRow.removeClass(tscss.filterRowHide);
 					} else {
 						// don't hide if input has focus
 						// $(':focus') needs jQuery 1.6+
 						if ( $(document.activeElement).closest('tr')[0] !== $filterRow[0] ) {
 							// don't hide row if any filter has a value
 							if (c.lastCombinedFilter === '') {
-								$filterRow.addClass('hideme');
+								$filterRow.addClass(tscss.filterRowHide);
 							}
 						}
 					}
@@ -693,7 +696,7 @@ ts.filter = {
 				timer = setTimeout(function() {
 					// don't hide row if any filter has a value
 					if (ts.getFilters(c.$table).join('') === '') {
-						$filterRow2[ event.type === 'focus' ? 'removeClass' : 'addClass']('hideme');
+						$filterRow2[ event.type === 'focus' ? 'removeClass' : 'addClass'](tscss.filterRowHide);
 					}
 				}, 200);
 			});
@@ -1181,7 +1184,7 @@ ts.filter = {
 			// t.data('placeholder') won't work in jQuery older than 1.4.3
 			options = '<option value="">' + ( node.data('placeholder') || node.attr('data-placeholder') || wo.filter_placeholder.select || '' ) + '</option>',
 			// Get curent filter value
-			currentValue = c.$table.find('thead').find('select.' + ts.css.filter + '[data-column="' + column + '"]').val();
+			currentValue = c.$table.find('thead').find('select.' + tscss.filter + '[data-column="' + column + '"]').val();
 		// nothing included in arry (external source), so get the options from filter_selectSource or column data
 		if (typeof arry === 'undefined' || arry === '') {
 			arry = ts.filter.getOptionSource(table, column, onlyAvail);
@@ -1208,7 +1211,7 @@ ts.filter = {
 		}
 
 		// update all selects in the same column (clone thead in sticky headers & any external selects) - fixes 473
-		$filters = ( c.$filters ? c.$filters : c.$table.children('thead') ).find('.' + ts.css.filter);
+		$filters = ( c.$filters ? c.$filters : c.$table.children('thead') ).find('.' + tscss.filter);
 		if (wo.filter_$externalFilters) {
 			$filters = $filters && $filters.length ? $filters.add(wo.filter_$externalFilters) : wo.filter_$externalFilters;
 		}
@@ -1252,7 +1255,7 @@ ts.getFilters = function(table, getRaw, setFilters, skipFirst) {
 	}
 	if (c) {
 		if (c.$filters) {
-			$filters = c.$filters.find('.' + ts.css.filter);
+			$filters = c.$filters.find('.' + tscss.filter);
 		}
 		if (wo.filter_$externalFilters) {
 			$filters = $filters && $filters.length ? $filters.add(wo.filter_$externalFilters) : wo.filter_$externalFilters;

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

@@ -1,4 +1,4 @@
-/* Output widget for TableSorter 3/5/2015 (v2.21.0)
+/*! Widget: Output - updated 3/26/2015 (v2.21.3) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * Modified from:
  * HTML Table to CSV: http://www.kunalbabre.com/projects/table2CSV.php (License unknown?)
@@ -160,7 +160,7 @@ output = ts.output = {
 		// callback; if true returned, continue processing
 		if ($.isFunction(wo.output_callback) && !wo.output_callback(c, mydata)) { return; }
 
-		if ( /p/.test( (wo.output_delivery || '').toLowerCase() ) ) {
+		if ( /p/i.test( wo.output_delivery || '' ) ) {
 			output.popup(mydata, wo.output_popupStyle, outputJSON || outputArray);
 		} else {
 			output.download(wo, mydata);
@@ -314,7 +314,6 @@ ts.addWidget({
 		output_callbackJSON  : function($cell, txt, cellIndex) { return txt + '(' + (cellIndex) + ')'; },
 		// the need to modify this for Excel no longer exists
 		output_encoding      : 'data:application/octet-stream;charset=utf8,'
-
 	},
 	init: function(table, thisWidget, c) {
 		output.init(c);

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

@@ -1,4 +1,7 @@
-/* Pager widget for TableSorter 3/5/2015 (v2.21.0) - requires jQuery 1.7+ */
+/*! Widget: Pager - updated 3/26/2015 (v2.21.3) */
+/* Requires tablesorter v2.8+ and jQuery 1.7+
+ * by Rob Garrison
+ */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($){
 "use strict";
@@ -143,7 +146,7 @@ tsp = ts.pager = {
 				setSize: wo.pager_size,
 				setPage: wo.pager_startPage,
 				events: 'filterInit filterStart filterEnd sortEnd disable enable destroy updateComplete ' +
-					'pageSize pageSet pageAndSize pagerUpdate '
+					'pageSize pageSet pageAndSize pagerUpdate refreshComplete '
 			}, c.pager);
 
 		// pager initializes multiple times before table has completed initialization
@@ -296,9 +299,12 @@ tsp = ts.pager = {
 			})
 			.on('pageSet.pager pagerUpdate.pager', function(e,v){
 				e.stopPropagation();
-				p.page = (parseInt(v, 10) || 1) - 1;
 				// force pager refresh
-				if (e.type === 'pagerUpdate') { p.last.page = true; }
+				if (e.type === 'pagerUpdate') {
+					v = typeof v === 'undefined' ? p.page + 1 : v;
+					p.last.page = true;
+				}
+				p.page = (parseInt(v, 10) || 1) - 1;
 				tsp.moveToPage(table, p, true);
 				tsp.updatePageDisplay(table, c, false);
 			})
@@ -454,7 +460,7 @@ tsp = ts.pager = {
 				p.$goto.html(t).val( p.page + 1 );
 			}
 			if ($out.length) {
-				$out[ ($out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
+				$out[ ($out[0].nodeName === 'INPUT') ? 'val' : 'html' ](s);
 				// rebind startRow/page inputs
 				$out.find('.ts-startRow, .ts-page').off('change.pager').on('change.pager', function(){
 					var v = $(this).val(),

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

@@ -1,176 +1,314 @@
-/*! Widget: resizable */
+/*! Widget: resizable - updated 3/26/2015 (v2.21.3) */
 ;(function ($, window) {
 'use strict';
 var ts = $.tablesorter = $.tablesorter || {};
 
 $.extend(ts.css, {
-	resizer : 'tablesorter-resizer' // resizable
+	resizableContainer : 'tablesorter-resizable-container',
+	resizableHandle    : 'tablesorter-resizable-handle',
+	resizableNoSelect  : 'tablesorter-disableSelection',
+	resizableStorage   : 'tablesorter-resizable'
 });
 
-// this widget saves the column widths if
-// $.tablesorter.storage function is included
-// **************************
-ts.addWidget({
-	id: "resizable",
-	priority: 40,
-	options: {
-		resizable : true,
-		resizable_addLastColumn : false,
-		resizable_widths : [],
-		resizable_throttle : false // set to true (5ms) or any number 0-10 range
+// Add extra scroller css
+$(function(){
+	var s = '<style>' +
+		'body.' + ts.css.resizableNoSelect + ' { -ms-user-select: none; -moz-user-select: -moz-none;' +
+			'-khtml-user-select: none; -webkit-user-select: none; user-select: none; }' +
+		'.' + ts.css.resizableContainer + ' { position: relative; height: 1px; }' +
+		// make handle z-index > than stickyHeader z-index, so the handle stays above sticky header
+		'.' + ts.css.resizableHandle + ' { position: absolute; display: inline-block; width: 8px; top: 1px;' +
+			'cursor: ew-resize; z-index: 3; user-select: none; -moz-user-select: none; }' +
+		'</style>';
+	$(s).appendTo('body');
+});
+
+ts.resizable = {
+	init : function( c, wo ) {
+		if ( c.$table.hasClass( 'hasResizable' ) ) { return; }
+		c.$table.addClass( 'hasResizable' );
+		ts.resizableReset( c.table, true ); // set default widths
+
+		// internal variables
+		wo.resizable_ = {
+			$wrap : c.$table.parent(),
+			mouseXPosition : 0,
+			$target : null,
+			$next : null,
+			overflow : c.$table.parent().css('overflow') === 'auto',
+			fullWidth : Math.abs(c.$table.parent().width() - c.$table.width()) < 20,
+			storedSizes : []
+		};
+
+		var noResize, $header, column, storedSizes,
+			marginTop = parseInt( c.$table.css( 'margin-top' ), 10 );
+
+		wo.resizable_.storedSizes = storedSizes = ( ( ts.storage && wo.resizable !== false ) ?
+			ts.storage( c.table, ts.css.resizableStorage ) :
+			[] ) || [];
+		ts.resizable.setWidths( c, wo, storedSizes );
+
+		wo.$resizable_container = $( '<div class="' + ts.css.resizableContainer + '">' )
+			.css({ top : marginTop })
+			.insertBefore( c.$table );
+		// add container
+		for ( column = 0; column < c.columns; column++ ) {
+			$header = c.$headerIndexed[ column ];
+			noResize = ts.getData( $header, ts.getColumnData( c.table, c.headers, column ), 'resizable' ) === 'false';
+			if ( !noResize ) {
+				$( '<div class="' + ts.css.resizableHandle + '">' )
+					.appendTo( wo.$resizable_container )
+					.attr({
+						'data-column' : column,
+						'unselectable' : 'on'
+					})
+					.data( 'header', $header )
+					.bind( 'selectstart', false );
+			}
+		}
+		c.$table.one('tablesorter-initialized', function() {
+			ts.resizable.setHandlePosition( c, wo );
+			ts.resizable.bindings( this.config, this.config.widgetOptions );
+		});
 	},
-	format: function(table, c, wo) {
-		if (c.$table.hasClass('hasResizable')) { return; }
-		c.$table.addClass('hasResizable');
-		ts.resizableReset(table, true); // set default widths
-		var $rows, $columns, $column, column, timer,
-			storedSizes = {},
-			$table = c.$table,
-			$wrap = $table.parent(),
-			overflow = $table.parent().css('overflow') === 'auto',
-			mouseXPosition = 0,
-			$target = null,
-			$next = null,
-			fullWidth = Math.abs($table.parent().width() - $table.width()) < 20,
-			mouseMove = function(event){
-				if (mouseXPosition === 0 || !$target) { return; }
-				// resize columns
-				var leftEdge = event.pageX - mouseXPosition,
-					targetWidth = $target.width();
-				$target.width( targetWidth + leftEdge );
-				if ($target.width() !== targetWidth && fullWidth) {
-					$next.width( $next.width() - leftEdge );
-				} else if (overflow) {
-					$table.width(function(i, w){
-						return w + leftEdge;
-					});
-					if (!$next.length) {
-						// if expanding right-most column, scroll the wrapper
-						$wrap[0].scrollLeft = $table.width();
-					}
-				}
-				mouseXPosition = event.pageX;
-			},
-			stopResize = function() {
-				if (ts.storage && $target && $next) {
-					storedSizes = {};
-					storedSizes[$target.index()] = $target.width();
-					storedSizes[$next.index()] = $next.width();
-					$target.width( storedSizes[$target.index()] );
-					$next.width( storedSizes[$next.index()] );
-					if (wo.resizable !== false) {
-						// save all column widths
-						ts.storage(table, 'tablesorter-resizable', c.$headers.map(function(){ return $(this).width(); }).get() );
-					}
-				}
-				mouseXPosition = 0;
-				$target = $next = null;
-				$(window).trigger('resize'); // will update stickyHeaders, just in case
-			};
-		storedSizes = (ts.storage && wo.resizable !== false) ? ts.storage(table, 'tablesorter-resizable') : {};
+
+	setWidth : function( $el, width ) {
+		$el.css({
+			'width' : width,
+			'min-width' : '',
+			'max-width' : ''
+		});
+	},
+
+	setWidths : function( c, wo, storedSizes ) {
+		var column,
+			$extra = $( c.namespace + '_extra_headers' ),
+			$col = c.$table.children( 'colgroup' ).children( 'col' );
+		storedSizes = storedSizes || wo.resizable_.storedSizes || [];
 		// process only if table ID or url match
-		if (storedSizes) {
-			for (column in storedSizes) {
-				if (!isNaN(column) && column < c.$headers.length) {
-					c.$headers.eq(column).width(storedSizes[column]); // set saved resizable widths
+		if ( storedSizes.length ) {
+			for ( column = 0; column < c.columns; column++ ) {
+				// set saved resizable widths
+				c.$headers.eq( column ).width( storedSizes[ column ] );
+				if ( $extra.length ) {
+					// stickyHeaders needs to modify min & max width as well
+					ts.resizable.setWidth( $extra.eq( column ).add( $col.eq( column ) ), storedSizes[ column ] );
 				}
 			}
+			if ( $( c.namespace + '_extra_table' ).length && !ts.hasWidget( c.table, 'scroller' ) ) {
+				ts.resizable.setWidth( $( c.namespace + '_extra_table' ), c.$table.outerWidth() );
+			}
 		}
-		$rows = $table.children('thead:first').children('tr');
-		// add resizable-false class name to headers (across rows as needed)
-		$rows.children().each(function() {
-			var canResize,
-				$column = $(this);
-			column = $column.attr('data-column');
-			canResize = ts.getData( $column, ts.getColumnData( table, c.headers, column ), 'resizable') === "false";
-			$rows.children().filter('[data-column="' + column + '"]')[canResize ? 'addClass' : 'removeClass']('resizable-false');
-		});
-		// add wrapper inside each cell to allow for positioning of the resizable target block
-		$rows.each(function() {
-			$column = $(this).children().not('.resizable-false');
-			if (!$(this).find('.' + ts.css.wrapper).length) {
-				// Firefox needs this inner div to position the resizer correctly
-				$column.wrapInner('<div class="' + ts.css.wrapper + '" style="position:relative;height:100%;width:100%"></div>');
+	},
+
+	setHandlePosition : function( c, wo ) {
+		var tableWidth = c.$table.outerWidth(),
+			hasScroller = ts.hasWidget( c.table, 'scroller' ),
+			tableHeight = c.$table.height(),
+			$handles = wo.$resizable_container.children(),
+			handleCenter = Math.floor( $handles.width() / 2 - parseFloat( c.$headers.css( 'border-right-width' ) ) * 2 );
+
+		if ( hasScroller ) {
+			tableHeight = 0;
+			c.$table.closest( '.' + ts.css.scrollerWrap ).children().each(function(){
+				var $this = $(this);
+				// center table has a max-height set
+				tableHeight += $this.filter('[style*="height"]').length ? $this.height() : $this.children('table').height();
+			});
+		}
+		$handles.each( function() {
+			var $this = $(this),
+				column = parseInt( $this.attr( 'data-column' ), 10 ),
+				columns = c.columns - 1,
+				$header = $this.data( 'header' );
+			if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
+				$this.css({
+					height : tableHeight,
+					left : $header.position().left + $header.width() - handleCenter
+				});
 			}
-			// don't include the last column of the row
-			if (!wo.resizable_addLastColumn) { $column = $column.slice(0,-1); }
-			$columns = $columns ? $columns.add($column) : $column;
 		});
-		$columns
-		.each(function() {
-			var $column = $(this),
-				padding = parseInt($column.css('padding-right'), 10) + 10; // 10 is 1/2 of the 20px wide resizer
-			$column
-				.find('.' + ts.css.wrapper)
-				.append('<div class="' + ts.css.resizer + '" style="cursor:w-resize;position:absolute;z-index:1;right:-' +
-					padding + 'px;top:0;height:100%;width:20px;"></div>');
-		})
-		.find('.' + ts.css.resizer)
-		.bind('mousedown', function(event) {
+	},
+
+	// prevent text selection while dragging resize bar
+	toggleTextSelection : function( c, toggle ) {
+		var namespace = c.namespace + 'tsresize';
+		c.widgetOptions.resizable_.disabled = toggle;
+		$( 'body' ).toggleClass( ts.css.resizableNoSelect, toggle );
+		if ( toggle ) {
+			$( 'body' )
+				.attr( 'unselectable', 'on' )
+				.bind( 'selectstart' + namespace, false );
+		} else {
+			$( 'body' )
+				.removeAttr( 'unselectable' )
+				.unbind( 'selectstart' + namespace );
+		}
+	},
+
+	bindings : function( c, wo ) {
+		var namespace = c.namespace + 'tsresize';
+		wo.$resizable_container.children().bind( 'mousedown', function( event ) {
 			// save header cell and mouse position
-			$target = $(event.target).closest('th');
-			var $header = c.$headers.filter('[data-column="' + $target.attr('data-column') + '"]');
-			if ($header.length > 1) { $target = $target.add($header); }
+			var column,
+				vars = wo.resizable_,
+				$extras = $( c.namespace + '_extra_headers' ),
+				$header = $( event.target ).data( 'header' );
+
+			column = parseInt( $header.attr( 'data-column' ), 10 );
+			vars.$target = $header = $header.add( $extras.filter('[data-column="' + column + '"]') );
+			vars.target = column;
+
 			// if table is not as wide as it's parent, then resize the table
-			$next = event.shiftKey ? $target.parent().find('th').not('.resizable-false').filter(':last') : $target.nextAll(':not(.resizable-false)').eq(0);
-			mouseXPosition = event.pageX;
+			vars.$next = event.shiftKey || wo.resizable_targetLast ?
+				$header.parent().children().not( '.resizable-false' ).filter( ':last' ) :
+				$header.nextAll( ':not(.resizable-false)' ).eq( 0 );
+
+			column = parseInt( vars.$next.attr( 'data-column' ), 10 );
+			vars.$next = vars.$next.add( $extras.filter('[data-column="' + column + '"]') );
+			vars.next = column;
+
+			vars.mouseXPosition = event.pageX;
+			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			ts.resizable.toggleTextSelection( c, true );
 		});
-		$(document)
-		.bind('mousemove.tsresize', function(event) {
-			// ignore mousemove if no mousedown
-			if (mouseXPosition === 0 || !$target) { return; }
-			if (wo.resizable_throttle) {
-				clearTimeout(timer);
-				timer = setTimeout(function(){
-					mouseMove(event);
-				}, isNaN(wo.resizable_throttle) ? 5 : wo.resizable_throttle );
-			} else {
-				mouseMove(event);
-			}
-		})
-		.bind('mouseup.tsresize', function() {
-			stopResize();
+
+		$( document )
+			.bind( 'mousemove' + namespace, function( event ) {
+				var vars = wo.resizable_;
+				// ignore mousemove if no mousedown
+				if ( !vars.disabled || vars.mouseXPosition === 0 || !vars.$target ) { return; }
+				if ( wo.resizable_throttle ) {
+					clearTimeout( vars.timer );
+					vars.timer = setTimeout( function() {
+						ts.resizable.mouseMove( c, wo, event );
+					}, isNaN( wo.resizable_throttle ) ? 5 : wo.resizable_throttle );
+				} else {
+					ts.resizable.mouseMove( c, wo, event );
+				}
+			})
+			.bind( 'mouseup' + namespace, function() {
+				if (!wo.resizable_.disabled) { return; }
+				ts.resizable.toggleTextSelection( c, false );
+				ts.resizable.stopResize( c, wo );
+				ts.resizable.setHandlePosition( c, wo );
+			});
+
+		// resizeEnd event triggered by scroller widget
+		$( window ).bind( 'resize' + namespace + ' resizeEnd' + namespace, function() {
+			ts.resizable.setHandlePosition( c, wo );
 		});
 
 		// right click to reset columns to default widths
-		$table.find('thead:first').bind('contextmenu.tsresize', function() {
-			ts.resizableReset(table);
+		c.$table.find( 'thead:first' ).add( $( c.namespace + '_extra_table' ).find( 'thead:first' ) )
+		.bind( 'contextmenu' + namespace, function() {
 			// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
-			var allowClick = $.isEmptyObject ? $.isEmptyObject(storedSizes) : true;
-			storedSizes = {};
+			var allowClick = wo.resizable_.storedSizes.length === 0;
+			ts.resizableReset( c.table );
+			ts.resizable.setHandlePosition( c, wo );
+			wo.resizable_.storedSizes = [];
 			return allowClick;
 		});
+
 	},
-	remove: function(table, c) {
-		c.$table
-			.removeClass('hasResizable')
-			.children('thead')
-			.unbind('mouseup.tsresize mouseleave.tsresize contextmenu.tsresize')
-			.children('tr').children()
-			.unbind('mousemove.tsresize mouseup.tsresize')
-			// don't remove "tablesorter-wrapper" as uitheme uses it too
-			.find('.' + ts.css.resizer).remove();
-		ts.resizableReset(table);
+
+	mouseMove : function( c, wo, event ) {
+		if ( wo.resizable_.mouseXPosition === 0 || !wo.resizable_.$target ) { return; }
+		// resize columns
+		var vars = wo.resizable_,
+			$target = vars.$target,
+			$next = vars.$next,
+			leftEdge = event.pageX - vars.mouseXPosition,
+			targetWidth = $target.width();
+		if ( vars.fullWidth ) {
+			vars.storedSizes[ vars.target ] += leftEdge;
+			vars.storedSizes[ vars.next ] -= leftEdge;
+			ts.resizable.setWidths( c, wo );
+
+		} else if ( vars.overflow ) {
+			c.$table.add( $( c.namespace + '_extra_table' ) ).width(function(i, w){
+				return w + leftEdge;
+			});
+			if ( !$next.length ) {
+				// if expanding right-most column, scroll the wrapper
+				vars.$wrap[0].scrollLeft = c.$table.width();
+			}
+		} else {
+			vars.storedSizes[ vars.target ] += leftEdge;
+			ts.resizable.setWidths( c, wo );
+		}
+		vars.mouseXPosition = event.pageX;
+	},
+
+	stopResize : function( c, wo ) {
+		var vars = wo.resizable_;
+		vars.storedSizes = [];
+		if ( ts.storage ) {
+			vars.storedSizes = c.$headers.map(function(){ return $(this).width(); }).get();
+			if ( wo.resizable !== false ) {
+				// save all column widths
+				ts.storage( c.table, ts.css.resizableStorage, vars.storedSizes );
+			}
+		}
+		vars.mouseXPosition = 0;
+		vars.$target = vars.$next = null;
+		$(window).trigger('resize'); // will update stickyHeaders, just in case
+	}
+};
+
+// this widget saves the column widths if
+// $.tablesorter.storage function is included
+// **************************
+ts.addWidget({
+	id: "resizable",
+	priority: 40,
+	options: {
+		resizable : true,
+		resizable_addLastColumn : false,
+		resizable_widths : [],
+		resizable_throttle : false, // set to true (5ms) or any number 0-10 range
+		resizable_targetLast : false
+	},
+	init: function(table, thisWidget, c, wo) {
+		ts.resizable.init( c, wo );
+	},
+	remove: function( table, c, wo ) {
+		if (wo.$resizable_container) {
+			var namespace = c.namespace + 'tsresize';
+			c.$table.add( $( c.namespace + '_extra_table' ) )
+				.removeClass('hasResizable')
+				.children( 'thead' ).unbind( 'contextmenu' + namespace );
+
+				wo.$resizable_container.remove();
+			ts.resizable.toggleTextSelection( c, false );
+			ts.resizableReset( table );
+			$( document ).unbind( 'mousemove' + namespace + ' mouseup' + namespace );
+		}
 	}
 });
-ts.resizableReset = function(table, nosave) {
-	$(table).each(function(){
+
+ts.resizableReset = function( table, nosave ) {
+	$( table ).each(function(){
 		var $t,
 			c = this.config,
 			wo = c && c.widgetOptions;
-		if (table && c) {
-			c.$headers.each(function(i){
+		if ( table && c ) {
+			c.$headers.each( function( i ) {
 				$t = $(this);
-				if (wo.resizable_widths && wo.resizable_widths[i]) {
-					$t.css('width', wo.resizable_widths[i]);
-				} else if (!$t.hasClass('resizable-false')) {
+				if ( wo.resizable_widths && wo.resizable_widths[ i ] ) {
+					$t.css( 'width', wo.resizable_widths[ i ] );
+				} else if ( !$t.hasClass( 'resizable-false' ) ) {
 					// don't clear the width of any column that is not resizable
-					$t.css('width','');
+					$t.css( 'width', '' );
 				}
 			});
-			if (ts.storage && !nosave) { ts.storage(this, 'tablesorter-resizable', {}); }
+			// reset stickyHeader widths
+			$( window ).trigger( 'resize' );
+			if ( ts.storage && !nosave ) {
+				ts.storage( this, ts.css.resizableStorage, {} );
+			}
 		}
 	});
 };
 
-})(jQuery, window);
+})( jQuery, window );