jenkins-bot has submitted this change and it was merged.
Change subject: Add roulette query string to the next url
......................................................................
Add roulette query string to the next url
Follow up on I4bf3c30cba665b86787697c772b5641fde77b238
Bug: T93449
Change-Id: I6938a36f4b39b2794b95562bd1a288a24021fb42
---
M includes/Resources.php
M resources/roulette/wikiGrokRoulette.js
2 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index d61c8f5..5cc327f 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -92,6 +92,7 @@
'ext.wikigrok.roulette' => $wgWikiGrokResourceFileModuleBoilerplate +
array(
'dependencies' => array(
+ 'mediawiki.Uri',
'mobile.overlays',
),
'scripts' => array(
diff --git a/resources/roulette/wikiGrokRoulette.js
b/resources/roulette/wikiGrokRoulette.js
index 5542fed..1d0a794 100644
--- a/resources/roulette/wikiGrokRoulette.js
+++ b/resources/roulette/wikiGrokRoulette.js
@@ -20,7 +20,8 @@
* @return {jQuery.Deferred}
*/
getNextPage: function () {
- var result;
+ var result,
+ uri;
if ( nextPage ) {
result = $.Deferred().resolve( nextPage );
@@ -34,11 +35,16 @@
response.query.wikigrokrandom &&
response.query.wikigrokrandom.length > 0
) {
+
+ // Maintain the query string
removing only the title because the title
+ // is already being used in
constructing the new url.
+ uri = new mw.Uri(
window.location.href );
+ delete uri.query.title;
+
nextPage = {
- // FIXME: Maintain the
query string but remove the title because
- // it's already being
used in constructing the URL.
url: mw.util.getUrl(
-
response.query.wikigrokrandom[0].title
+
response.query.wikigrokrandom[0].title,
+ uri.query
) +
'#wikigrokversion=c',
title:
response.query.wikigrokrandom[0].title
};
--
To view, visit https://gerrit.wikimedia.org/r/198448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6938a36f4b39b2794b95562bd1a288a24021fb42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
