| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -374,47 +374,30 @@ |
| 375 | 375 | |
| 376 | 376 | /** |
| 377 | 377 | * Generated JavaScript action=raw&gen=js |
| 378 | | - * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate- |
| 379 | | - * nated together. For some bizarre reason, it does *not* return any |
| 380 | | - * custom user JS from subpages. Huh? |
| | 378 | + * This used to load MediaWiki:Common.js and the skin-specific style |
| | 379 | + * before the RessourceLoader. |
| 381 | 380 | * |
| 382 | | - * There's absolutely no reason to have separate Monobook/Common JSes. |
| 383 | | - * Any JS that cares can just check the skin variable generated at the |
| 384 | | - * top. For now Monobook.js will be maintained, but it should be consi- |
| 385 | | - * dered deprecated. |
| 386 | | - * |
| | 381 | + * @deprecated Use the RessourceLoader instead. This may be removed at some |
| | 382 | + * point. |
| 387 | 383 | * @param $skinName String: If set, overrides the skin name |
| 388 | | - * @return string |
| | 384 | + * @return String |
| 389 | 385 | */ |
| 390 | 386 | public function generateUserJs( $skinName = null ) { |
| 391 | | - |
| 392 | | - // Stub - see ResourceLoaderSiteModule, CologneBlue, Simple and Standard skins override this |
| 393 | | - |
| 394 | 387 | return ''; |
| 395 | 388 | } |
| 396 | 389 | |
| 397 | 390 | /** |
| 398 | 391 | * Generate user stylesheet for action=raw&gen=css |
| | 392 | + * |
| | 393 | + * @deprecated Use the RessourceLoader instead. This may be removed at some |
| | 394 | + * point. |
| | 395 | + * @return String |
| 399 | 396 | */ |
| 400 | 397 | public function generateUserStylesheet() { |
| 401 | | - |
| 402 | | - // Stub - see ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this |
| 403 | | - |
| 404 | 398 | return ''; |
| 405 | 399 | } |
| 406 | 400 | |
| 407 | 401 | /** |
| 408 | | - * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue |
| 409 | | - * Anything in here won't be generated if $wgAllowUserCssPrefs is false. |
| 410 | | - */ |
| 411 | | - protected function reallyGenerateUserStylesheet() { |
| 412 | | - |
| 413 | | - // Stub - see ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this |
| 414 | | - |
| 415 | | - return ''; |
| 416 | | - } |
| 417 | | - |
| 418 | | - /** |
| 419 | 402 | * @private |
| 420 | 403 | */ |
| 421 | 404 | function setupUserCss( OutputPage $out ) { |