X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2Fcommon%2Fwikibits.js;h=95b2e06974cc8ebe9f5a0f5d054ecd49bc9b3aeb;hb=4f278f513d5bf24c7252732a168e3646cc5af101;hp=678492b4a33e7e261cb53022bb6734c4d9f161c3;hpb=c0c58228274fd1a4a47543f62172b8bc9072d771;p=lhc%2Fweb%2Fwiklou.git diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index 678492b4a3..95b2e06974 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -10,10 +10,9 @@ if (webkit_match) { var is_safari_win = is_safari && clientPC.indexOf('windows') != -1; var webkit_version = parseInt(webkit_match[1]); } -var is_khtml = navigator.vendor == 'KDE' || - ( document.childNodes && !document.all && !navigator.taintEnabled ); // For accesskeys; note that FF3+ is included here! var is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC ); +var ff2_bugs = /firefox\/2/.test( clientPC ); // These aren't used here, but some custom scripts rely on them var is_ff2_win = is_ff2 && clientPC.indexOf('windows') != -1; var is_ff2_x11 = is_ff2 && clientPC.indexOf('x11') != -1; @@ -21,7 +20,10 @@ if (clientPC.indexOf('opera') != -1) { var is_opera = true; var is_opera_preseven = window.opera && !document.childNodes; var is_opera_seven = window.opera && document.childNodes; - var is_opera_95 = /opera\/(9.[5-9]|[1-9][0-9])/.test( clientPC ); + var is_opera_95 = /opera\/(9\.[5-9]|[1-9][0-9])/.test( clientPC ); + var opera6_bugs = is_opera_preseven; + var opera7_bugs = is_opera_seven && !is_opera_95; + var opera95_bugs = /opera\/(9\.5)/.test( clientPC ); } // Global external objects used by this script. @@ -43,18 +45,19 @@ function addOnloadHook(hookFunct) { } } + function hookEvent(hookName, hookFunct) { - if (window.addEventListener) { - window.addEventListener(hookName, hookFunct, false); - } else if (window.attachEvent) { - window.attachEvent("on" + hookName, hookFunct); - } + addHandler(window, hookName, hookFunct); } function importScript(page) { - return importScriptURI(wgScript + '?action=raw&ctype=text/javascript&title=' + encodeURIComponent(page.replace(/ /g,'_'))); + // TODO: might want to introduce a utility function to match wfUrlencode() in PHP + var uri = wgScript + '?title=' + + encodeURIComponent(page.replace(/ /g,'_')).replace(/%2F/ig,'/').replace(/%3A/ig,':') + + '&action=raw&ctype=text/javascript'; + return importScriptURI(uri); } - + var loadedScripts = {}; // included-scripts tracker function importScriptURI(url) { if (loadedScripts[url]) { @@ -67,15 +70,21 @@ function importScriptURI(url) { document.getElementsByTagName('head')[0].appendChild(s); return s; } - + function importStylesheet(page) { return importStylesheetURI(wgScript + '?action=raw&ctype=text/css&title=' + encodeURIComponent(page.replace(/ /g,'_'))); } - -function importStylesheetURI(url) { - return document.createStyleSheet ? document.createStyleSheet(url) : appendCSS('@import "' + url + '";'); + +function importStylesheetURI(url,media) { + var l = document.createElement('link'); + l.type = 'text/css'; + l.rel = 'stylesheet'; + l.href = url; + if(media) l.media = media + document.getElementsByTagName('head')[0].appendChild(l); + return l; } - + function appendCSS(text) { var s = document.createElement('style'); s.type = 'text/css'; @@ -88,15 +97,20 @@ function appendCSS(text) { // special stylesheet links if (typeof stylepath != 'undefined' && typeof skin != 'undefined') { - if (is_opera_preseven) { + // FIXME: This tries to load the stylesheets even for skins where they + // don't exist, i.e., everything but Monobook. + if (opera6_bugs) { importStylesheetURI(stylepath+'/'+skin+'/Opera6Fixes.css'); - } else if (is_opera_seven && !is_opera_95) { + } else if (opera7_bugs) { importStylesheetURI(stylepath+'/'+skin+'/Opera7Fixes.css'); - } else if (is_khtml) { - importStylesheetURI(stylepath+'/'+skin+'/KHTMLFixes.css'); + } else if (opera95_bugs) { + importStylesheetURI(stylepath+'/'+skin+'/Opera9Fixes.css'); + } else if (ff2_bugs) { + importStylesheetURI(stylepath+'/'+skin+'/FF2Fixes.css'); } } + if (wgBreakFrames) { // Un-trap us from framesets if (window.top != window) { @@ -104,28 +118,14 @@ if (wgBreakFrames) { } } -// for enhanced RecentChanges -function toggleVisibility(_levelId, _otherId, _linkId) { - var thisLevel = document.getElementById(_levelId); - var otherLevel = document.getElementById(_otherId); - var linkLevel = document.getElementById(_linkId); - if (thisLevel.style.display == 'none') { - thisLevel.style.display = 'block'; - otherLevel.style.display = 'none'; - linkLevel.style.display = 'inline'; - } else { - thisLevel.style.display = 'none'; - otherLevel.style.display = 'inline'; - linkLevel.style.display = 'none'; - } -} - function showTocToggle() { if (document.createTextNode) { // Uses DOM calls to avoid document.write + XHTML issues var linkHolder = document.getElementById('toctitle'); - if (!linkHolder) { + var existingLink = document.getElementById('togglelink'); + if (!linkHolder || existingLink) { + // Don't add the toggle link twice return; } @@ -162,6 +162,7 @@ function changeText(el, newText) { } function toggleToc() { + var tocmain = document.getElementById('toc'); var toc = document.getElementById('toc').getElementsByTagName('ul')[0]; var toggleLink = document.getElementById('togglelink'); @@ -169,10 +170,12 @@ function toggleToc() { changeText(toggleLink, tocHideText); toc.style.display = 'block'; document.cookie = "hidetoc=0"; + tocmain.className = 'toc'; } else { changeText(toggleLink, tocShowText); toc.style.display = 'none'; document.cookie = "hidetoc=1"; + tocmain.className = 'toc tochidden'; } } @@ -215,7 +218,7 @@ if (is_opera) { } else if (is_ff2) { tooltipAccessKeyPrefix = 'alt-shift-'; } -var tooltipAccessKeyRegexp = /\[(ctrl-)?(alt-)?(shift-)?(esc-)?.\]$/; +var tooltipAccessKeyRegexp = /\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/; /** * Add the appropriate prefix to the accesskey shown in the tooltip. @@ -227,10 +230,19 @@ var tooltipAccessKeyRegexp = /\[(ctrl-)?(alt-)?(shift-)?(esc-)?.\]$/; */ function updateTooltipAccessKeys( nodeList ) { if ( !nodeList ) { - // skins without a "column-one" element don't seem to have links with accesskeys either - var columnOne = document.getElementById("column-one"); - if ( columnOne ) - updateTooltipAccessKeys( columnOne.getElementsByTagName("a") ); + // Rather than scan all links on the whole page, we can just scan these + // containers which contain the relevant links. This is really just an + // optimization technique. + var linkContainers = [ + "column-one", // Monobook and Modern + "head", "panel", "p-logo" // Vector + ]; + for ( var i in linkContainers ) { + var linkContainer = document.getElementById( linkContainers[i] ); + if ( linkContainer ) { + updateTooltipAccessKeys( linkContainer.getElementsByTagName("a") ); + } + } // these are rare enough that no such optimization is needed updateTooltipAccessKeys( document.getElementsByTagName("input") ); updateTooltipAccessKeys( document.getElementsByTagName("label") ); @@ -240,10 +252,9 @@ function updateTooltipAccessKeys( nodeList ) { for ( var i = 0; i < nodeList.length; i++ ) { var element = nodeList[i]; var tip = element.getAttribute("title"); - var key = element.getAttribute("accesskey"); - if ( key && tooltipAccessKeyRegexp.exec(tip) ) { + if ( tip && tooltipAccessKeyRegexp.exec(tip) ) { tip = tip.replace(tooltipAccessKeyRegexp, - "["+tooltipAccessKeyPrefix+key+"]"); + "["+tooltipAccessKeyPrefix+"$5]"); element.setAttribute("title", tip ); } } @@ -278,13 +289,19 @@ function updateTooltipAccessKeys( nodeList ) { * @return Node -- the DOM node of the new item (an LI element) or null */ function addPortletLink(portlet, href, text, id, tooltip, accesskey, nextnode) { - var node = document.getElementById(portlet); - if ( !node ) return null; - node = node.getElementsByTagName( "ul" )[0]; + var root = document.getElementById(portlet); + if ( !root ) return null; + var node = root.getElementsByTagName( "ul" )[0]; if ( !node ) return null; + // unhide portlet if it was hidden before + root.className = root.className.replace( /(^| )emptyPortlet( |$)/, "$2" ); + + var span = document.createElement( "span" ); + span.appendChild( document.createTextNode( text ) ); + var link = document.createElement( "a" ); - link.appendChild( document.createTextNode( text ) ); + link.appendChild( span ); link.href = href; var item = document.createElement( "li" ); @@ -310,63 +327,30 @@ function addPortletLink(portlet, href, text, id, tooltip, accesskey, nextnode) { return item; } +function getInnerText(el) { + if (typeof el == "string") return el; + if (typeof el == "undefined") { return el }; + if (el.textContent) return el.textContent; // not needed but it is faster + if (el.innerText) return el.innerText; // IE doesn't have textContent + var str = ""; -/** - * Set up accesskeys/tooltips from the deprecated ta array. If doId - * is specified, only set up for that id. Note that this function is - * deprecated and will not be supported indefinitely -- use - * updateTooltipAccessKey() instead. - * - * @param mixed doId string or null - */ -function akeytt( doId ) { - // A lot of user scripts (and some of the code below) break if - // ta isn't defined, so we make sure it is. Explictly using - // window.ta avoids a "ta is not defined" error. - if (!window.ta) window.ta = new Array; - - // Make a local, possibly restricted, copy to avoid clobbering - // the original. - var ta; - if ( doId ) { - ta = [doId]; - } else { - ta = window.ta; - } - - // Now deal with evil deprecated ta - var watchCheckboxExists = document.getElementById( 'wpWatchthis' ) ? true : false; - for (var id in ta) { - var n = document.getElementById(id); - if (n) { - var a = null; - var ak = ''; - // Are we putting accesskey in it - if (ta[id][0].length > 0) { - // Is this object a object? If not assume it's the next child. - - if (n.nodeName.toLowerCase() == "a") { - a = n; - } else { - a = n.childNodes[0]; - } - // Don't add an accesskey for the watch tab if the watch - // checkbox is also available. - if (a && ((id != 'ca-watch' && id != 'ca-unwatch') || !watchCheckboxExists)) { - a.accessKey = ta[id][0]; - ak = ' ['+tooltipAccessKeyPrefix+ta[id][0]+']'; - } - } else { - // We don't care what type the object is when assigning tooltip - a = n; - ak = ''; - } - - if (a) { - a.title = ta[id][1]+ak; - } + var cs = el.childNodes; + var l = cs.length; + for (var i = 0; i < l; i++) { + switch (cs[i].nodeType) { + case 1: //ELEMENT_NODE + str += ts_getInnerText(cs[i]); + break; + case 3: //TEXT_NODE + str += cs[i].nodeValue; + break; } } + return str; +} + +/* Dummy for deprecated function */ +function akeytt( doId ) { } var checkboxes; @@ -422,26 +406,13 @@ function checkboxClickHandler(e) { } for (var i = start; i <= finish; ++i ) { checkboxes[i].checked = endState; + if( i > start && typeof checkboxes[i].onchange == 'function' ) + checkboxes[i].onchange(); // fire triggers } lastCheckbox = this.index; return true; } -function toggle_element_activation(ida,idb) { - if (!document.getElementById) { - return; - } - document.getElementById(ida).disabled=true; - document.getElementById(idb).disabled=false; -} - -function toggle_element_check(ida,idb) { - if (!document.getElementById) { - return; - } - document.getElementById(ida).checked=true; - document.getElementById(idb).checked=false; -} /* Written by Jonathan Snook, http://www.snook.ca/jonathan @@ -450,8 +421,19 @@ function toggle_element_check(ida,idb) { From http://www.robertnyman.com/2005/11/07/the-ultimate-getelementsbyclassname/ */ function getElementsByClassName(oElm, strTagName, oClassNames){ - var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName); var arrReturnElements = new Array(); + if ( typeof( oElm.getElementsByClassName ) == "function" ) { + /* Use a native implementation where possible FF3, Saf3.2, Opera 9.5 */ + var arrNativeReturn = oElm.getElementsByClassName( oClassNames ); + if ( strTagName == "*" ) + return arrNativeReturn; + for ( var h=0; h < arrNativeReturn.length; h++ ) { + if( arrNativeReturn[h].tagName.toLowerCase() == strTagName.toLowerCase() ) + arrReturnElements[arrReturnElements.length] = arrNativeReturn[h]; + } + return arrReturnElements; + } + var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName); var arrRegExpClassNames = new Array(); if(typeof oClassNames == "object"){ for(var i=0; i'; + cell.innerHTML += '' + + '' + + '↓'; } } if (ts_alternate_row_colors) { @@ -559,25 +548,7 @@ function ts_makeSortable(table) { } function ts_getInnerText(el) { - if (typeof el == "string") return el; - if (typeof el == "undefined") { return el }; - if (el.textContent) return el.textContent; // not needed but it is faster - if (el.innerText) return el.innerText; // IE doesn't have textContent - var str = ""; - - var cs = el.childNodes; - var l = cs.length; - for (var i = 0; i < l; i++) { - switch (cs[i].nodeType) { - case 1: //ELEMENT_NODE - str += ts_getInnerText(cs[i]); - break; - case 3: //TEXT_NODE - str += cs[i].nodeValue; - break; - } - } - return str; + return getInnerText( el ); } function ts_resortTable(lnk) { @@ -593,9 +564,14 @@ function ts_resortTable(lnk) { table = table.parentNode; if (!table) return; - // Work out a type for the column 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); @@ -608,39 +584,55 @@ function ts_resortTable(lnk) { } } - sortfn = ts_sort_caseinsensitive; - if (itm.match(/^\d\d[\/. -][a-zA-Z]{3}[\/. -]\d\d\d\d$/)) - sortfn = ts_sort_date; - if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d\d\d$/)) - sortfn = ts_sort_date; - if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d$/)) - sortfn = ts_sort_date; - if (itm.match(/^[\u00a3$\u20ac]/)) // pound dollar euro - sortfn = ts_sort_currency; - if (itm.match(/^[\d.,]+\%?$/)) - sortfn = ts_sort_numeric; + // 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]; - var keyText = ts_getInnerText(row.cells[column]); - var oldIndex = (reverse ? -j : 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, keyText, oldIndex); + 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'); + arrowHTML = '↓'; + newRows.reverse(); + span.setAttribute('sortdir','up'); } else { - arrowHTML = '↑'; - span.setAttribute('sortdir','down'); + 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 @@ -662,10 +654,69 @@ function ts_resortTable(lnk) { } span.innerHTML = arrowHTML; - ts_alternate(table); + if (ts_alternate_row_colors) { + ts_alternate(table); + } +} + +function ts_initTransformTable() { + if ( typeof wgSeparatorTransformTable == "undefined" + || ( wgSeparatorTransformTable[0] == '' && wgDigitTransformTable[2] == '' ) ) + { + digitClass = "[0-9,.]"; + ts_number_transform_table = false; + } else { + ts_number_transform_table = {}; + // Unpack the transform table + // Separators + ascii = wgSeparatorTransformTable[0].split("\t"); + 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 + digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ',', '\\.']; + maxDigitLength = 1; + for ( var digit in ts_number_transform_table ) { + // Escape regex metacharacters + digits.push( + digit.replace( /[\\\\$\*\+\?\.\(\)\|\{\}\[\]\-]/, + function( s ) { return '\\' + s; } ) + ); + if (digit.length > maxDigitLength) { + maxDigitLength = digit.length; + } + } + if ( maxDigitLength > 1 ) { + digitClass = '[' + digits.join( '', digits ) + ']'; + } else { + digitClass = '(' + digits.join( '|', digits ) + ')'; + } + } + + // 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 + "+%?" + // Generic localised + ")$", "i" + ); } -function ts_dateToSortKey(date) { +function ts_toLowerCase( s ) { + return s.toLowerCase(); +} + +function ts_dateToSortKey(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()) { @@ -692,10 +743,10 @@ function ts_dateToSortKey(date) { } } else if (date.length == 8) { yr = date.substr(6,2); - if (parseInt(yr) < 50) { - yr = '20'+yr; - } else { - yr = '19'+yr; + if (parseInt(yr) < 50) { + yr = '20'+yr; + } else { + yr = '19'+yr; } if (ts_europeandate == true) { return yr+date.substr(3,2)+date.substr(0,2); @@ -706,38 +757,33 @@ function ts_dateToSortKey(date) { return "00000000"; } -function ts_parseFloat(num) { - if (!num) return 0; - num = parseFloat(num.replace(/,/g, "")); - return (isNaN(num) ? 0 : num); -} - -function ts_sort_date(a,b) { - var aa = ts_dateToSortKey(a[1]); - var bb = ts_dateToSortKey(b[1]); - return (aa < bb ? -1 : aa > bb ? 1 : a[2] - b[2]); -} - -function ts_sort_currency(a,b) { - var aa = ts_parseFloat(a[1].replace(/[^0-9.]/g,'')); - var bb = ts_parseFloat(b[1].replace(/[^0-9.]/g,'')); - return (aa != bb ? aa - bb : a[2] - b[2]); -} +function ts_parseFloat( s ) { + if ( !s ) { + return 0; + } + if (ts_number_transform_table != false) { + var newNum = '', c; -function ts_sort_numeric(a,b) { - var aa = ts_parseFloat(a[1]); - var bb = ts_parseFloat(b[1]); - return (aa != bb ? aa - bb : a[2] - b[2]); + 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; + } + num = parseFloat(s.replace(/[, ]/g, "").replace("\u2212", "-")); + return (isNaN(num) ? -Infinity : num); } -function ts_sort_caseinsensitive(a,b) { - var aa = a[1].toLowerCase(); - var bb = b[1].toLowerCase(); - return (aa < bb ? -1 : aa > bb ? 1 : a[2] - b[2]); +function ts_currencyToSortKey( s ) { + return ts_parseFloat(s.replace(/[^-\u22120-9.,]/g,'')); } -function ts_sort_default(a,b) { - return (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2]); +function ts_sort_generic(a, b) { + return a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2]; } function ts_alternate(table) { @@ -765,8 +811,8 @@ function ts_alternate(table) { /* * 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. @@ -806,10 +852,11 @@ function jsMsg( message, className ) { } messageDiv.setAttribute( 'id', 'mw-js-message' ); + messageDiv.style.display = 'block'; if( className ) { messageDiv.setAttribute( 'class', 'mw-js-message-'+className ); } - + if (typeof message === 'object') { while (messageDiv.hasChildNodes()) // Remove old content messageDiv.removeChild(messageDiv.firstChild); @@ -862,7 +909,6 @@ function runOnloadHook() { doneOnloadHook = true; updateTooltipAccessKeys( null ); - akeytt( null ); setupCheckboxShiftClick(); sortables_init(); @@ -896,6 +942,21 @@ function addHandler( element, attach, handler ) { function addClickHandler( element, handler ) { addHandler( element, 'click', handler ); } + +/** + * Removes an event handler from an element + * + * @param Element element Element to remove handler from + * @param String remove Event to remove + * @param callable handler Event handler callback to remove + */ +function removeHandler( element, remove, handler ) { + if( window.removeEventListener ) { + element.removeEventListener( remove, handler, false ); + } else if( window.detachEvent ) { + element.detachEvent( 'on' + remove, handler ); + } +} //note: all skins should call runOnloadHook() at the end of html output, // so the below should be redundant. It's there just in case. hookEvent("load", runOnloadHook);