From: Kunal Mehta <legoktm@gmail.com>
Date: Mon, 10 Aug 2015 04:44:27 +0000 (-0700)
Subject: Load 'mediawiki.legacy.commonPrint' styles with a media type property
X-Git-Tag: 1.31.0-rc.0~10470
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=11e47561e4652adf1180987f28a2d673286937a0;p=lhc%2Fweb%2Fwiklou.git

Load 'mediawiki.legacy.commonPrint' styles with a media type property

Split the 'mediawiki.legacy.commonPrint' styles into a separate <style>
tag which sets media="print", which will make it a non-render blocking
resource.

Bug: T108413
Change-Id: Ife1d65b31bc79f96d7b89b94fdaeb2babf7ddf40
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 72d8a7c417..26f9efad5a 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2909,7 +2909,8 @@ class OutputPage extends ContextSource {
 
 				// Automatically select style/script elements
 				if ( $only === ResourceLoaderModule::TYPE_STYLES ) {
-					$link = Html::linkedStyle( $url );
+					$media = $group === 'print' ? 'print' : 'all';
+					$link = Html::linkedStyle( $url, $media );
 				} else {
 					if ( $context->getRaw() || $isRaw ) {
 						// Startup module can't load itself, needs to use <script> instead of mw.loader.load
diff --git a/resources/Resources.php b/resources/Resources.php
index 2396128849..24c150e29f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1674,6 +1674,7 @@ return array(
 		'styles' => array(
 			'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
 		),
+		'group' => 'print',
 	),
 	'mediawiki.legacy.protect' => array(
 		'scripts' => 'resources/src/mediawiki.legacy/protect.js',