http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97362
Revision: 97362
Author: krinkle
Date: 2011-09-17 02:32:36 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
[RL] pass 'media' property to <link> tags as well (in already did it for the
<style> tags). Fixes debug-mode bug where print stylesheet were loaded in e.g.
'skins.modern'.
* (Follows-up r88053 c22683 CR)
* Whitespace fix in Resources.php
Modified Paths:
--------------
trunk/phase3/resources/Resources.php
trunk/phase3/resources/mediawiki/mediawiki.js
Modified: trunk/phase3/resources/Resources.php
===================================================================
--- trunk/phase3/resources/Resources.php 2011-09-17 02:30:24 UTC (rev
97361)
+++ trunk/phase3/resources/Resources.php 2011-09-17 02:32:36 UTC (rev
97362)
@@ -47,8 +47,10 @@
'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'],
),
Modified: trunk/phase3/resources/mediawiki/mediawiki.js
===================================================================
--- trunk/phase3/resources/mediawiki/mediawiki.js 2011-09-17 02:30:24 UTC
(rev 97361)
+++ trunk/phase3/resources/mediawiki/mediawiki.js 2011-09-17 02:32:36 UTC
(rev 97362)
@@ -521,6 +521,7 @@
for ( var i = 0; i <
style.length; i++ ) {
getMarker().before(
mw.html.element( 'link', {
'type':
'text/css',
+ 'media': media,
'rel':
'stylesheet',
'href': style[i]
} ) );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
