Tim Starling has submitted this change and it was merged.
Change subject: jquery.tablesorter: Fix broken getElementSortKey()
......................................................................
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
---
M resources/jquery/jquery.tablesorter.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/resources/jquery/jquery.tablesorter.js
b/resources/jquery/jquery.tablesorter.js
index e252ba5..8bf1f61 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 ) {
--
To view, visit https://gerrit.wikimedia.org/r/52748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18be2e6c1f0ab926ff4c795530600b52bc6488c0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Krinkle <ttij...@wikimedia.org>
Gerrit-Reviewer: Matmarex <matma....@gmail.com>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
