From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 22 Jun 2011 11:28:20 +0200 Subject: update to MediaWiki 1.17.0 --- skins/common/wikibits.js | 414 +++++++++++++++++++++++++++-------------------- 1 file changed, 239 insertions(+), 175 deletions(-) (limited to 'skins/common/wikibits.js') diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index 94f23a9c..fcf2713e 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -1,34 +1,46 @@ // MediaWiki JavaScript support functions -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var is_gecko = /gecko/.test( clientPC ) && +window.clientPC = navigator.userAgent.toLowerCase(); // Get client info +window.is_gecko = /gecko/.test( clientPC ) && !/khtml|spoofer|netscape\/7\.0/.test(clientPC); -var webkit_match = clientPC.match(/applewebkit\/(\d+)/); + +window.is_safari = window.is_safari_win = window.webkit_version = + window.is_chrome = window.is_chrome_mac = false; +window.webkit_match = clientPC.match(/applewebkit\/(\d+)/); if (webkit_match) { - var is_safari = clientPC.indexOf('applewebkit') != -1 && + window.is_safari = clientPC.indexOf('applewebkit') != -1 && clientPC.indexOf('spoofer') == -1; - var is_safari_win = is_safari && clientPC.indexOf('windows') != -1; - var webkit_version = parseInt(webkit_match[1]); + window.is_safari_win = is_safari && clientPC.indexOf('windows') != -1; + window.webkit_version = parseInt(webkit_match[1]); + // Tests for chrome here, to avoid breaking old scripts safari left alone + // This is here for accesskeys + window.is_chrome = clientPC.indexOf('chrome') !== -1 && + clientPC.indexOf('spoofer') === -1; + window.is_chrome_mac = is_chrome && clientPC.indexOf('mac') !== -1 } + // 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 ); +window.is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC ); +window.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; +window.is_ff2_win = is_ff2 && clientPC.indexOf('windows') != -1; +window.is_ff2_x11 = is_ff2 && clientPC.indexOf('x11') != -1; + +window.is_opera = window.is_opera_preseven = window.is_opera_95 = + window.opera6_bugs = window.opera7_bugs = window.opera95_bugs = false; 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 opera6_bugs = is_opera_preseven; - var opera7_bugs = is_opera_seven && !is_opera_95; - var opera95_bugs = /opera\/(9\.5)/.test( clientPC ); + window.is_opera = true; + window.is_opera_preseven = window.opera && !document.childNodes; + window.is_opera_seven = window.opera && document.childNodes; + window.is_opera_95 = /opera\/(9\.[5-9]|[1-9][0-9])/.test( clientPC ); + window.opera6_bugs = is_opera_preseven; + window.opera7_bugs = is_opera_seven && !is_opera_95; + window.opera95_bugs = /opera\/(9\.5)/.test( clientPC ); } // As recommended by , // avoiding false positives from moronic extensions that append to the IE UA // string (bug 23171) -var ie6_bugs = false; +window.ie6_bugs = false; if ( /msie ([0-9]{1,}[\.0-9]{0,})/.exec( clientPC ) != null && parseFloat( RegExp.$1 ) <= 6.0 ) { ie6_bugs = true; @@ -38,35 +50,31 @@ if ( /msie ([0-9]{1,}[\.0-9]{0,})/.exec( clientPC ) != null /*extern ta, stylepath, skin */ // add any onload functions in this hook (please don't hard-code any events in the xhtml source) -var doneOnloadHook; +window.doneOnloadHook = undefined; if (!window.onloadFuncts) { - var onloadFuncts = []; + window.onloadFuncts = []; } -function addOnloadHook( hookFunct ) { +window.addOnloadHook = function( hookFunct ) { // Allows add-on scripts to add onload functions if( !doneOnloadHook ) { onloadFuncts[onloadFuncts.length] = hookFunct; } else { hookFunct(); // bug in MSIE script loading } -} +}; -function hookEvent( hookName, hookFunct ) { - addHandler( window, hookName, hookFunct ); -} - -function importScript( page ) { +window.importScript = function( page ) { // 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 ) { +window.loadedScripts = {}; // included-scripts tracker +window.importScriptURI = function( url ) { if ( loadedScripts[url] ) { return null; } @@ -76,13 +84,13 @@ function importScriptURI( url ) { s.setAttribute( 'type', 'text/javascript' ); document.getElementsByTagName('head')[0].appendChild( s ); return s; -} +}; -function importStylesheet( page ) { +window.importStylesheet = function( page ) { return importStylesheetURI( wgScript + '?action=raw&ctype=text/css&title=' + encodeURIComponent( page.replace(/ /g,'_') ) ); -} +}; -function importStylesheetURI( url, media ) { +window.importStylesheetURI = function( url, media ) { var l = document.createElement( 'link' ); l.type = 'text/css'; l.rel = 'stylesheet'; @@ -92,9 +100,9 @@ function importStylesheetURI( url, media ) { } document.getElementsByTagName('head')[0].appendChild( l ); return l; -} +}; -function appendCSS( text ) { +window.appendCSS = function( text ) { var s = document.createElement( 'style' ); s.type = 'text/css'; s.rel = 'stylesheet'; @@ -105,7 +113,7 @@ function appendCSS( text ) { } document.getElementsByTagName('head')[0].appendChild( s ); return s; -} +}; // Special stylesheet links for Monobook only (see bug 14717) if ( typeof stylepath != 'undefined' && skin == 'monobook' ) { @@ -121,14 +129,14 @@ if ( typeof stylepath != 'undefined' && skin == 'monobook' ) { } -if ( wgBreakFrames ) { +if ( 'wgBreakFrames' in window && window.wgBreakFrames ) { // Un-trap us from framesets if ( window.top != window ) { window.top.location = window.location; } } -function showTocToggle() { +window.showTocToggle = function() { if ( document.createTextNode ) { // Uses DOM calls to avoid document.write + XHTML issues @@ -145,8 +153,10 @@ function showTocToggle() { var toggleLink = document.createElement( 'a' ); toggleLink.id = 'togglelink'; toggleLink.className = 'internal'; - toggleLink.href = 'javascript:toggleToc()'; - toggleLink.appendChild( document.createTextNode( tocHideText ) ); + toggleLink.href = '#'; + addClickHandler( toggleLink, function( evt ) { toggleToc(); return killEvt( evt ); } ); + + toggleLink.appendChild( document.createTextNode( mediaWiki.msg( 'hidetoc' ) ) ); outerSpan.appendChild( document.createTextNode( '[' ) ); outerSpan.appendChild( toggleLink ); @@ -160,47 +170,59 @@ function showTocToggle() { toggleToc(); } } -} +}; -function changeText( el, newText ) { +window.changeText = function( el, newText ) { // Safari work around if ( el.innerText ) { el.innerText = newText; } else if ( el.firstChild && el.firstChild.nodeValue ) { el.firstChild.nodeValue = newText; } -} +}; -function toggleToc() { +window.killEvt = function( evt ) { + evt = evt || window.event || window.Event; // W3C, IE, Netscape + if ( typeof ( evt.preventDefault ) != 'undefined' ) { + evt.preventDefault(); // Don't follow the link + evt.stopPropagation(); + } else { + evt.cancelBubble = true; // IE + } + return false; // Don't follow the link (IE) +}; + +window.toggleToc = function() { var tocmain = document.getElementById( 'toc' ); var toc = document.getElementById('toc').getElementsByTagName('ul')[0]; var toggleLink = document.getElementById( 'togglelink' ); if ( toc && toggleLink && toc.style.display == 'none' ) { - changeText( toggleLink, tocHideText ); + changeText( toggleLink, mediaWiki.msg( 'hidetoc' ) ); toc.style.display = 'block'; document.cookie = "hidetoc=0"; tocmain.className = 'toc'; } else { - changeText( toggleLink, tocShowText ); + changeText( toggleLink, mediaWiki.msg( 'showtoc' ) ); toc.style.display = 'none'; document.cookie = "hidetoc=1"; tocmain.className = 'toc tochidden'; } -} + return false; +}; -var mwEditButtons = []; -var mwCustomEditButtons = []; // eg to add in MediaWiki:Common.js +window.mwEditButtons = []; +window.mwCustomEditButtons = []; // eg to add in MediaWiki:Common.js -function escapeQuotes( text ) { +window.escapeQuotes = function( text ) { var re = new RegExp( "'", "g" ); text = text.replace( re, "\\'" ); re = new RegExp( "\\n", "g" ); text = text.replace( re, "\\n" ); return escapeQuotesHTML( text ); -} +}; -function escapeQuotesHTML( text ) { +window.escapeQuotesHTML = function( text ) { var re = new RegExp( '&', "g" ); text = text.replace( re, "&" ); re = new RegExp( '"', "g" ); @@ -210,14 +232,16 @@ function escapeQuotesHTML( text ) { re = new RegExp( '>', "g" ); text = text.replace( re, ">" ); return text; -} +}; /** * Set the accesskey prefix based on browser detection. */ -var tooltipAccessKeyPrefix = 'alt-'; +window.tooltipAccessKeyPrefix = 'alt-'; if ( is_opera ) { tooltipAccessKeyPrefix = 'shift-esc-'; +} else if ( is_chrome ) { + tooltipAccessKeyPrefix = is_chrome_mac ? 'ctrl-option-' : 'alt-'; } else if ( !is_safari_win && is_safari && webkit_version > 526 ) { tooltipAccessKeyPrefix = 'ctrl-alt-'; } else if ( !is_safari_win && ( is_safari @@ -227,7 +251,7 @@ if ( is_opera ) { } else if ( is_ff2 ) { tooltipAccessKeyPrefix = 'alt-shift-'; } -var tooltipAccessKeyRegexp = /\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/; +window.tooltipAccessKeyRegexp = /\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/; /** * Add the appropriate prefix to the accesskey shown in the tooltip. @@ -235,9 +259,9 @@ var tooltipAccessKeyRegexp = /\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/; * otherwise, all the nodes that will probably have accesskeys by * default are updated. * - * @param Array nodeList -- list of elements to update + * @param nodeList Array list of elements to update */ -function updateTooltipAccessKeys( nodeList ) { +window.updateTooltipAccessKeys = function( nodeList ) { if ( !nodeList ) { // 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 @@ -267,7 +291,7 @@ function updateTooltipAccessKeys( nodeList ) { element.setAttribute( 'title', tip ); } } -} +}; /** * Add a link to one of the portlet menus on the page, including: @@ -287,22 +311,40 @@ function updateTooltipAccessKeys( nodeList ) { * nextnode parameter; to add the link _after_ an existing item, pass * the node's nextSibling instead. * - * @param String portlet -- id of the target portlet ("p-cactions", "p-personal", "p-navigation" or "p-tb") - * @param String href -- link URL - * @param String text -- link text (will be automatically lowercased by CSS for p-cactions in Monobook) - * @param String id -- id of the new item, should be unique and preferably have the appropriate prefix ("ca-", "pt-", "n-" or "t-") - * @param String tooltip -- text to show when hovering over the link, without accesskey suffix - * @param String accesskey -- accesskey to activate this link (one character, try to avoid conflicts) - * @param Node nextnode -- the DOM node before which the new item should be added, should be another item in the same list + * @param portlet String id of the target portlet ("p-cactions", "p-personal", "p-navigation" or "p-tb") + * @param href String link URL + * @param text String link text (will be automatically lowercased by CSS for p-cactions in Monobook) + * @param id String id of the new item, should be unique and preferably have the appropriate prefix ("ca-", "pt-", "n-" or "t-") + * @param tooltip String text to show when hovering over the link, without accesskey suffix + * @param accesskey String accesskey to activate this link (one character, try to avoid conflicts) + * @param nextnode Node the DOM node before which the new item should be added, should be another item in the same list * * @return Node -- the DOM node of the new item (an LI element) or null */ -function addPortletLink( portlet, href, text, id, tooltip, accesskey, nextnode ) { +window.addPortletLink = function( portlet, href, text, id, tooltip, accesskey, nextnode ) { var root = document.getElementById( portlet ); if ( !root ) { return null; } - var node = root.getElementsByTagName( 'ul' )[0]; + var uls = root.getElementsByTagName( 'ul' ); + var node; + if ( uls.length > 0 ) { + node = uls[0]; + } else { + node = document.createElement( 'ul' ); + var lastElementChild = null; + for ( var i = 0; i < root.childNodes.length; ++i ) { /* get root.lastElementChild */ + if ( root.childNodes[i].nodeType == 1 ) { + lastElementChild = root.childNodes[i]; + } + } + if ( lastElementChild && lastElementChild.nodeName.match( /div/i ) ) { + /* Insert into the menu divs */ + lastElementChild.appendChild( node ); + } else { + root.appendChild( node ); + } + } if ( !node ) { return null; } @@ -310,15 +352,16 @@ function addPortletLink( portlet, href, text, id, tooltip, accesskey, nextnode ) // 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( span ); + link.appendChild( document.createTextNode( text ) ); link.href = href; + // Wrap in a span - make it work with vector tabs and has no effect on any other portlets + var span = document.createElement( 'span' ); + span.appendChild( link ); + var item = document.createElement( 'li' ); - item.appendChild( link ); + item.appendChild( span ); if ( id ) { item.id = id; } @@ -341,15 +384,21 @@ function addPortletLink( portlet, href, text, id, tooltip, accesskey, nextnode ) } return item; -} +}; -function getInnerText( el ) { +window.getInnerText = function( el ) { if ( typeof el == 'string' ) { return el; } if ( typeof el == 'undefined' ) { return el; } + // Custom sort value through 'data-sort-value' attribute + // (no need to prepend hidden text to change sort value) + if ( el.nodeType && el.getAttribute( 'data-sort-value' ) !== null ) { + // Make sure it's a valid DOM element (.nodeType) and that the attribute is set (!null) + return el.getAttribute( 'data-sort-value' ); + } if ( el.textContent ) { return el.textContent; // not needed but it is faster } @@ -371,24 +420,24 @@ function getInnerText( el ) { } } return str; -} +}; /* Dummy for deprecated function */ window.ta = []; -function akeytt( doId ) { -} +window.akeytt = function( doId ) { +}; -var checkboxes; -var lastCheckbox; +window.checkboxes = undefined; +window.lastCheckbox = undefined; -function setupCheckboxShiftClick() { +window.setupCheckboxShiftClick = function() { checkboxes = []; lastCheckbox = null; var inputs = document.getElementsByTagName( 'input' ); addCheckboxClickHandlers( inputs ); -} +}; -function addCheckboxClickHandlers( inputs, start ) { +window.addCheckboxClickHandlers = function( inputs, start ) { if ( !start ) { start = 0; } @@ -400,13 +449,13 @@ function addCheckboxClickHandlers( inputs, start ) { for ( var i = start; i < finish; i++ ) { var cb = inputs[i]; - if ( !cb.type || cb.type.toLowerCase() != 'checkbox' ) { + if ( !cb.type || cb.type.toLowerCase() != 'checkbox' || ( ' ' + cb.className + ' ' ).indexOf( ' noshiftselect ' ) != -1 ) { continue; } var end = checkboxes.length; checkboxes[end] = cb; cb.index = end; - cb.onclick = checkboxClickHandler; + addClickHandler( cb, checkboxClickHandler ); } if ( finish < inputs.length ) { @@ -414,9 +463,9 @@ function addCheckboxClickHandlers( inputs, start ) { addCheckboxClickHandlers( inputs, finish ); }, 200 ); } -} +}; -function checkboxClickHandler( e ) { +window.checkboxClickHandler = function( e ) { if ( typeof e == 'undefined' ) { e = window.event; } @@ -441,7 +490,7 @@ function checkboxClickHandler( e ) { } lastCheckbox = this.index; return true; -} +}; /* @@ -450,7 +499,7 @@ function checkboxClickHandler( e ) { Author says "The credit comment is all it takes, no license. Go crazy with it!:-)" From http://www.robertnyman.com/2005/11/07/the-ultimate-getelementsbyclassname/ */ -function getElementsByClassName( oElm, strTagName, oClassNames ) { +window.getElementsByClassName = function( oElm, strTagName, oClassNames ) { var arrReturnElements = new Array(); if ( typeof( oElm.getElementsByClassName ) == 'function' ) { /* Use a native implementation where possible FF3, Saf3.2, Opera 9.5 */ @@ -492,9 +541,9 @@ function getElementsByClassName( oElm, strTagName, oClassNames ) { } } return ( arrReturnElements ); -} +}; -function redirectToFragment( fragment ) { +window.redirectToFragment = function( fragment ) { var match = navigator.userAgent.match(/AppleWebKit\/(\d+)/); if ( match ) { var webKitVersion = parseInt( match[1] ); @@ -504,19 +553,24 @@ function redirectToFragment( fragment ) { return; } } - if ( is_gecko ) { - // Mozilla needs to wait until after load, otherwise the window doesn't scroll - addOnloadHook(function() { - if ( window.location.hash == '' ) { - window.location.hash = fragment; - } - }); - } else { - if ( window.location.hash == '' ) { - window.location.hash = fragment; + if ( window.location.hash == '' ) { + window.location.hash = fragment; + + // Mozilla needs to wait until after load, otherwise the window doesn't + // scroll. See . + // There's no obvious way to detect this programmatically, so we use + // version-testing. If Firefox fixes the bug, they'll jump twice, but + // better twice than not at all, so make the fix hit future versions as + // well. + if ( is_gecko ) { + addOnloadHook(function() { + if ( window.location.hash == fragment ) { + window.location.hash = fragment; + } + }); } } -} +}; /* * Table sorting script based on one (c) 1997-2006 Stuart Langridge and Joost @@ -529,16 +583,16 @@ function redirectToFragment( fragment ) { * @todo support all accepted date formats (bug 8226) */ -var ts_image_path = stylepath + '/common/images/'; -var ts_image_up = 'sort_up.gif'; -var ts_image_down = 'sort_down.gif'; -var ts_image_none = 'sort_none.gif'; -var ts_europeandate = wgContentLanguage != 'en'; // The non-American-inclined can change to "true" -var ts_alternate_row_colors = false; -var ts_number_transform_table = null; -var ts_number_regex = null; +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; -function sortables_init() { +window.sortables_init = function() { var idnum = 0; // Find all tables with class sortable and make them sortable var tables = getElementsByClassName( document, 'table', 'sortable' ); @@ -549,9 +603,9 @@ function sortables_init() { } ts_makeSortable( tables[ti] ); } -} +}; -function ts_makeSortable( table ) { +window.ts_makeSortable = function( table ) { var firstRow; if ( table.rows && table.rows.length > 0 ) { if ( table.tHead && table.tHead.rows.length > 0 ) { @@ -568,25 +622,25 @@ function ts_makeSortable( table ) { for ( var i = 0; i < firstRow.cells.length; i++ ) { var cell = firstRow.cells[i]; if ( (' ' + cell.className + ' ').indexOf(' unsortable ') == -1 ) { - cell.innerHTML += '' + '' + '↓'; + + '" alt="↓"/>'); } } if ( ts_alternate_row_colors ) { ts_alternate( table ); } -} +}; -function ts_getInnerText( el ) { +window.ts_getInnerText = function( el ) { return getInnerText( el ); -} +}; -function ts_resortTable( lnk ) { +window.ts_resortTable = function( lnk ) { // get the span var span = lnk.getElementsByTagName('span')[0]; @@ -614,7 +668,15 @@ function ts_resortTable( lnk ) { // 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 ) { @@ -703,20 +765,20 @@ function ts_resortTable( lnk ) { if ( ts_alternate_row_colors ) { ts_alternate( table ); } -} +}; -function ts_initTransformTable() { +window.ts_initTransformTable = function() { if ( typeof wgSeparatorTransformTable == 'undefined' || ( wgSeparatorTransformTable[0] == '' && wgDigitTransformTable[2] == '' ) ) { - digitClass = "[0-9,.]"; + var 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"); + 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]; } @@ -728,8 +790,8 @@ function ts_initTransformTable() { } // Construct regex for number identification - digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ',', '\\.']; - maxDigitLength = 1; + 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( @@ -741,9 +803,9 @@ function ts_initTransformTable() { } } if ( maxDigitLength > 1 ) { - digitClass = '[' + digits.join( '', digits ) + ']'; + var digitClass = '[' + digits.join( '', digits ) + ']'; } else { - digitClass = '(' + digits.join( '|', digits ) + ')'; + var digitClass = '(' + digits.join( '|', digits ) + ')'; } } @@ -756,13 +818,13 @@ function ts_initTransformTable() { "[-+\u2212]?" + digitClass + "+%?" + // Generic localised ")$", "i" ); -} +}; -function ts_toLowerCase( s ) { +window.ts_toLowerCase = function( s ) { return s.toLowerCase(); -} +}; -function ts_dateToSortKey( date ) { +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() ) { @@ -812,7 +874,7 @@ function ts_dateToSortKey( date ) { return date.substr( 6, 4 ) + date.substr( 3, 2 ) + date.substr( 0, 2 ); } } else if ( date.length == 8 ) { - yr = date.substr( 6, 2 ); + var yr = date.substr( 6, 2 ); if ( parseInt( yr ) < 50 ) { yr = '20' + yr; } else { @@ -825,9 +887,9 @@ function ts_dateToSortKey( date ) { } } return '00000000'; -} +}; -function ts_parseFloat( s ) { +window.ts_parseFloat = function( s ) { if ( !s ) { return 0; } @@ -844,19 +906,19 @@ function ts_parseFloat( s ) { } s = newNum; } - num = parseFloat( s.replace(/[, ]/g, '').replace("\u2212", '-') ); + var num = parseFloat( s.replace(/[, ]/g, '').replace("\u2212", '-') ); return ( isNaN( num ) ? -Infinity : num ); -} +}; -function ts_currencyToSortKey( s ) { +window.ts_currencyToSortKey = function( s ) { return ts_parseFloat(s.replace(/[^-\u22120-9.,]/g,'')); -} +}; -function ts_sort_generic( a, b ) { +window.ts_sort_generic = function( a, b ) { return a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : a[2] - b[2]; -} +}; -function ts_alternate( table ) { +window.ts_alternate = function( table ) { // Take object table and get all it's tbodies. var tableBodies = table.getElementsByTagName( 'tbody' ); // Loop through these tbodies @@ -877,7 +939,7 @@ function ts_alternate( table ) { tableRows[j].className = newClassName + ( j % 2 == 0 ? 'even' : 'odd' ); } } -} +}; /* * End of table sorting code @@ -888,12 +950,12 @@ function ts_alternate( table ) { * Add a cute little box at the top of the screen to inform the user of * something, replacing any preexisting message. * - * @param String -or- Dom Object message HTML to be put inside the right div - * @param String className Used in adding a class; should be different for each + * @param message String -or- Dom Object HTML to be put inside the right div + * @param className String Used in adding a class; should be different for each * call to allow CSS/JS to hide different boxes. null = no class used. * @return Boolean True on success, false on failure */ -function jsMsg( message, className ) { +window.jsMsg = function( message, className ) { if ( !document.getElementById ) { return false; } @@ -937,7 +999,7 @@ function jsMsg( message, className ) { messageDiv.innerHTML = message; } return true; -} +}; /** * Inject a cute little progress spinner after the specified element @@ -945,7 +1007,7 @@ function jsMsg( message, className ) { * @param element Element to inject after * @param id Identifier string (for use with removeSpinner(), below) */ -function injectSpinner( element, id ) { +window.injectSpinner = function( element, id ) { var spinner = document.createElement( 'img' ); spinner.id = 'mw-spinner-' + id; spinner.src = stylepath + '/common/images/spinner.gif'; @@ -955,21 +1017,21 @@ function injectSpinner( element, id ) { } else { element.parentNode.appendChild( spinner ); } -} +}; /** * Remove a progress spinner added with injectSpinner() * * @param id Identifier string */ -function removeSpinner( id ) { +window.removeSpinner = function( id ) { var spinner = document.getElementById( 'mw-spinner-' + id ); if( spinner ) { spinner.parentNode.removeChild( spinner ); } -} +}; -function runOnloadHook() { +window.runOnloadHook = function() { // don't run anything below this for non-dom browsers if ( doneOnloadHook || !( document.getElementById && document.getElementsByTagName ) ) { return; @@ -981,53 +1043,58 @@ function runOnloadHook() { updateTooltipAccessKeys( null ); setupCheckboxShiftClick(); - sortables_init(); + + jQuery( document ).ready( sortables_init ); // Run any added-on functions for ( var i = 0; i < onloadFuncts.length; i++ ) { onloadFuncts[i](); } -} +}; /** * Add an event handler to an element * - * @param Element element Element to add handler to - * @param String attach Event to attach to - * @param callable handler Event handler callback + * @param element Element to add handler to + * @param attach String Event to attach to + * @param handler callable Event handler callback */ -function addHandler( element, attach, handler ) { - if( window.addEventListener ) { +window.addHandler = function( element, attach, handler ) { + if( element.addEventListener ) { element.addEventListener( attach, handler, false ); - } else if( window.attachEvent ) { + } else if( element.attachEvent ) { element.attachEvent( 'on' + attach, handler ); } -} +}; + +window.hookEvent = function( hookName, hookFunct ) { + addHandler( window, hookName, hookFunct ); +}; /** * Add a click event handler to an element * - * @param Element element Element to add handler to - * @param callable handler Event handler callback + * @param element Element to add handler to + * @param handler callable Event handler callback */ -function addClickHandler( element, handler ) { +window.addClickHandler = function( 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 + * @param element Element to remove handler from + * @param remove String Event to remove + * @param handler callable Event handler callback to remove */ -function removeHandler( element, remove, handler ) { +window.removeHandler = function( 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 ); @@ -1036,7 +1103,4 @@ if ( ie6_bugs ) { importScriptURI( stylepath + '/common/IEFixes.js' ); } -// For future use. -mw = {}; - - +showTocToggle(); -- cgit v1.2.3-54-g00ecf