From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 8 Mar 2013 02:08:16 +0000 (-0500)
Subject: jquery.tablesorter: Fix broken getElementSortKey()
X-Git-Tag: 1.31.0-rc.0~20310
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=e203fdfc74f18e45cf5b1d4b3a7cac62b87f480a;p=lhc%2Fweb%2Fwiklou.git

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
---

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 ) {