From 34e798464c7d9d67a214f5ee80ea7051659b62aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Thu, 7 May 2015 00:15:19 +0200 Subject: [PATCH] Resources: Remove pointless 'position' => 'top' for ResourceLoaderImageModule modules ResourceLoaderImageModule ignores this option and always uses 'bottom'. And these modules should indeed all use bottom, the images they provide are not critical and need not be loaded in the head. (Alas, we load them with addModuleStyles, which in turn ignores the position and always loads in the head. This is a separate problem.) Change-Id: I3da808f894f7a9058ea4a44a7ce814e216b59e5e --- resources/Resources.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/resources/Resources.php b/resources/Resources.php index b32dd33c93..02d7874d85 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1762,7 +1762,6 @@ return array( 'oojs-ui.styles.icons' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1770,19 +1769,16 @@ return array( ), 'oojs-ui.styles.indicators' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'indicators.json', ), 'oojs-ui.styles.textures' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'textures.json', ), 'oojs-ui.styles.icons-alerts' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-alerts.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1790,7 +1786,6 @@ return array( ), 'oojs-ui.styles.icons-content' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-content.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1798,7 +1793,6 @@ return array( ), 'oojs-ui.styles.icons-editing-advanced' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-advanced.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1806,7 +1800,6 @@ return array( ), 'oojs-ui.styles.icons-editing-core' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-core.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1814,7 +1807,6 @@ return array( ), 'oojs-ui.styles.icons-editing-list' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-list.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1822,7 +1814,6 @@ return array( ), 'oojs-ui.styles.icons-editing-styling' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-editing-styling.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1830,7 +1821,6 @@ return array( ), 'oojs-ui.styles.icons-interactions' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-interactions.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1838,7 +1828,6 @@ return array( ), 'oojs-ui.styles.icons-layout' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-layout.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1846,7 +1835,6 @@ return array( ), 'oojs-ui.styles.icons-location' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-location.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1854,7 +1842,6 @@ return array( ), 'oojs-ui.styles.icons-media' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-media.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1862,7 +1849,6 @@ return array( ), 'oojs-ui.styles.icons-moderation' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-moderation.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1870,7 +1856,6 @@ return array( ), 'oojs-ui.styles.icons-movement' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-movement.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1878,7 +1863,6 @@ return array( ), 'oojs-ui.styles.icons-user' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-user.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', @@ -1886,7 +1870,6 @@ return array( ), 'oojs-ui.styles.icons-wikimedia' => array( 'class' => 'ResourceLoaderImageModule', - 'position' => 'top', 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki", 'data' => 'icons-wikimedia.json', 'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before', -- 2.20.1