Fix an issue with the data-sort-type retrieval.

[lhc/web/wiklou.git] / resources / jquery / jquery.tablesorter.js

diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index f28f401..2940d6f 100644 (file)
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -151,7 +151,7 @@
 
                        for ( i = 0; i < len; i++ ) {
                                parser = false;
-                               sortType = $headers.eq( i ).data( 'sort-type' );
+                               sortType = $headers.eq( i ).data( 'sortType' );
                                if ( sortType !== undefined ) {
                                        parser = getParserById( sortType );
                                }
@@ -330,11 +330,11 @@
        }
 
        function sortText( a, b ) {
-               return ( (a < b) ? false : ((a > b) ? true : 0) );
+               return ( (a < b) ? -1 : ((a > b) ? 1 : 0) );
        }
 
        function sortTextDesc( a, b ) {
-               return ( (b < a) ? false : ((b > a) ? true : 0) );
+               return ( (b < a) ? -1 : ((b > a) ? 1 : 0) );
        }
 
        function multisort( table, sortList, cache ) {
@@ -461,8 +461,8 @@
                                new RegExp( /^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/)
                        ],
                        currency: [
-                               new RegExp( /^[£$€?.]/),
-                               new RegExp( /[£$€]/g)
+                               new RegExp( /(^[£$€¥]|[£$€¥]$)/),
+                               new RegExp( /[£$€¥]/g)
                        ],
                        url: [
                                new RegExp( /^(https?|ftp|file):\/\/$/),