jenkins-bot has submitted this change and it was merged.
Change subject: Regression: address upstream change
......................................................................
Regression: address upstream change
Reflect upstream change:
Iab3963ff32e961e5942007fa733a03120d9032e7
Bug: T93508
Change-Id: I47094981212dc8905d8cf0706298f03e06636092
---
M extension.json
M resources/Resources.php
M resources/ext.gather.watchstar/init.js
3 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
Florianschmidtwelzow: Looks good to me, but someone else must approve
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 0db258a..c89037c 100644
--- a/extension.json
+++ b/extension.json
@@ -129,6 +129,7 @@
"desktop"
],
"dependencies": [
+ "mediawiki.util",
"mobile.watchstar",
"ext.gather.api",
"ext.gather.collection.base",
diff --git a/resources/Resources.php b/resources/Resources.php
index 292bd7f..224ed13 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -104,6 +104,7 @@
'ext.gather.watchstar' => $wgGatherResourceFileModuleBoilerplate +
array(
'dependencies' => array(
+ 'mediawiki.util',
'mobile.watchstar',
'ext.gather.api',
'ext.gather.collection.base',
diff --git a/resources/ext.gather.watchstar/init.js
b/resources/ext.gather.watchstar/init.js
index 871558d..482a7eb 100644
--- a/resources/ext.gather.watchstar/init.js
+++ b/resources/ext.gather.watchstar/init.js
@@ -5,7 +5,6 @@
WatchstarPageActionOverlay = M.require(
'ext.gather.watchstar/WatchstarPageActionOverlay' ),
settings = M.require( 'settings' ),
settingOverlayWasDismissed = 'gather-has-dismissed-tutorial',
- util = M.require( 'util' ),
user = M.require( 'user' );
/**
@@ -85,7 +84,7 @@
page: page,
isAnon: user.isAnon(),
collections: mw.config.get(
'wgGatherCollections' ),
- isNewlyAuthenticatedUser:
util.query.article_action === 'add_to_collection'
+ isNewlyAuthenticatedUser:
mw.util.getParamValue( 'article_action' ) === 'add_to_collection'
} );
if ( !page.inNamespace( 'special' ) ) {
// Determine if we should show the collection tutorial
--
To view, visit https://gerrit.wikimedia.org/r/198752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47094981212dc8905d8cf0706298f03e06636092
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
