(bug 34289) user.options CSS loaded twice. Fixed by splitting off the CSS part of...
authorRoan Kattouw <catrope@users.mediawiki.org>
Thu, 9 Feb 2012 11:04:24 +0000 (11:04 +0000)
committerRoan Kattouw <catrope@users.mediawiki.org>
Thu, 9 Feb 2012 11:04:24 +0000 (11:04 +0000)
includes/AutoLoader.php
includes/OutputPage.php
includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php [new file with mode: 0644]
includes/resourceloader/ResourceLoaderUserOptionsModule.php
resources/Resources.php

index 9e9befd..a55dd1e 100644 (file)
@@ -724,6 +724,7 @@ $wgAutoloadLocalClasses = array(
        'ResourceLoaderNoscriptModule' => 'includes/resourceloader/ResourceLoaderNoscriptModule.php',
        'ResourceLoaderSiteModule' => 'includes/resourceloader/ResourceLoaderSiteModule.php',
        'ResourceLoaderStartUpModule' => 'includes/resourceloader/ResourceLoaderStartUpModule.php',
+       'ResourceLoaderUserCSSPrefsModule' => 'includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php',
        'ResourceLoaderUserGroupsModule' => 'includes/resourceloader/ResourceLoaderUserGroupsModule.php',
        'ResourceLoaderUserModule' => 'includes/resourceloader/ResourceLoaderUserModule.php',
        'ResourceLoaderUserOptionsModule' => 'includes/resourceloader/ResourceLoaderUserOptionsModule.php',
index cc9118a..b42732b 100644 (file)
@@ -2681,6 +2681,8 @@ $templates
                );
 
                // Load embeddable private modules before any loader links
+               // This needs to be TYPE_COMBINED so these modules are properly wrapped
+               // in mw.loader.implement() calls and deferred until mw.user is available
                $embedScripts = array( 'user.options', 'user.tokens' );
                $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_COMBINED );
 
@@ -3268,7 +3270,7 @@ $templates
 
                // Per-user preference styles
                if ( $wgAllowUserCssPrefs ) {
-                       $moduleStyles[] = 'user.options';
+                       $moduleStyles[] = 'user.cssprefs';
                }
 
                foreach ( $moduleStyles as $name ) {
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
new file mode 100644 (file)
index 0000000..b5a2435
--- /dev/null
@@ -0,0 +1,136 @@
+<?php
+/**
+ * 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 Members */
+
+       protected $modifiedTime = array();
+
+       protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
+
+       /* Methods */
+
+       /**
+        * @param $context ResourceLoaderContext
+        * @return array|int|Mixed
+        */
+       public function getModifiedTime( ResourceLoaderContext $context ) {
+               $hash = $context->getHash();
+               if ( isset( $this->modifiedTime[$hash] ) ) {
+                       return $this->modifiedTime[$hash];
+               }
+
+               global $wgUser;
+
+               if ( $context->getUser() === $wgUser->getName() ) {
+                       return $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $wgUser->getTouched() );
+               } else {
+                       return 1;
+               }
+       }
+
+       /**
+        * Fetch the context's user options, or if it doesn't match current user,
+        * the default options.
+        *
+        * @param $context ResourceLoaderContext: Context object
+        * @return Array: List of user options keyed by option name
+        */
+       protected function contextUserOptions( ResourceLoaderContext $context ) {
+               global $wgUser;
+
+               // Verify identity -- this is a private module
+               if ( $context->getUser() === $wgUser->getName() ) {
+                       return $wgUser->getOptions();
+               } else {
+                       return User::getDefaultOptions();
+               }
+       }
+       
+       /**
+        * @param $context ResourceLoaderContext
+        * @return array
+        */
+       public function getStyles( ResourceLoaderContext $context ) {
+               global $wgAllowUserCssPrefs;
+
+               if ( $wgAllowUserCssPrefs ) {
+                       $options = $this->contextUserOptions( $context );
+
+                       // Build CSS rules
+                       $rules = array();
+
+                       // Underline: 2 = browser default, 1 = always, 0 = never
+                       if ( $options['underline'] < 2 ) {
+                               $rules[] = "a { text-decoration: " .
+                                       ( $options['underline'] ? 'underline' : 'none' ) . "; }";
+                       } else {
+                               # The scripts of these languages are very hard to read with underlines
+                               $rules[] = 'a:lang(ar), a:lang(ckb), a:lang(fa),a:lang(kk-arab), ' .
+                               'a:lang(mzn), a:lang(ps), a:lang(ur) { text-decoration: none; }';
+                       }
+                       if ( $options['highlightbroken'] ) {
+                               $rules[] = "a.new, #quickbar a.new { color: #ba0000; }\n";
+                       } else {
+                               $rules[] = "a.new, #quickbar a.new, a.stub, #quickbar a.stub { color: inherit; }";
+                               $rules[] = "a.new:after, #quickbar a.new:after { content: '?'; color: #ba0000; }";
+                               $rules[] = "a.stub:after, #quickbar a.stub:after { content: '!'; color: #772233; }";
+                       }
+                       if ( $options['justify'] ) {
+                               $rules[] = "#article, #bodyContent, #mw_content { text-align: justify; }\n";
+                       }
+                       if ( !$options['showtoc'] ) {
+                               $rules[] = "#toc { display: none; }\n";
+                       }
+                       if ( !$options['editsection'] ) {
+                               $rules[] = ".editsection { display: none; }\n";
+                       }
+                       if ( $options['editfont'] !== 'default' ) {
+                               $rules[] = "textarea { font-family: {$options['editfont']}; }\n";
+                       }
+                       $style = implode( "\n", $rules );
+                       if ( $this->getFlip( $context ) ) {
+                               $style = CSSJanus::transform( $style, true, false );
+                       }
+                       return array( 'all' => $style );
+               }
+               return array();
+       }
+
+       /**
+        * @return string
+        */
+       public function getGroup() {
+               return 'private';
+       }
+
+       /**
+        * @return array
+        */
+       public function getDependencies() {
+               return array( 'mediawiki.user' );
+       }
+}
index 4462abe..0752fd6 100644 (file)
@@ -79,58 +79,6 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
                        array( $this->contextUserOptions( $context ) ) );
        }
 
-       /**
-        * @param $context ResourceLoaderContext
-        * @return array
-        */
-       public function getStyles( ResourceLoaderContext $context ) {
-               // FIXME: This stuff should really be in its own module, because it gets double-loaded otherwise
-               // (once through a <link>, once when embedded as JS)
-               global $wgAllowUserCssPrefs;
-
-               if ( $wgAllowUserCssPrefs ) {
-                       $options = $this->contextUserOptions( $context );
-
-                       // Build CSS rules
-                       $rules = array();
-
-                       // Underline: 2 = browser default, 1 = always, 0 = never
-                       if ( $options['underline'] < 2 ) {
-                               $rules[] = "a { text-decoration: " .
-                                       ( $options['underline'] ? 'underline' : 'none' ) . "; }";
-                       } else {
-                               # The scripts of these languages are very hard to read with underlines
-                               $rules[] = 'a:lang(ar), a:lang(ckb), a:lang(fa),a:lang(kk-arab), ' .
-                               'a:lang(mzn), a:lang(ps), a:lang(ur) { text-decoration: none; }';
-                       }
-                       if ( $options['highlightbroken'] ) {
-                               $rules[] = "a.new, #quickbar a.new { color: #ba0000; }\n";
-                       } else {
-                               $rules[] = "a.new, #quickbar a.new, a.stub, #quickbar a.stub { color: inherit; }";
-                               $rules[] = "a.new:after, #quickbar a.new:after { content: '?'; color: #ba0000; }";
-                               $rules[] = "a.stub:after, #quickbar a.stub:after { content: '!'; color: #772233; }";
-                       }
-                       if ( $options['justify'] ) {
-                               $rules[] = "#article, #bodyContent, #mw_content { text-align: justify; }\n";
-                       }
-                       if ( !$options['showtoc'] ) {
-                               $rules[] = "#toc { display: none; }\n";
-                       }
-                       if ( !$options['editsection'] ) {
-                               $rules[] = ".editsection { display: none; }\n";
-                       }
-                       if ( $options['editfont'] !== 'default' ) {
-                               $rules[] = "textarea { font-family: {$options['editfont']}; }\n";
-                       }
-                       $style = implode( "\n", $rules );
-                       if ( $this->getFlip( $context ) ) {
-                               $style = CSSJanus::transform( $style, true, false );
-                       }
-                       return array( 'all' => $style );
-               }
-               return array();
-       }
-
        /**
         * @return string
         */
index 464f751..4f3f3c5 100644 (file)
@@ -10,6 +10,7 @@ return array(
        'user' => array( 'class' => 'ResourceLoaderUserModule' ),
        'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
        'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
+       'user.cssprefs' => array( 'class' => 'ResourceLoaderUserCSSPrefsModule' ),
        'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
        'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),