Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240956
Change subject: Move geoFeature.js into ext.wikimediaEvents module
......................................................................
Move geoFeature.js into ext.wikimediaEvents module
Loaded on every page for all users. Matches the same intent, purpose,
and context of the ext.wikimediaEvents module.
Change-Id: I1aecb01d40e1d0162c65642a2591eca3240808e5
---
M WikimediaEvents.php
M WikimediaEventsHooks.php
2 files changed, 9 insertions(+), 17 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/56/240956/1
diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index ba11feb..6c1fa4b 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -103,19 +103,12 @@
'remoteExtPath' => 'WikimediaEvents/modules',
'targets' => array( 'desktop' ),
),
- 'ext.wikimediaEvents.geoFeatures' => array(
- 'scripts' => array(
- 'ext.wikimediaEvents.geoFeatures.js',
- ),
- 'localBasePath' => __DIR__ . '/modules',
- 'remoteExtPath' => 'WikimediaEvents/modules',
- 'targets' => array( 'desktop', 'mobile' ),
- 'dependencies' => array( 'schema.GeoFeatures' ),
- ),
);
// Don't remove these modules even if empty!
$wgHooks['ResourceLoaderRegisterModules'][] = function ( ResourceLoader $rl ) {
+ global $wgWMETrackGeoFeatures;
+
// Loaded globally for all users (including logged-out)
$allUsersModule = array(
'scripts' => array(
@@ -132,6 +125,11 @@
'remoteExtPath' => 'WikimediaEvents/modules',
'targets' => array( 'desktop', 'mobile' ),
);
+ if ( $wgWMETrackGeoFeatures ) {
+ $allUsersModule['scripts'][] =
'ext.wikimediaEvents.geoFeatures.js';
+ $allUsersModule['dependencies'][] = 'schema.GeoFeatures';
+ }
+
// Loaded globally for all logged-in users
$loggedInModule = array(
'scripts' => array(
@@ -143,6 +141,7 @@
'remoteExtPath' => 'WikimediaEvents/modules',
'targets' => array( 'desktop', 'mobile' ),
);
+
$rl->register( array(
'ext.wikimediaEvents' => $allUsersModule,
'ext.wikimediaEvents.loggedin' => $loggedInModule,
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index e1174a1..aa93929 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -14,16 +14,9 @@
* @param Skin &$skin
*/
public static function onBeforePageDisplay( &$out, &$skin ) {
- global $wgWMETrackGeoFeatures;
-
$out->addModules( 'ext.wikimediaEvents' );
- if ( $wgWMETrackGeoFeatures ) {
- $out->addModules( 'ext.wikimediaEvents.geoFeatures' );
- }
-
- $user = $out->getUser();
- if ( $user->isLoggedIn() ) {
+ if ( $out->getUser()->isLoggedIn() ) {
$out->addModules( 'ext.wikimediaEvents.loggedin' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/240956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aecb01d40e1d0162c65642a2591eca3240808e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
