[RL] pass 'media' property to <link> tags as well (in already did it for the <style...

*  (Follows-up r88053 c22683 CR)
* Whitespace fix in Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index b5ceed1..1d0a5a4 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -47,8 +47,10 @@ return array(
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.modern' => array(
-               'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
-                               'modern/print.css' => array( 'media' => 'print' ) ),
+               'styles' => array(
+                       'modern/main.css' => array( 'media' => 'screen' ),
+                       'modern/print.css' => array( 'media' => 'print' ),
+               ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index f03b2ce..7da2821 100644 (file)
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -521,6 +521,7 @@ window.mw = window.mediaWiki = new ( function( $ ) {
                                                for ( var i = 0; i < style.length; i++ ) {
                                                        getMarker().before( mw.html.element( 'link', {
                                                                'type': 'text/css',
+                                                               'media': media,
                                                                'rel': 'stylesheet',
                                                                'href': style[i]
                                                        } ) );