[MediaWiki-commits] [Gerrit] Only load W0 JavaScript and CSS when needed. See bug 49786. - change (mediawiki...ZeroRatedMobileAccess)

[Dr0ptp4kt (Code Review)]

Dr0ptp4kt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/87271


Change subject: Only load W0 JavaScript and CSS when needed. See bug 49786.
......................................................................

Only load W0 JavaScript and CSS when needed. See bug 49786.

Change-Id: Iac6ac34c2043172a353b9c66160697786610ca12
---
M includes/PageRenderingHooks.php
1 file changed, 19 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess 
refs/changes/71/87271/1

diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 753dfe1..4370843 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -319,10 +319,15 @@
                        }
                }
 
+               if ( $this->getConfigId() !== null ) {
+                       self::addZeroJsAndCss( $out );
+               } elseif ( $this->getConfigId() === null && 
$this->isZeroSubdomain ) {
+                       self::addZeroJsAndCss( $out );
+               }
+
                $out->addVaryHeader( 'X-CS' );
                $out->addVaryHeader( 'X-Subdomain' );
                $out->addVaryHeader( 'X-Images' );
-
 
                // @FIXME: These should be removed in a month once cache clears 
up
                if ( $this->request->getCheck( 'renderZeroRatedBanner' ) ||
@@ -339,9 +344,6 @@
                        }
                }
 
-               // @FIXME: Should not be added for non-zero sites
-               $out->addModuleStyles( 'mobile.zero.styles' );
-               $out->addModules( 'mobile.zero.scripts' );
 
 //             $options['toggle_view_desktop'] = 
'&renderZeroRatedBanner=true&renderwarning=yes&returnto=';
 // fixme: never used?
@@ -675,11 +677,11 @@
         * @return array with two values - name of the site and code of the 
langage
         */
        private static function getWikiInfo() {
-                       global $wgConf, $wgDBname;
-                       list( $site, $langCode ) = $wgConf->siteFromDB( 
$wgDBname );
-                       if ( $langCode === '' || $langCode === 'test' ) {
-                               $langCode = 'en'; // Useful for debugging, 
should never be the case in production
-                       }
+               global $wgConf, $wgDBname;
+               list( $site, $langCode ) = $wgConf->siteFromDB( $wgDBname );
+               if ( $langCode === '' || $langCode === 'test' ) {
+                       $langCode = 'en'; // Useful for debugging, should never 
be the case in production
+               }
                return array( $site, $langCode );
        }
 
@@ -882,6 +884,14 @@
                }
        }
 
+       /** Add Wikipedia Zero JavaScript and CC
+        * @param $out OutputPage
+        */
+       private static function addZeroJsAndCss( $out ) {
+               $out->addModuleStyles( 'mobile.zero.styles' );
+               $out->addModules( 'mobile.zero.scripts' );
+       }
+
        /**
         * Output debug info into Zero log
         * @param string $dbg Debug message

-- 
To view, visit https://gerrit.wikimedia.org/r/87271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac6ac34c2043172a353b9c66160697786610ca12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <ab...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits