r61473 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r61472‎ | r61473 | r61474 >
Date:20:18, 24 January 2010
Author:catrope
Status:deferred
Tags:
Comment:
UsabilityIntiative: Include js2stopgap with OutputPage::includeJQuery() in MediaWiki < 1.17 to fix double-loading issues causing other jQuery-using extensions (Translate, LiquidThreads) to break
Modified paths:
  • /trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
@@ -48,18 +48,6 @@
4949 'combined' => array(),
5050 'minified' => array()
5151 ),
52 - // Code to include when js2 is not present
53 - 'no_js2' => array(
54 - 'raw' => array(
55 - array( 'src' => '/js2/js2stopgap.js' )
56 - ),
57 - 'combined' => array(
58 - array( 'src' => '/js2/js2stopgap.js' )
59 - ),
60 - 'minified' => array(
61 - array( 'src' => '/js2/js2stopgap.min.js' )
62 - ),
63 - ),
6452 // Core functionality of extension
6553 'base_sets' => array(
6654 'raw' => array(
@@ -232,9 +220,7 @@
233221 // Provide backward support for mediaWiki less than 1.17
234222 // by including "no_js2" js.
235223 if ( !version_compare( floatval( $wgVersion ), '1.17', '>=') ) {
236 - self::$scripts = array_merge(
237 - self::$scriptFiles['no_js2'][$mode], self::$scripts
238 - );
 224+ $out->includeJQuery();
239225 }
240226 // Include base-set of styles
241227 self::$styles = array_merge(

Status & tagging log