dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 366dce1)
Move link-underline user preference rule to body class
authorEd Sanders <esanders@wikimedia.org>
Wed, 7 Sep 2016 22:51:48 +0000 (15:51 -0700)
committerTimo Tijhof <krinklemail@gmail.com>
Fri, 2 Dec 2016 19:25:03 +0000 (11:25 -0800)
ResourceLoaderUserCSSPrefsModule is now empty and can be removed.

Change-Id: I806e117131765b859e990c14735bb9494db9a37e

autoload.php patch | blob | history
includes/OutputPage.php patch | blob | history
includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php [deleted file] patch | blob | history
maintenance/dictionary/mediawiki.dic patch | blob | history
resources/Resources.php patch | blob | history
resources/src/mediawiki.legacy/shared.css patch | blob | history

diff --git a/autoload.php b/autoload.php
index 0d6407b..a154555 100644 (file)
--- 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 6070114..bae871e 100644 (file)
--- 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 <body> 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 (file)
index aef1c74..0000000
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ResourceLoader module for user preference customizations.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Trevor Parscal
- * @author Roan Kattouw
- */
-
-/**
- * Module for user preference customizations
- */
-class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
-
-       protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
-
-       /**
-        * @return bool
-        */
-       public function enableModuleContentVersion() {
-               return true;
-       }
-
-       /**
-        * @param ResourceLoaderContext $context
-        * @return array
-        */
-       public function getStyles( ResourceLoaderContext $context ) {
-               if ( !$this->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 914336f..a2a06d2 100644 (file)
--- 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 b37febd..a556b60 100644 (file)
--- 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 59f892e..42392ed 100644 (file)
--- 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
  */
Wiklou, le Wiki du Wiklou