From e203fdfc74f18e45cf5b1d4b3a7cac62b87f480a Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Thu, 7 Mar 2013 21:08:16 -0500 Subject: [PATCH] jquery.tablesorter: Fix broken getElementSortKey() Change I3e9898f3 introduced changes to getElementText()/getElementSortKey() that broke certain behavior with respect to tables having colspanned cells. Restore the old behavior for these cases. Change-Id: I18be2e6c1f0ab926ff4c795530600b52bc6488c0 --- resources/jquery/jquery.tablesorter.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js index e252ba549c..8bf1f614c2 100644 --- a/resources/jquery/jquery.tablesorter.js +++ b/resources/jquery/jquery.tablesorter.js @@ -98,7 +98,9 @@ // like charAt, toLowerCase and split are expected. return String( data ); } else { - if ( node.tagName.toLowerCase() === 'img' ) { + if ( !node ) { + return $node.text(); + } else if ( node.tagName.toLowerCase() === 'img' ) { return $node.attr( 'alt' ) || ''; // handle undefined alt } else { return $.map( $.makeArray( node.childNodes ), function( elem ) { -- 2.20.1