r97362 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97361‎ | r97362 | r97363 >
Date:02:32, 17 September 2011
Author:krinkle
Status:ok
Tags:
Comment:
[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 (modified) (history)
  • /trunk/phase3/resources/mediawiki/mediawiki.js (modified) (history)

Diff [purge]

Index: trunk/phase3/resources/Resources.php
@@ -47,8 +47,10 @@
4848 'localBasePath' => $GLOBALS['wgStyleDirectory'],
4949 ),
5050 'skins.modern' => array(
51 - 'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
52 - 'modern/print.css' => array( 'media' => 'print' ) ),
 51+ 'styles' => array(
 52+ 'modern/main.css' => array( 'media' => 'screen' ),
 53+ 'modern/print.css' => array( 'media' => 'print' ),
 54+ ),
5355 'remoteBasePath' => $GLOBALS['wgStylePath'],
5456 'localBasePath' => $GLOBALS['wgStyleDirectory'],
5557 ),
Index: trunk/phase3/resources/mediawiki/mediawiki.js
@@ -521,6 +521,7 @@
522522 for ( var i = 0; i < style.length; i++ ) {
523523 getMarker().before( mw.html.element( 'link', {
524524 'type': 'text/css',
 525+ 'media': media,
525526 'rel': 'stylesheet',
526527 'href': style[i]
527528 } ) );

Follow-up revisions

RevisionCommit summaryAuthorDate
r974141.18: MFT r96775, r97362, r97365, r97381catrope11:36, 18 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r88053Added direct file loading functionality to debug mode for both scripts and st...tparscal12:15, 14 May 2011

Status & tagging log