From 22857ee2fe0157cf3c851965382607ba297e4502 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 17 Aug 2016 17:35:03 +0000 Subject: [PATCH] Revert "Work around T87871 to avoid double-loading OOjs UI PHP styles" We no longer need this workaround after T87871 was fixed. This reverts commit e65186c443a5887024da50b66fe92bcf267a0752. Change-Id: Ieba46fb07e1e92d9a6a86cb84d0ecaf208312baa --- includes/OutputPage.php | 3 --- resources/ResourcesOOUI.php | 11 +++-------- resources/src/oojs-ui-styles-skip.js | 9 --------- 3 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 resources/src/oojs-ui-styles-skip.js diff --git a/includes/OutputPage.php b/includes/OutputPage.php index f5a37d460a..374e7af664 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3813,9 +3813,6 @@ class OutputPage extends ContextSource { 'oojs-ui.styles.textures', 'mediawiki.widgets.styles', ] ); - // Used by 'skipFunction' of the four 'oojs-ui.styles.*' modules. Please don't treat this as a - // public API or you'll be severely disappointed when T87871 is fixed and it disappears. - $this->addMeta( 'X-OOUI-PHP', '1' ); } /** diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php index b31fe829f8..c3a287dc8d 100644 --- a/resources/ResourcesOOUI.php +++ b/resources/ResourcesOOUI.php @@ -68,6 +68,9 @@ return call_user_func( function () { 'es5-shim', 'oojs', 'oojs-ui-core.styles', + 'oojs-ui.styles.icons', + 'oojs-ui.styles.indicators', + 'oojs-ui.styles.textures', 'mediawiki.language', ], 'targets' => [ 'desktop', 'mobile' ], @@ -78,14 +81,6 @@ return call_user_func( function () { 'styles' => 'resources/src/oojs-ui-local.css', // HACK, see inside the file 'skinStyles' => $getSkinSpecific( 'core' ), 'targets' => [ 'desktop', 'mobile' ], - // ResourceLoaderImageModule doesn't support 'skipFunction', so instead we set this up so that - // this module is skipped together with its dependencies. Nothing else depends on these modules. - 'dependencies' => [ - 'oojs-ui.styles.icons', - 'oojs-ui.styles.indicators', - 'oojs-ui.styles.textures', - ], - 'skipFunction' => 'resources/src/oojs-ui-styles-skip.js', ]; // Additional widgets and layouts module. diff --git a/resources/src/oojs-ui-styles-skip.js b/resources/src/oojs-ui-styles-skip.js deleted file mode 100644 index 57c905a345..0000000000 --- a/resources/src/oojs-ui-styles-skip.js +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Skip function for OOjs UI PHP style modules. - * - * The `` is added to pages by OutputPage::enableOOUI(). - * - * Looking for elements in the DOM might be expensive, but it's probably better than double-loading - * 200 KB of CSS with embedded images because of bug T87871. - */ -return !!jQuery( 'meta[name="X-OOUI-PHP"]' ).length; -- 2.20.1