TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/117808
Change subject: TableSorter: Improve detection and handling of isoDate
......................................................................
TableSorter: Improve detection and handling of isoDate
Change-Id: I193870dcc97477a4fd52a75d3beb9db21e64f171
---
M resources/jquery/jquery.tablesorter.js
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/08/117808/1
diff --git a/resources/jquery/jquery.tablesorter.js
b/resources/jquery/jquery.tablesorter.js
index f9ee268..b2f5ac0 100644
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -651,7 +651,8 @@
new RegExp( /(https?|ftp|file):\/\//)
],
isoDate: [
- new RegExp( /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/)
+ new RegExp(
/^-?\d{4}-[01]\d-[0-3]\d([T\s](([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)?(\15([0-5]\d))?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?/
),
+ new RegExp( /^-?\d{4}-[01]\d-[0-3]\d/ )
],
usLongDate: [
new RegExp( /^[A-Za-z]{3,10}\.? [0-9]{1,2},
([0-9]{4}|'?[0-9]{2})
(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)
@@ -1048,8 +1049,16 @@
return ts.rgx.isoDate[0].test(s);
},
format: function ( s ) {
- return $.tablesorter.formatFloat((s !== '') ? new
Date(s.replace(
- new RegExp( /-/g), '/')).getTime() : '0' );
+ var isodate,
+ matches;
+ if ( !Date.prototype.toISOString ) {
+ // Old browsers don't understand iso, Fallback
to US date parsing and ignore the time part.
+ matches = $.trim(s).match( ts.rgx.isoDate[1] );
+ isodate = new Date( matches[1] + '/' +
matches[2] + '/' + matches[3] );
+ } else {
+ isodate = new Date( $.trim( s ) );
+ }
+ return ( typeof isodate !== "undefined" ) ?
isodate.getTime() : 0;
},
type: 'numeric'
} );
--
To view, visit https://gerrit.wikimedia.org/r/117808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I193870dcc97477a4fd52a75d3beb9db21e64f171
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
