From: Aryeh Gregor Date: Tue, 12 Jan 2010 23:36:02 +0000 (+0000) Subject: Merge IEFixes.js into wikibits.js X-Git-Tag: 1.31.0-rc.0~38297 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=b6da3ab031bfdbc04e5c2a610fd6149abd86e9dc;p=lhc%2Fweb%2Fwiklou.git Merge IEFixes.js into wikibits.js Not actually tested, but it should theoretically work fine. This previously wasn't getting loaded for skins other than Monobook, Modern, and Vector, and each one had separate code to load it. I also removed . This was added by Gabriel Wicke without explanation as part of the original davinci.pt back in r2786, in March 2004. As far as I can tell, it disables some minor feature of IE6 for some reason. I assume it can be removed completely at this point. If not, it should be readded without the conditional comment, which is probably unnecessary. --- diff --git a/skins/Modern.php b/skins/Modern.php index aa95adc9d1..946293b660 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -36,13 +36,6 @@ class SkinModern extends SkinTemplate { $out->addStyle( 'modern/main.css', 'screen' ); $out->addStyle( 'modern/print.css', 'print' ); $out->addStyle( 'modern/rtl.css', 'screen', '', 'rtl' ); - - $path = htmlspecialchars( $wgStylePath ); - $out->addScript( << - -HTML - ); } } diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 3c2c1a30ec..fab8015cab 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -42,13 +42,6 @@ class SkinMonoBook extends SkinTemplate { $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); - # FIXME: What is this? Should it apply to all skins? - $path = htmlspecialchars( $wgStylePath ); - $out->addScript( << - -HTML - ); } } diff --git a/skins/Vector.php b/skins/Vector.php index fc9f3c3539..9f888d6862 100644 --- a/skins/Vector.php +++ b/skins/Vector.php @@ -48,17 +48,6 @@ class SkinVector extends SkinTemplate { $out->addStyle( 'vector/' . $style, 'screen' ); } } - // Append common IE fixes, which perhaps should be included in all - // skins, but for now it seems each skin needs to include them - // explicitly - $out->addScript( - '' - ); } /** * Builds a structured array of links used for tabs and menus diff --git a/skins/common/IEFixes.js b/skins/common/IEFixes.js deleted file mode 100644 index 0442f454a4..0000000000 --- a/skins/common/IEFixes.js +++ /dev/null @@ -1,127 +0,0 @@ -// IE fixes javascript - -var isMSIE55 = (window.showModalDialog && window.clipboardData && window.createPopup); -var doneIETransform; -var doneIEAlphaFix; - -if (document.attachEvent) - document.attachEvent('onreadystatechange', hookit); - -function hookit() { - if (!doneIETransform && document.getElementById && document.getElementById('bodyContent')) { - doneIETransform = true; - relativeforfloats(); - fixalpha(); - } -} - -// png alpha transparency fixes -function fixalpha( logoId ) { - // bg - if (isMSIE55 && !doneIEAlphaFix) - { - var plogo = document.getElementById( logoId || 'p-logo' ); - if (!plogo) return; - - var logoa = plogo.getElementsByTagName('a')[0]; - if (!logoa) return; - - var bg = logoa.currentStyle.backgroundImage; - var imageUrl = bg.substring(5, bg.length-2); - - doneIEAlphaFix = true; - - if (imageUrl.substr(imageUrl.length-4).toLowerCase() == '.png') { - var logospan = logoa.appendChild(document.createElement('span')); - - logoa.style.backgroundImage = 'none'; - logospan.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src=' + imageUrl + ')'; - logospan.style.height = '100%'; - logospan.style.position = 'absolute'; - logospan.style.width = logoa.currentStyle.width; - logospan.style.cursor = 'hand'; - // Center image with hack for IE5.5 - if (document.documentElement.dir == "rtl") - { - logospan.style.right = '50%'; - logospan.style.setExpression('marginRight', '"-" + (this.offsetWidth / 2) + "px"'); - } - else - { - logospan.style.left = '50%'; - logospan.style.setExpression('marginLeft', '"-" + (this.offsetWidth / 2) + "px"'); - } - logospan.style.top = '50%'; - logospan.style.setExpression('marginTop', '"-" + (this.offsetHeight / 2) + "px"'); - - var linkFix = logoa.appendChild(logoa.cloneNode()); - linkFix.style.position = 'absolute'; - linkFix.style.height = '100%'; - linkFix.style.width = '100%'; - } - } -} - -// fix ie6 disappering float bug -function relativeforfloats() { - var bc = document.getElementById('bodyContent'); - if (bc) { - var tables = bc.getElementsByTagName('table'); - var divs = bc.getElementsByTagName('div'); - } - setrelative(tables); - setrelative(divs); -} -function setrelative (nodes) { - var i = 0; - while (i < nodes.length) { - if(((nodes[i].style.float && nodes[i].style.float != ('none') || - (nodes[i].align && nodes[i].align != ('none'))) && - (!nodes[i].style.position || nodes[i].style.position != 'relative'))) - { - nodes[i].style.position = 'relative'; - } - i++; - } -} - - -// Expand links for printing - -String.prototype.hasClass = function(classWanted) -{ - var classArr = this.split(/\s/); - for (var i=0; i