From 16760162b158a70b4cad9d0dee90c0048f385d09 Mon Sep 17 00:00:00 2001 From: Leo Koppelkamm Date: Fri, 15 Apr 2011 08:23:29 +0000 Subject: [PATCH] Followup ro r86088: Use data-sort-type instead of classes to specify the parser-type; add support for data-sort-value; strip legacy code (CR) --- resources/jquery/jquery.tablesorter.js | 58 ++-- skins/common/wikibits.js | 370 +------------------------ 2 files changed, 29 insertions(+), 399 deletions(-) diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js index 31da6d4795..7b33b81bb5 100644 --- a/resources/jquery/jquery.tablesorter.js +++ b/resources/jquery/jquery.tablesorter.js @@ -92,7 +92,8 @@ /* parsers utils */ function buildParserCache( table, $headers ) { - var rows = table.tBodies[0].rows; + var rows = table.tBodies[0].rows, + sortType; if ( rows[0] ) { @@ -101,11 +102,14 @@ l = cells.length; for ( var i = 0; i < l; i++ ) { + p = false; + sortType = $headers.eq(i).data('sort-type'); + if ( typeof sortVal != 'undefined' ) { + p = getParserById( sortVal ); + } - if ( $headers.eq(i).is( '[class*="sort-"]' ) ) { - p = getParserById($headers.eq(i).attr('class').replace(/.*?sort-(.*?) .*/, '$1')); - } else { - p = detectParserForColumn( table, rows, -1, i ); + if (p === false) { + p = detectParserForColumn( table, rows, -1, i ); } // if ( table.config.debug ) { // console.log( "column:" + i + " parser:" + p.id + "\n" ); @@ -125,7 +129,7 @@ rowIndex++; if ( rows[rowIndex] ) { node = getNodeFromRowAndCellIndex( rows, rowIndex, cellIndex ); - nodeValue = trimAndGetNodeText( table.config, node ); + nodeValue = trimAndGetNodeText( node ); // if ( table.config.debug ) { // console.log( 'Checking if value was empty on row:' + rowIndex ); // } @@ -146,8 +150,8 @@ return rows[rowIndex].cells[cellIndex]; } - function trimAndGetNodeText( config, node ) { - return $.trim( getElementText( config, node ) ); + function trimAndGetNodeText( node ) { + return $.trim( getElementText( node ) ); } function getParserById( name ) { @@ -192,7 +196,7 @@ cache.row.push(c); for ( var j = 0; j < totalCells; ++j ) { - cols.push( parsers[j].format( getElementText( table.config, c[0].cells[j] ), table, c[0].cells[j] ) ); + cols.push( parsers[j].format( getElementText( c[0].cells[j] ), table, c[0].cells[j] ) ); } cols.push( cache.normalized.length ); // add position for rowCache @@ -206,8 +210,14 @@ return cache; } - function getElementText( config, node ) { - return $( node ).text(); + function getElementText( node ) { + var n = $( node ); + var sortValue = n.data('sort-value'); + if ( typeof sortValue != 'undefined' ) { + return sortValue; + } else { + return n.text(); + } } function appendToTable( table, cache ) { @@ -253,7 +263,7 @@ this.column = realCellIndex; var colspan = this.colspan; - colspan = colspan ? parseInt( colspan ) : 1; + colspan = colspan ? parseInt( colspan, 10 ) : 1; realCellIndex += colspan; //this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex]; @@ -385,18 +395,6 @@ } } - // function updateHeaderSortCount( table, sortList ) { - // var c = table.config, - // l = sortList.length; - // for ( var i = 0; i < l; i++ ) { - // var s = sortList[i], - // o = c.headerList[s[0]]; - // o.count = s[1]; - // o.count++; - // } - // } - /* sorting methods */ - function multisort( table, sortList, cache ) { // if ( table.config.debug ) { // var sortTime = new Date(); @@ -699,7 +697,7 @@ // var pos = [( cell.parentNode.rowIndex - 1 ), cell.cellIndex]; // // update cache // cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format( - // getElementText( config, cell ), cell ); + // getElementText( cell ), cell ); // } ).bind( "sorton", function ( e, list ) { // $( this ).trigger( "sortStart" ); // config.sortList = list; @@ -750,7 +748,7 @@ return ( isNaN(i)) ? 0 : i; }; this.formatInt = function (s) { - var i = parseInt(s); + var i = parseInt( s, 10 ); return ( isNaN(i)) ? 0 : i; }; this.clearTableBody = function ( table ) { @@ -897,13 +895,13 @@ s = s.split('/'); //Pad Month and Day - if ( s[0].length == 1 ) s[0] = "0" + s[0]; - if ( s[1].length == 1 ) s[1] = "0" + s[1]; + if ( s[0] && s[0].length == 1 ) s[0] = "0" + s[0]; + if ( s[1] && s[1].length == 1 ) s[1] = "0" + s[1]; if ( !s[2] ) { //Fix yearless dates s[2] = 2000; - } else if ( ( y = parseInt( s[2] ) ) < 100 ) { + } else if ( ( y = parseInt( s[2], 10) ) < 100 ) { //Guestimate years without centuries if ( y < 30 ) { s[2] = 2000 + y; @@ -920,7 +918,7 @@ s.push( s.shift() ); s.push(d); } - return parseInt( s.join('') ); + return parseInt( s.join(''), 10 ); }, type: "numeric" } ); diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index 50dd9dc569..81cad57753 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -357,7 +357,7 @@ window.getInnerText = function( el ) { for ( var i = 0; i < l; i++ ) { switch ( cs[i].nodeType ) { case 1: // ELEMENT_NODE - str += ts_getInnerText( cs[i] ); + str += getInnerText( cs[i] ); break; case 3: // TEXT_NODE str += cs[i].nodeValue; @@ -517,372 +517,6 @@ window.redirectToFragment = function( fragment ) { } }; -/* - * Table sorting script based on one (c) 1997-2006 Stuart Langridge and Joost - * de Valk: - * http://www.joostdevalk.nl/code/sortable-table/ - * http://www.kryogenix.org/code/browser/sorttable/ - * - * @todo don't break on colspans/rowspans (bug 8028) - * @todo language-specific digit grouping/decimals (bug 8063) - * @todo support all accepted date formats (bug 8226) - */ - -window.ts_image_path = stylepath + '/common/images/'; -window.ts_image_up = 'sort_up.gif'; -window.ts_image_down = 'sort_down.gif'; -window.ts_image_none = 'sort_none.gif'; -window.ts_europeandate = wgContentLanguage != 'en'; // The non-American-inclined can change to "true" -window.ts_alternate_row_colors = false; -window.ts_number_transform_table = null; -window.ts_number_regex = null; - -window.sortables_init = function() { - var idnum = 0; - // Find all tables with class sortable and make them sortable - var tables = getElementsByClassName( document, 'table', 'sortable' ); - for ( var ti = 0; ti < tables.length ; ti++ ) { - if ( !tables[ti].id ) { - tables[ti].setAttribute( 'id', 'sortable_table_id_' + idnum ); - ++idnum; - } - ts_makeSortable( tables[ti] ); - } -}; - -window.ts_makeSortable = function( table ) { - var firstRow = table.rows[0]; - if ( !firstRow ) { - return; - } - - // We have a first row: assume it's the header, and make its contents clickable links - for ( var i = 0; i < firstRow.cells.length; i++ ) { - var cell = firstRow.cells[i]; - if ( (' ' + cell.className + ' ').indexOf(' unsortable ') == -1 ) { - $(cell).append ( '' - + '' - + '↓'); - } - } - if ( ts_alternate_row_colors ) { - ts_alternate( table ); - } -}; - -window.ts_getInnerText = function( el ) { - return getInnerText( el ); -}; - -window.ts_resortTable = function( lnk ) { - // get the span - var span = lnk.getElementsByTagName('span')[0]; - - var td = lnk.parentNode; - var tr = td.parentNode; - var column = td.cellIndex; - - var table = tr.parentNode; - while ( table && !( table.tagName && table.tagName.toLowerCase() == 'table' ) ) { - table = table.parentNode; - } - if ( !table ) { - return; - } - - if ( table.rows.length <= 1 ) { - return; - } - - // Generate the number transform table if it's not done already - if ( ts_number_transform_table === null ) { - ts_initTransformTable(); - } - - // Work out a type for the column - // Skip the first row if that's where the headings are - var rowStart = ( table.tHead && table.tHead.rows.length > 0 ? 0 : 1 ); - var bodyRows = 0; - if (rowStart == 0 && table.tBodies) { - for (var i=0; i < table.tBodies.length; i++ ) { - bodyRows += table.tBodies[i].rows.length; - } - if (bodyRows < table.rows.length) - rowStart = 1; - } - - var itm = ''; - for ( var i = rowStart; i < table.rows.length; i++ ) { - if ( table.rows[i].cells.length > column ) { - itm = ts_getInnerText(table.rows[i].cells[column]); - itm = itm.replace(/^[\s\xa0]+/, '').replace(/[\s\xa0]+$/, ''); - if ( itm != '' ) { - break; - } - } - } - - // TODO: bug 8226, localised date formats - var sortfn = ts_sort_generic; - var preprocessor = ts_toLowerCase; - if ( /^\d\d[\/. -][a-zA-Z]{3}[\/. -]\d\d\d\d$/.test( itm ) ) { - preprocessor = ts_dateToSortKey; - } else if ( /^\d\d[\/.-]\d\d[\/.-]\d\d\d\d$/.test( itm ) ) { - preprocessor = ts_dateToSortKey; - } else if ( /^\d\d[\/.-]\d\d[\/.-]\d\d$/.test( itm ) ) { - preprocessor = ts_dateToSortKey; - // (minus sign)([pound dollar euro yen currency]|cents) - } else if ( /(^([-\u2212] *)?[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/.test( itm ) ) { - preprocessor = ts_currencyToSortKey; - } else if ( ts_number_regex.test( itm ) ) { - preprocessor = ts_parseFloat; - } - - var reverse = ( span.getAttribute( 'sortdir' ) == 'down' ); - - var newRows = new Array(); - var staticRows = new Array(); - for ( var j = rowStart; j < table.rows.length; j++ ) { - var row = table.rows[j]; - if( (' ' + row.className + ' ').indexOf(' unsortable ') < 0 ) { - var keyText = ts_getInnerText( row.cells[column] ); - if( keyText === undefined ) { - keyText = ''; - } - var oldIndex = ( reverse ? -j : j ); - var preprocessed = preprocessor( keyText.replace(/^[\s\xa0]+/, '').replace(/[\s\xa0]+$/, '') ); - - newRows[newRows.length] = new Array( row, preprocessed, oldIndex ); - } else { - staticRows[staticRows.length] = new Array( row, false, j-rowStart ); - } - } - - newRows.sort( sortfn ); - - var arrowHTML; - if ( reverse ) { - arrowHTML = '↓'; - newRows.reverse(); - span.setAttribute( 'sortdir', 'up' ); - } else { - arrowHTML = '↑'; - span.setAttribute( 'sortdir', 'down' ); - } - - for ( var i = 0; i < staticRows.length; i++ ) { - var row = staticRows[i]; - newRows.splice( row[2], 0, row ); - } - - // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones - // don't do sortbottom rows - for ( var i = 0; i < newRows.length; i++ ) { - if ( ( ' ' + newRows[i][0].className + ' ').indexOf(' sortbottom ') == -1 ) { - table.tBodies[0].appendChild( newRows[i][0] ); - } - } - // do sortbottom rows only - for ( var i = 0; i < newRows.length; i++ ) { - if ( ( ' ' + newRows[i][0].className + ' ').indexOf(' sortbottom ') != -1 ) { - table.tBodies[0].appendChild( newRows[i][0] ); - } - } - - // Delete any other arrows there may be showing - var spans = getElementsByClassName( tr, 'span', 'sortarrow' ); - for ( var i = 0; i < spans.length; i++ ) { - spans[i].innerHTML = '↓'; - } - span.innerHTML = arrowHTML; - - if ( ts_alternate_row_colors ) { - ts_alternate( table ); - } -}; - -window.ts_initTransformTable = function() { - if ( typeof wgSeparatorTransformTable == 'undefined' - || ( wgSeparatorTransformTable[0] == '' && wgDigitTransformTable[2] == '' ) ) - { - var digitClass = "[0-9,.]"; - ts_number_transform_table = false; - } else { - ts_number_transform_table = {}; - // Unpack the transform table - // Separators - var ascii = wgSeparatorTransformTable[0].split("\t"); - var localised = wgSeparatorTransformTable[1].split("\t"); - for ( var i = 0; i < ascii.length; i++ ) { - ts_number_transform_table[localised[i]] = ascii[i]; - } - // Digits - ascii = wgDigitTransformTable[0].split("\t"); - localised = wgDigitTransformTable[1].split("\t"); - for ( var i = 0; i < ascii.length; i++ ) { - ts_number_transform_table[localised[i]] = ascii[i]; - } - - // Construct regex for number identification - var digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ',', '\\.']; - var maxDigitLength = 1; - for ( var digit in ts_number_transform_table ) { - // Escape regex metacharacters - digits.push( - digit.replace( /([{}()|.?*+^$\[\]\\-])/g, "\\$1" ) - ); - if ( digit.length > maxDigitLength ) { - maxDigitLength = digit.length; - } - } - if ( maxDigitLength > 1 ) { - var digitClass = '(' + digits.join( '|' ) + ')'; - } else { - var digitClass = '[' + digits.join( '' ) + ']'; - } - } - - // We allow a trailing percent sign, which we just strip. This works fine - // if percents and regular numbers aren't being mixed. - ts_number_regex = new RegExp( - "^(" + - "[-+\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[-+\u2212]?[0-9][0-9,]*)?" + // Fortran-style scientific - "|" + - "[-+\u2212]?" + digitClass + "+[\s\xa0]*%?" + // Generic localised - ")$", "i" - ); -}; - -window.ts_toLowerCase = function( s ) { - return s.toLowerCase(); -}; - -window.ts_dateToSortKey = function( date ) { - // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX - if ( date.length == 11 ) { - switch ( date.substr( 3, 3 ).toLowerCase() ) { - case 'jan': - var month = '01'; - break; - case 'feb': - var month = '02'; - break; - case 'mar': - var month = '03'; - break; - case 'apr': - var month = '04'; - break; - case 'may': - var month = '05'; - break; - case 'jun': - var month = '06'; - break; - case 'jul': - var month = '07'; - break; - case 'aug': - var month = '08'; - break; - case 'sep': - var month = '09'; - break; - case 'oct': - var month = '10'; - break; - case 'nov': - var month = '11'; - break; - case 'dec': - var month = '12'; - break; - // default: var month = '00'; - } - return date.substr( 7, 4 ) + month + date.substr( 0, 2 ); - } else if ( date.length == 10 ) { - if ( !ts_europeandate ) { - return date.substr( 6, 4 ) + date.substr( 0, 2 ) + date.substr( 3, 2 ); - } else { - return date.substr( 6, 4 ) + date.substr( 3, 2 ) + date.substr( 0, 2 ); - } - } else if ( date.length == 8 ) { - var yr = date.substr( 6, 2 ); - if ( parseInt( yr ) < 50 ) { - yr = '20' + yr; - } else { - yr = '19' + yr; - } - if ( ts_europeandate ) { - return yr + date.substr( 3, 2 ) + date.substr( 0, 2 ); - } else { - return yr + date.substr( 0, 2 ) + date.substr( 3, 2 ); - } - } - return '00000000'; -}; - -window.ts_parseFloat = function( s ) { - if ( !s ) { - return 0; - } - if ( ts_number_transform_table != false ) { - var newNum = '', c; - - for ( var p = 0; p < s.length; p++ ) { - c = s.charAt( p ); - if ( c in ts_number_transform_table ) { - newNum += ts_number_transform_table[c]; - } else { - newNum += c; - } - } - s = newNum; - } - var num = parseFloat( s.replace(/[, ]/g, '').replace("\u2212", '-') ); - return ( isNaN( num ) ? -Infinity : num ); -}; - -window.ts_currencyToSortKey = function( s ) { - return ts_parseFloat(s.replace(/[^-\u22120-9.,]/g,'')); -}; - -window.ts_sort_generic = function( a, b ) { - return a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2]; -}; - -window.ts_alternate = function( table ) { - // Take object table and get all it's tbodies. - var tableBodies = table.getElementsByTagName( 'tbody' ); - // Loop through these tbodies - for ( var i = 0; i < tableBodies.length; i++ ) { - // Take the tbody, and get all it's rows - var tableRows = tableBodies[i].getElementsByTagName( 'tr' ); - // Loop through these rows - // Start at 1 because we want to leave the heading row untouched - for ( var j = 0; j < tableRows.length; j++ ) { - // Check if j is even, and apply classes for both possible results - var oldClasses = tableRows[j].className.split(' '); - var newClassName = ''; - for ( var k = 0; k < oldClasses.length; k++ ) { - if ( oldClasses[k] != '' && oldClasses[k] != 'even' && oldClasses[k] != 'odd' ) { - newClassName += oldClasses[k] + ' '; - } - } - tableRows[j].className = newClassName + ( j % 2 == 0 ? 'even' : 'odd' ); - } - } -}; - -/* - * End of table sorting code - */ - - /** * Add a cute little box at the top of the screen to inform the user of * something, replacing any preexisting message. @@ -981,8 +615,6 @@ window.runOnloadHook = function() { updateTooltipAccessKeys( null ); setupCheckboxShiftClick(); - //jQuery( document ).ready( sortables_init ); - // Run any added-on functions for ( var i = 0; i < onloadFuncts.length; i++ ) { onloadFuncts[i](); -- 2.20.1