| Index: branches/resourceloader/phase3/includes/SkinTemplate.php |
| — | — | @@ -107,8 +107,8 @@ |
| 108 | 108 | * @param $out OutputPage |
| 109 | 109 | */ |
| 110 | 110 | function setupSkinUserCss( OutputPage $out ){ |
| 111 | | - $out->addStyle( 'common/shared.css', 'screen' ); |
| 112 | | - $out->addStyle( 'common/commonPrint.css', 'print' ); |
| | 111 | + $out->addModuleStyles( 'mediawiki.legacy.shared' ); |
| | 112 | + $out->addModuleStyles( 'mediawiki.legacy.commonPrint' ); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
| Index: branches/resourceloader/phase3/includes/Skin.php |
| — | — | @@ -680,8 +680,9 @@ |
| 681 | 681 | * @param $out OutputPage |
| 682 | 682 | */ |
| 683 | 683 | function setupSkinUserCss( OutputPage $out ) { |
| 684 | | - $out->addStyle( 'common/shared.css' ); |
| 685 | | - $out->addStyle( 'common/oldshared.css' ); |
| | 684 | + // This includes the shared.js and oldshared.js files from skins/common/ |
| | 685 | + $out->addModuleStyles( 'mediawiki.legacy.shared' ); |
| | 686 | + // TODO: Figure out how to best integrate this stuff into ResourceLoader |
| 686 | 687 | $out->addStyle( $this->getStylesheet() ); |
| 687 | 688 | $out->addStyle( 'common/common_rtl.css', '', '', 'rtl' ); |
| 688 | 689 | } |
| Index: branches/resourceloader/phase3/resources/Resources.php |
| — | — | @@ -291,6 +291,9 @@ |
| 292 | 292 | 'scripts' => 'skins/common/enhancedchanges.js', |
| 293 | 293 | 'dependencies' => 'mediawiki', |
| 294 | 294 | ) ), |
| | 295 | + 'mediawiki.legacy.commonPrint' => new ResourceLoaderFileModule( array( |
| | 296 | + 'scripts' => 'skins/common/commonPrint.css', |
| | 297 | + ) ), |
| 295 | 298 | 'mediawiki.legacy.config' => new ResourceLoaderFileModule( array( |
| 296 | 299 | 'scripts' => 'skins/common/config.js', |
| 297 | 300 | 'styles' => array( 'skins/common/config.css', 'skins/common/config-cc.css' ), |
| — | — | @@ -346,6 +349,10 @@ |
| 347 | 350 | 'scripts' => 'skins/common/search.js', |
| 348 | 351 | 'dependencies' => 'mediawiki', |
| 349 | 352 | ) ), |
| | 353 | + 'mediawiki.legacy.shared' => new ResourceLoaderFileModule( array( |
| | 354 | + 'scripts' => 'skins/common/shared.css', |
| | 355 | + 'scripts' => 'skins/common/oldshared.css', |
| | 356 | + ) ), |
| 350 | 357 | 'mediawiki.legacy.upload' => new ResourceLoaderFileModule( array( |
| 351 | 358 | 'scripts' => 'skins/common/upload.js', |
| 352 | 359 | 'dependencies' => 'mediawiki', |