From 5ee5ae6f69d76e0d3a453a53f627a00833f47349 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Wed, 7 Sep 2016 15:51:48 -0700 Subject: [PATCH] Move link-underline user preference rule to body class ResourceLoaderUserCSSPrefsModule is now empty and can be removed. Change-Id: I806e117131765b859e990c14735bb9494db9a37e --- autoload.php | 1 - includes/OutputPage.php | 9 +- .../ResourceLoaderUserCSSPrefsModule.php | 87 ------------------- maintenance/dictionary/mediawiki.dic | 1 - resources/Resources.php | 3 - resources/src/mediawiki.legacy/shared.css | 10 +++ 6 files changed, 18 insertions(+), 93 deletions(-) delete mode 100644 includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php diff --git a/autoload.php b/autoload.php index 0d6407bc20..a154555fce 100644 --- a/autoload.php +++ b/autoload.php @@ -1197,7 +1197,6 @@ $wgAutoloadLocalClasses = [ 'ResourceLoaderSpecialCharacterDataModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php', 'ResourceLoaderStartUpModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderStartUpModule.php', 'ResourceLoaderUploadDialogModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUploadDialogModule.php', - 'ResourceLoaderUserCSSPrefsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php', 'ResourceLoaderUserDefaultsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserDefaultsModule.php', 'ResourceLoaderUserModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserModule.php', 'ResourceLoaderUserOptionsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserOptionsModule.php', diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 60701141a7..bae871e445 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2740,7 +2740,6 @@ class OutputPage extends ContextSource { 'site.styles', 'noscript', 'user.styles', - 'user.cssprefs', ] ); $this->getSkin()->setupSkinUserCss( $this ); @@ -2853,6 +2852,14 @@ class OutputPage extends ContextSource { $bodyClasses[] = $userdir; $bodyClasses[] = "sitedir-$sitedir"; + $underline = $this->getUser()->getOption( 'underline' ); + if ( $underline < 2 ) { + // The following classes can be used here: + // * mw-underline-always + // * mw-underline-never + $bodyClasses[] = 'mw-underline-' . ( $underline ? 'always' : 'never' ); + } + if ( $this->getLanguage()->capitalizeAllNouns() ) { # A class is probably not the best way to do this . . . $bodyClasses[] = 'capitalize-all-nouns'; diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php deleted file mode 100644 index aef1c74452..0000000000 --- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php +++ /dev/null @@ -1,87 +0,0 @@ -getConfig()->get( 'AllowUserCssPrefs' ) ) { - return []; - } - - $options = $context->getUserObj()->getOptions(); - - // Build CSS rules - $rules = []; - - // Underline: 2 = skin default, 1 = always, 0 = never - if ( $options['underline'] < 2 ) { - $rules[] = "a { text-decoration: " . - ( $options['underline'] ? 'underline' : 'none' ) . "; }"; - } - $style = implode( "\n", $rules ); - if ( $this->getFlip( $context ) ) { - $style = CSSJanus::transform( $style, true, false ); - } - return [ 'all' => $style ]; - } - - /** - * @param ResourceLoaderContext $context - * @return bool - */ - public function isKnownEmpty( ResourceLoaderContext $context ) { - $styles = $this->getStyles( $context ); - return isset( $styles['all'] ) && $styles['all'] === ''; - } - - /** - * @return string - */ - public function getGroup() { - return 'private'; - } - - /** - * @return string - */ - public function getType() { - return self::LOAD_STYLES; - } -} diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic index 914336f844..a2a06d2aa3 100644 --- a/maintenance/dictionary/mediawiki.dic +++ b/maintenance/dictionary/mediawiki.dic @@ -1036,7 +1036,6 @@ csrf css cssclass csslinks -cssprefs cta ctime ctor diff --git a/resources/Resources.php b/resources/Resources.php index b37febdac8..a556b60ae4 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -53,9 +53,6 @@ return [ 'user' => [ 'class' => 'ResourceLoaderUserModule' ], 'user.styles' => [ 'class' => 'ResourceLoaderUserStylesModule' ], - // Scripts generated based on the current user's preferences - 'user.cssprefs' => [ 'class' => 'ResourceLoaderUserCSSPrefsModule' ], - // Populate mediawiki.user placeholders with information about the current user 'user.defaults' => [ 'class' => 'ResourceLoaderUserDefaultsModule' ], 'user.options' => [ 'class' => 'ResourceLoaderUserOptionsModule' ], diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index 59f892e0f0..42392ed68c 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -124,6 +124,16 @@ span.comment { font-family: serif; } +/* Underline preference */ + +.mw-underline-always a { + text-decoration: underline; +} + +.mw-underline-never a { + text-decoration: none; +} + /** * rev_deleted stuff */ -- 2.20.1