jquery-tablesorter 1.16.5 → 1.17.0

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

@@ -2,12 +2,12 @@
 /* Extract dates using popular natural language date parsers */
 /*jshint jquery:true */
 ;(function($){
-"use strict";
+'use strict';
 
 	/*! Sugar (http://sugarjs.com/dates#comparing_dates) */
 	/* demo: http://jsfiddle.net/Mottie/abkNM/4163/ */
 	$.tablesorter.addParser({
-		id: "sugar",
+		id: 'sugar',
 		is: function() {
 			return false;
 		},
@@ -15,13 +15,13 @@
 			var date = Date.create ? Date.create(s) : s ? new Date(s) : s;
 			return date instanceof Date && isFinite(date) ? date.getTime() : s;
 		},
-		type: "numeric"
+		type: 'numeric'
 	});
 
 	/*! Datejs (http://www.datejs.com/) */
 	/* demo: http://jsfiddle.net/Mottie/abkNM/4164/ */
 	$.tablesorter.addParser({
-		id: "datejs",
+		id: 'datejs',
 		is: function() {
 			return false;
 		},
@@ -29,7 +29,7 @@
 			var date = Date.parse ? Date.parse(s) : s ? new Date(s) : s;
 			return date instanceof Date && isFinite(date) ? date.getTime() : s;
 		},
-		type: "numeric"
+		type: 'numeric'
 	});
 
 })(jQuery);

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

@@ -0,0 +1,46 @@
+/*! Parser: jQuery Globalize - updated 5/17/2015 (v2.22.0) */
+/* Extract localized data using jQuery's Globalize parsers; set
+ Globalize.locale( 'xx' ) prior to initializing tablesorter! */
+/*jshint jquery:true */
+;( function( $ ) {
+'use strict';
+
+	/*! jQuery Globalize date parser (https://github.com/jquery/globalize#date-module) */
+	/* demo: http://jsfiddle.net/Mottie/0j18Lw8r/ */
+	$.tablesorter.addParser({
+		id: 'globalize-date',
+		is: function () {
+			return false;
+		},
+		format: function ( str, table, cell, cellIndex ) {
+			var c = table.config,
+			// add options to 'config.globalize' for all columns --> globalize : { skeleton: 'GyMMMd' }
+			// or per column by using the column index --> globalize : { 0 : { datetime: 'medium' } }
+			options = c.globalize && ( c.globalize[ cellIndex ] || c.globalize ) || {},
+			date = Globalize && Globalize.dateParser ? Globalize.dateParser( options )( str ) :
+				str ? new Date( str ) : str;
+			return date instanceof Date && isFinite( date ) ? date.getTime() : str;
+		},
+		type: 'numeric'
+	});
+
+	/*! jQuery Globalize number parser (https://github.com/jquery/globalize#number-module) */
+	/* demo: http://jsfiddle.net/Mottie/0j18Lw8r/ */
+	$.tablesorter.addParser({
+		id: 'globalize-number',
+		is: function () {
+			return false;
+		},
+		format: function ( str, table, cell, cellIndex ) {
+			var c = table.config,
+			// add options to 'config.globalize' for all columns --> globalize : { skeleton: 'GyMMMd' }
+			// or per column by using the column index --> globalize : { 0 : { datetime: 'medium' } }
+			options = c.globalize && ( c.globalize[ cellIndex ] || c.globalize ) || {},
+			num = Globalize && Globalize.numberParser ? Globalize.numberParser( options )( str ) :
+				str ? $.tablesorter.formatFloat( ( str || '' ).replace( /[^\w,. \-()]/g, '' ), table ) : str;
+			return str && typeof num === 'number' ? num : str;
+		},
+		type: 'numeric'
+	});
+
+})( jQuery );

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

@@ -1,12 +1,12 @@
-/*! Parser: input & select - updated 3/26/2015 (v2.21.3) *//*
+/*! Parser: input & select - updated 5/17/2015 (v2.22.0) *//*
  * 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 */
-;(function($){
-"use strict";
+;( function( $ ) {
+'use strict';
 
-	var updateServer = function(event, $table, $input){
+	var updateServer = function( event, $table, $input ) {
 		// do something here to update your server, if needed
 		// event = change event object
 		// $table = jQuery object of the table that was just updated
@@ -14,140 +14,164 @@
 	};
 
 	// Custom parser for parsing input values
-	// updated dynamically using the "change" function below
+	// updated dynamically using the 'change' function below
 	$.tablesorter.addParser({
-		id: "inputs",
-		is: function(){
+		id : 'inputs',
+		is : function() {
 			return false;
 		},
-		format: function(s, table, cell) {
-			return $(cell).find('input').val() || s;
+		format : function( txt, table, cell ) {
+			var $input = $( cell ).find( 'input' );
+			return $input.length ? $input.val() : txt;
 		},
 		parsed : true, // filter widget flag
-		type: "text"
+		type : 'text'
+	});
+
+	$.tablesorter.addParser({
+		id : 'inputs-numeric',
+		is : function() {
+			return false;
+		},
+		format : function( txt, table, cell ) {
+			var $input = $( cell ).find( 'input' );
+			var val = $input.length ? $input.val() : txt,
+				num = $.tablesorter.formatFloat( ( val || '' ).replace( /[^\w,. \-()]/g, '' ), table );
+			return txt && typeof num === 'number' ? num :
+				txt ? $.trim( txt && table.config.ignoreCase ? txt.toLocaleLowerCase() : txt ) : txt;
+		},
+		parsed : true, // filter widget flag
+		type : 'numeric'
 	});
 
 	// Custom parser for including checkbox status if using the grouping widget
-	// updated dynamically using the "change" function below
+	// updated dynamically using the 'change' function below
 	$.tablesorter.addParser({
-		id: "checkbox",
-		is: function(){
+		id : 'checkbox',
+		is : function() {
 			return false;
 		},
-		format: function(s, table, cell, cellIndex) {
-			var $c = $(cell),
+		format : function( txt, table, cell, cellIndex ) {
+			var $cell = $( cell ),
 				wo = table.config.widgetOptions,
 				// returning plain language here because this is what is shown in the
 				// group headers - change it as desired
-				txt = wo.group_checkbox ? wo.group_checkbox : [ 'checked', 'unchecked' ],
-				$input = $c.find('input[type="checkbox"]'),
-				isChecked = $input.length ? $input[0].checked : '';
+				status = wo.group_checkbox ? wo.group_checkbox : [ 'checked', 'unchecked' ],
+				$input = $cell.find( 'input[type="checkbox"]' ),
+				isChecked = $input.length ? $input[ 0 ].checked : '';
 			// adding class to row, indicating that a checkbox is checked; includes
 			// a column index in case more than one checkbox happens to be in a row
-			$c.closest('tr').toggleClass('checked-' + cellIndex, isChecked);
-			return $input.length ? txt[ isChecked ? 0 : 1 ] : s;
+			$cell.closest( 'tr' ).toggleClass( 'checked checked-' + cellIndex, isChecked );
+			return $input.length ? status[ isChecked ? 0 : 1 ] : txt;
 		},
 		parsed : true, // filter widget flag
-		type: "text"
+		type : 'text'
 	});
 
 	// Custom parser which returns the currently selected options
-	// updated dynamically using the "change" function below
+	// updated dynamically using the 'change' function below
 	$.tablesorter.addParser({
-		id: "select",
-		is: function(){
+		id : 'select',
+		is : function() {
 			return false;
 		},
-		format: function(s, table, cell) {
-			return $(cell).find('select').val() || s;
+		format : function( txt, table, cell ) {
+			var $select = $( cell ).find( 'select' );
+			return $select.length ? $select.val() : txt;
 		},
 		parsed : true, // filter widget flag
-		type: "text"
+		type : 'text'
 	});
 
 	// Select parser to get the selected text
 	$.tablesorter.addParser({
-		id: "select-text",
-		is: function(){
+		id : 'select-text',
+		is : function() {
 			return false;
 		},
-		format: function(s, table, cell) {
-			var $s = $(cell).find('select');
-			return $s.length ? $s.find('option:selected').text() || '' : s;
+		format : function( txt, table, cell ) {
+			var $select = $( cell ).find( 'select' );
+			return $select.length ? $select.find( 'option:selected' ).text() || '' : txt;
 		},
 		parsed : true, // filter widget flag
-		type: "text"
+		type : 'text'
 	});
 
 	// Custom parser for parsing textarea values
-	// updated dynamically using the "change" function below
+	// updated dynamically using the 'change' function below
 	$.tablesorter.addParser({
-		id: "textarea",
-		is: function(){
+		id : 'textarea',
+		is : function() {
 			return false;
 		},
-		format: function(s, table, cell) {
-			return $(cell).find('textarea').val() || s;
+		format : function( txt, table, cell ) {
+			var $textarea = $( cell ).find( 'textarea' );
+			return $textarea.length ? $textarea.val() : txt;
 		},
 		parsed : true, // filter widget flag
-		type: "text"
+		type : 'text'
 	});
 
 	// update select and all input types in the tablesorter cache when the change event fires.
 	// This method only works with jQuery 1.7+
 	// you can change it to use delegate (v1.4.3+) or live (v1.3+) as desired
 	// if this code interferes somehow, target the specific table $('#mytable'), instead of $('table')
-	$(function(){
-		$('table').on('tablesorter-initialized', function(){
-			var restoreValue = function(isTbody){
+	$( function() {
+		$( 'table' ).on( 'tablesorter-initialized updateComplete', function() {
+			var namespace = '.parser-forms',
+			restoreValue = function( isTbody ) {
 				// make sure we restore original values (trigger blur)
 				// isTbody is needed to prevent the select from closing in IE
 				// see https://connect.microsoft.com/IE/feedbackdetail/view/962618/
-				if (isTbody) {
-					$(':focus').blur();
+				if ( isTbody ) {
+					$( ':focus' ).blur();
 				}
 				return;
 			};
 			// bind to .tablesorter (default class name)
-			$(this).children('tbody')
-			.on('mouseleave', function(e){
-				restoreValue(e.target.nodeName === 'TBODY');
+			$( this ).children( 'tbody' )
+			.off( namespace )
+			.on( 'mouseleave' + namespace, function( event ) {
+				restoreValue( event.target.nodeName === 'TBODY' );
 			})
-			.on('focus', 'select, input, textarea', function(){
-				$(this).data('ts-original-value', this.value);
+			.on( 'focus' + namespace, 'select, input, textarea', function() {
+				$( this ).data( 'ts-original-value', this.value );
 			})
-			.on('blur', 'input, textarea', function(){
+			.on( 'blur' + namespace, 'input, textarea', function() {
 				// restore input value;
-				// "change" is triggered before "blur" so this doesn't replace the new update with the original
-				this.value = $(this).data('ts-original-value');
+				// 'change' is triggered before 'blur' so this doesn't replace the new update with the original
+				this.value = $( this ).data( 'ts-original-value' );
 			})
-			.on('change keyup', 'select, input, textarea', function(e){
-				if ( e.which === 27 ) {
+			.on( 'change keyup '.split( ' ' ).join( namespace + ' ' ), 'select, input, textarea', function( event ) {
+				if ( event.which === 27 ) {
 					// escape: restore original value
-					this.value = $(this).data('ts-original-value');
+					this.value = $( this ).data( 'ts-original-value' );
 					return;
 				}
 				// Update cell cache using... select: change, input: enter or textarea: alt + enter
-				if ( ( e.type === 'change' ) ||
-					( e.type === 'keyup' && e.which === 13 && ( e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' && e.altKey ) ) ) {
+				if ( event.type === 'change' ||
+					( event.type === 'keyup' && event.which === 13 &&
+					( event.target.nodeName === 'INPUT' || event.target.nodeName === 'TEXTAREA' && event.altKey ) ) ) {
 					var undef,
-						$tar = $(e.target),
-						$cell = $tar.closest('td'),
-						$table = $cell.closest('table'),
-						indx = $cell[0].cellIndex,
-						c = $table[0].config || false,
-						$hdr = c && c.$headers && c.$headers.eq(indx);
-					// abort if not a tablesorter table, or
-					// don't use updateCell if column is set to "sorter-false" and "filter-false", or column is set to "parser-false"
-					if ( !c || ( $hdr && $hdr.length && ( $hdr.hasClass('parser-false') || ( $hdr.hasClass('sorter-false') && $hdr.hasClass('filter-false') ) ) ) ) {
-						return restoreValue();
+						$target = $( event.target ),
+						$cell = $target.closest( 'td' ),
+						$table = $cell.closest( 'table' ),
+						indx = $cell[ 0 ].cellIndex,
+						c = $table[ 0 ].config || false,
+						$hdr = c && c.$headerIndexed && c.$headerIndexed[ indx ] || [],
+						val = $target.val();
+					// abort if not a tablesorter table, or don't use updateCell if column is set
+					// to 'sorter-false' and 'filter-false', or column is set to 'parser-false'
+					if ( $hdr.length && ( $hdr.hasClass( 'parser-false' ) ||
+						( $hdr.hasClass( 'sorter-false' ) && $hdr.hasClass( 'filter-false' ) ) ) ) {
+						return;
 					}
 					// ignore change event if nothing changed
-					if ($tar.val() !== $tar.data('ts-original-value') || e.target.type === 'checkbox') {
-						$tar.data('ts-original-value', $tar.val());
+					if ( val !== $target.data( 'ts-original-value' ) || event.target.type === 'checkbox' ) {
+						$target.data( 'ts-original-value', val );
 						// pass undefined resort value so it falls back to config.resort setting
-						$table.trigger('updateCell', [ $tar.closest('td'), undef, function(){
-							updateServer(e, $table, $tar);
+						$table.trigger( 'updateCell', [ $cell, undef, function() {
+							updateServer( event, $table, $target );
 						} ]);
 					}
 				}
@@ -155,4 +179,4 @@
 		});
 	});
 
-})(jQuery);
+})( jQuery );

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-named-numbers.js

@@ -81,12 +81,13 @@
 	},
 	result, group,
 	negativeRegex = new RegExp('(' + named.negative.join('|') + ')'),
-	calc = function ( word, table ) {
-		var num = named.numbers.hasOwnProperty( word ) ? named.numbers[ word ] : null,
+	calc = function ( rawWord, table ) {
+		// remove extra characters that might be next to the word
+		var word = rawWord.replace( /[,."']/g, '' ),
+			// formatFloat will deal with the commas & decimals in the number format
+			num = $.tablesorter.formatFloat( rawWord || '', table ),
 			power = named.powers.hasOwnProperty( word ) ? named.powers[ word ] : null;
-		if ( !num && !isNaN( word ) ) {
-			num = $.tablesorter.formatFloat( word || '', table );
-		}
+		num = typeof num === 'number' ? num : named.numbers.hasOwnProperty( word ) ? named.numbers[ word ] : null;
 		if ( num !== null ) {
 			group += num;
 		} else if ( word === named.hundred ) {

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

@@ -1,8 +1,8 @@
-/*! Parser: network - updated 10/26/2014 (v2.18.0) */
+/*! Parser: network - updated 5/17/2015 (v2.22.0) */
 /* IPv4, IPv6 and MAC Addresses */
 /*global jQuery: false */
 ;(function($){
-	"use strict";
+	'use strict';
 
 	var ts = $.tablesorter,
 		ipv4Format,
@@ -10,8 +10,8 @@
 
 	/*! IPv6 Address parser (WIP) *//*
 	* IPv6 Address (ffff:0000:0000:0000:0000:0000:0000:0000)
-	* needs to support short versions like "::8" or "1:2::7:8"
-	* and "::00:192.168.10.184" (embedded IPv4 address)
+	* needs to support short versions like '::8' or '1:2::7:8'
+	* and '::00:192.168.10.184' (embedded IPv4 address)
 	* see http://www.intermapper.com/support/tools/IPV6-Validator.aspx
 	*/
 	$.extend( ts.regex, {}, {
@@ -93,7 +93,7 @@
 	};
 
 	/*! Parser: ipv4Address (a.k.a. ipAddress) */
-	// duplicate "ipAddress" as "ipv4Address" (to maintain backwards compatility)
+	// duplicate 'ipAddress' as 'ipv4Address' (to maintain backwards compatility)
 	ts.addParser({
 		id: 'ipAddress',
 		is: ipv4Is,
@@ -108,21 +108,30 @@
 	});
 
 	/*! Parser: MAC address */
+	/* MAC examples: 12:34:56:78:9A:BC, 1234.5678.9ABC, 12-34-56-78-9A-BC, and 123456789ABC
+	*/
 	ts.addParser({
-		id: 'MAC',
-		is: function(s) {
-			return ts.regex.ipv6Validate.test(s);
+		id : 'MAC',
+		is : function( str ) {
+			return false;
 		},
-		format: function(s) {
-			var t = '',
-				val = s.replace(/[:.-]/g, '').match(/\w{2}/g);
-			$.each(val, function(i, v){
-				t += ( '000' + parseInt(v, 16) ).slice(-3);
-			});
-			return t;
+		format : function( str ) {
+			var indx, len,
+				mac = '',
+				val = ( str || '' ).replace( /[:.-]/g, '' ).match( /\w{2}/g );
+			if ( val ) {
+				// not assuming all mac addresses in the column will end up with six
+				// groups of two to process, so it's not actually validating the address
+				len = val.length;
+				for ( indx = 0; indx < len; indx++ ) {
+					mac += ( '000' + parseInt( val[ indx ], 16 ) ).slice( -3 );
+				}
+				return mac;
+			}
+			return str;
 		},
 		// uses natural sort hex compare
-		type: 'numeric'
+		type : 'numeric'
 	});
 
-})(jQuery);
+})( jQuery );

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

@@ -1,7 +1,7 @@
 /*! Widget: columns */
 ;(function ($) {
 'use strict';
-var ts = $.tablesorter = $.tablesorter || {};
+var ts = $.tablesorter || {};
 
 ts.addWidget({
 	id: "columns",

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

@@ -1,4 +1,4 @@
-/*! Widget: editable - updated 2/9/2015 (v2.19.1) *//*
+/*! Widget: editable - updated 5/17/2015 (v2.22.0) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -8,10 +8,13 @@
 	'use strict';
 
 var tse = $.tablesorter.editable = {
+	namespace : '.tseditable',
+	// last edited class name
+	lastEdited: 'tseditable-last-edited-cell',
 
 	editComplete: function( c, wo, $cell, refocus ) {
 		$cell
-			.removeClass( 'tseditable-last-edited-cell' )
+			.removeClass( tse.lastEdited )
 			.trigger( wo.editable_editComplete, [ c ] );
 		// restore focus last cell after updating
 		if ( refocus ) {
@@ -25,16 +28,23 @@ var tse = $.tablesorter.editable = {
 		setTimeout( function() {
 			// select all text in contenteditable
 			// see http://stackoverflow.com/a/6150060/145346
-			var sel, range = document.createRange();
-			range.selectNodeContents( cell );
-			sel = window.getSelection();
-			sel.removeAllRanges();
-			sel.addRange( range );
+			var range, selection;
+			if ( document.body.createTextRange ) {
+				range = document.body.createTextRange();
+				range.moveToElementText( cell );
+				range.select();
+			} else if ( window.getSelection ) {
+				selection = window.getSelection();
+				range = document.createRange();
+				range.selectNodeContents( cell );
+				selection.removeAllRanges();
+				selection.addRange( range );
+			}
 		}, 100 );
 	},
 
-	update: function( c, wo ) {
-		var indx, tmp, $t,
+	getColumns : function( c, wo ) {
+		var indx, tmp,
 			colIndex = [],
 			cols = [];
 		if ( !wo.editable_columnsArray && $.type( wo.editable_columns ) === 'string' && wo.editable_columns.indexOf( '-' ) >= 0 ) {
@@ -61,22 +71,33 @@ var tse = $.tablesorter.editable = {
 			wo.editable_columnsArray = colIndex;
 			wo.editable_columnsArray.sort(function(a,b){ return a - b; });
 		}
-		tmp = $( '<div>' ).wrapInner( wo.editable_wrapContent ).children().length || $.isFunction( wo.editable_wrapContent );
+		return cols;
+	},
+
+	update: function( c, wo ) {
+		var $t,
+			tmp = $( '<div>' ).wrapInner( wo.editable_wrapContent ).children().length || $.isFunction( wo.editable_wrapContent ),
+			cols = tse.getColumns( c, wo ).join( ',' );
+
+		// turn off contenteditable to allow dynamically setting the wo.editable_noEdit
+		// class on table cells - see issue #900
+		c.$tbodies.find( cols ).find( '[contenteditable]' ).prop( 'contenteditable', false );
+
 		// IE does not allow making TR/TH/TD cells directly editable ( issue #404 )
 		// so add a div or span inside ( it's faster than using wrapInner() )
-		c.$tbodies.find( cols.join( ',' ) ).not( '.' + wo.editable_noEdit ).each( function() {
+		c.$tbodies.find( cols ).not( '.' + wo.editable_noEdit ).each( function() {
 			// test for children, if they exist, then make the children editable
 			$t = $( this );
 
-			if ( tmp && $t.children().length === 0 ) {
+			if ( tmp && $t.children( 'div, span' ).length === 0 ) {
 				$t.wrapInner( wo.editable_wrapContent );
 			}
-			if ( $t.children().length ) {
-				// make all children content editable
-				$t.children().not( '.' + wo.editable_noEdit ).each( function() {
+			if ( $t.children( 'div, span' ).length ) {
+				// make div/span children content editable
+				$t.children( 'div, span' ).not( '.' + wo.editable_noEdit ).each( function() {
 					var $this = $( this );
 					if ( wo.editable_trimContent ) {
-						$this.text( function( i, txt ) {
+						$this.html( function( i, txt ) {
 							return $.trim( txt );
 						});
 					}
@@ -84,7 +105,7 @@ var tse = $.tablesorter.editable = {
 				});
 			} else {
 				if ( wo.editable_trimContent ) {
-					$t.text( function( i, txt ) {
+					$t.html( function( i, txt ) {
 						return $.trim( txt );
 					});
 				}
@@ -94,36 +115,45 @@ var tse = $.tablesorter.editable = {
 	},
 
 	bindEvents: function( c, wo ) {
+		var namespace = tse.namespace;
 		c.$table
-			.off( ( 'updateComplete pagerComplete '.split( ' ' ).join( '.tseditable ' ) ).replace( /\s+/g, ' ' ) )
-			.on( 'updateComplete pagerComplete '.split( ' ' ).join( '.tseditable ' ), function() {
+			.off( ( 'updateComplete pagerComplete '.split( ' ' ).join( namespace + ' ' ) ).replace( /\s+/g, ' ' ) )
+			.on( 'updateComplete pagerComplete '.split( ' ' ).join( namespace + ' ' ), function() {
 				tse.update( c, c.widgetOptions );
-			});
-
-		c.$tbodies
-			.off( ( 'mouseleave focus blur focusout keydown '.split( ' ' ).join( '.tseditable ' ) ).replace( /\s+/g, ' ' ) )
-			.on( 'mouseleave.tseditable', function() {
+			})
+			// prevent sort initialized by user click on the header from changing the row indexing before
+			// updateCell can finish processing the change
+			.children( 'thead' )
+			.add( $( c.namespace + '_extra_table' ).children( 'thead' ) )
+			.off( 'mouseenter' + namespace )
+			.on( 'mouseenter' + namespace, function() {
 				if ( c.$table.data( 'contentFocused' ) ) {
 					// change to 'true' instead of element to allow focusout to process
 					c.$table.data( 'contentFocused', true );
 					$( ':focus' ).trigger( 'focusout' );
 				}
-			})
-			.on( 'focus.tseditable', '[contenteditable]', function( e ) {
+			});
+
+		c.$tbodies
+			.off( ( 'focus blur focusout keydown '.split( ' ' ).join( namespace + ' ' ) ).replace( /\s+/g, ' ' ) )
+			.on( 'focus' + namespace, '[contenteditable]', function( e ) {
 				clearTimeout( $( this ).data( 'timer' ) );
 				c.$table.data( 'contentFocused', e.target );
 				var $this = $( this ),
 					selAll = wo.editable_selectAll,
 					column = $this.closest( 'td' ).index(),
-					txt = $.trim( $this.text() );
-				if ( wo.editable_enterToAccept ) {
-					// prevent enter from adding into the content
-					$this.on( 'keydown.tseditable', function( e ){
-						if ( e.which === 13 ) {
+					txt = $this.html();
+				if ( wo.editable_trimContent ) {
+					txt = $.trim( txt );
+				}
+				// prevent enter from adding into the content
+				$this
+					.off( 'keydown' + namespace )
+					.on( 'keydown' + namespace, function( e ){
+						if ( wo.editable_enterToAccept && e.which === 13 ) {
 							e.preventDefault();
 						}
 					});
-				}
 				$this.data({ before : txt, original: txt });
 
 				if ( typeof wo.editable_focused === 'function' ) {
@@ -140,16 +170,19 @@ var tse = $.tablesorter.editable = {
 					}
 				}
 			})
-			.on( 'blur focusout keydown '.split( ' ' ).join( '.tseditable ' ), '[contenteditable]', function( e ) {
+			.on( 'blur focusout keydown '.split( ' ' ).join( namespace + ' ' ), '[contenteditable]', function( e ) {
 				if ( !c.$table.data( 'contentFocused' ) ) { return; }
 				var t, validate,
 					valid = false,
 					$this = $( e.target ),
-					txt = $.trim( $this.text() ),
+					txt = $this.html(),
 					column = $this.closest( 'td' ).index();
+				if ( wo.editable_trimContent ) {
+					txt = $.trim( txt );
+				}
 				if ( e.which === 27 ) {
 					// user cancelled
-					$this.html( $.trim( $this.data( 'original' ) ) ).trigger( 'blur.tseditable' );
+					$this.html( $this.data( 'original' ) ).trigger( 'blur' + namespace );
 					c.$table.data( 'contentFocused', false );
 					return false;
 				}
@@ -168,10 +201,10 @@ var tse = $.tablesorter.editable = {
 					}
 
 					if ( t && valid !== false ) {
-						c.$table.find( '.tseditable-last-edited-cell' ).removeClass( 'tseditable-last-edited-cell' );
+						c.$table.find( '.' + tse.lastEdited ).removeClass( tse.lastEdited );
 						$this
-							.addClass( 'tseditable-last-edited-cell' )
-							.html( $.trim( valid ) )
+							.addClass( tse.lastEdited )
+							.html( valid )
 							.data( 'before', valid )
 							.data( 'original', valid )
 							.trigger( 'change' );
@@ -179,11 +212,11 @@ var tse = $.tablesorter.editable = {
 							if ( wo.editable_autoResort ) {
 								setTimeout( function() {
 									c.$table.trigger( 'sorton', [ c.sortList, function() {
-										tse.editComplete( c, wo, c.$table.find( '.tseditable-last-edited-cell' ), true );
+										tse.editComplete( c, wo, c.$table.find( '.' + tse.lastEdited ), true );
 									}, true ] );
 								}, 10 );
 							} else {
-								tse.editComplete( c, wo, c.$table.find( '.tseditable-last-edited-cell' ) );
+								tse.editComplete( c, wo, c.$table.find( '.' + tse.lastEdited ) );
 							}
 						} ] );
 						return false;
@@ -192,13 +225,28 @@ var tse = $.tablesorter.editable = {
 					clearTimeout( $this.data( 'timer' ) );
 					$this.data( 'timer', setTimeout( function() {
 						if ( $.isFunction( wo.editable_blur ) ) {
-							wo.editable_blur( $.trim( $this.text() ), column, $this );
+							txt = $this.html();
+							wo.editable_blur( wo.editable_trimContent ? $.trim( txt ) : txt, column, $this );
 						}
 					}, 100 ) );
 					// restore original content on blur
-					$this.html( $.trim( $this.data( 'original' ) ) );
+					$this.html( $this.data( 'original' ) );
 				}
 			});
+	},
+	destroy : function( c, wo ) {
+		var namespace = tse.namespace,
+			cols = tse.getColumns( c, wo ),
+
+		tmp = ( 'updateComplete pagerComplete '.split( ' ' ).join( namespace + ' ' ) ).replace( /\s+/g, ' ' );
+		c.$table.off( tmp );
+
+		tmp = ( 'focus blur focusout keydown '.split( ' ' ).join( namespace + ' ' ) ).replace( /\s+/g, ' ' );
+		c.$tbodies
+			.off( tmp )
+			.find( cols.join( ',' ) )
+			.find( '[contenteditable]' )
+			.prop( 'contenteditable', false );
 	}
 
 };
@@ -223,6 +271,11 @@ var tse = $.tablesorter.editable = {
 			if ( !wo.editable_columns.length ) { return; }
 			tse.update( c, wo );
 			tse.bindEvents( c, wo );
+		},
+		remove : function( table, c, wo, refreshing ) {
+			if ( !refreshing ) {
+				tse.destroy( c, wo ) ;
+			}
 		}
 	});