jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove util.query and use core functions
......................................................................
Hygiene: Remove util.query and use core functions
Don't introduce new functions, which are already in core. This would fix the
problem, that you have "+" as spaces in alphas search bar (alpha without the new
header/mobilemenu). mw.util.getParamValue does exactly what we want, is
maintained
by mediawikic ore team and escapes the values correctly.
Change-Id: Iab3963ff32e961e5942007fa733a03120d9032e7
---
M javascripts/modules/editor/init.js
M javascripts/modules/search/init.js
M javascripts/modules/tutorials/init.js
M javascripts/specials/watchlist.js
M javascripts/util.js
5 files changed, 9 insertions(+), 41 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/editor/init.js
b/javascripts/modules/editor/init.js
index f8dcd4a..e2634fc 100644
--- a/javascripts/modules/editor/init.js
+++ b/javascripts/modules/editor/init.js
@@ -2,11 +2,9 @@
var
settings = M.require( 'settings' ),
- util = M.require( 'util' ),
router = M.require( 'router' ),
overlayManager = M.require( 'overlayManager' ),
loader = M.require( 'loader' ),
- query = util.query,
Icon = M.require( 'Icon' ),
disabledEditIcon = new Icon( {
name: 'edit'
@@ -126,7 +124,7 @@
function setupEditor( page ) {
var isNewPage = page.options.id === 0;
- if ( query.undo ) {
+ if ( mw.util.getParamValue( 'undo' ) ) {
window.alert( mw.msg(
'mobile-frontend-editor-undo-unsupported' ) );
}
@@ -139,7 +137,7 @@
isAnon: user.isAnon(),
isNewPage: isNewPage,
isNewEditor: user.getEditCount() === 0,
- oldId: query.oldid,
+ oldId: mw.util.getParamValue( 'oldid' ),
funnel: funnel || 'article',
// FIXME: cache this selector, it's
used more than once
contentLang: $( '#content' ).attr(
'lang' ),
diff --git a/javascripts/modules/search/init.js
b/javascripts/modules/search/init.js
index 9c0f924..c97a55e 100644
--- a/javascripts/modules/search/init.js
+++ b/javascripts/modules/search/init.js
@@ -3,8 +3,6 @@
var SearchOverlay = M.require( 'modules/search/SearchOverlay' ),
SchemaMobileWebClickTracking = M.require(
'loggingSchemas/SchemaMobileWebClickTracking' ),
uiSchema = new SchemaMobileWebClickTracking( {},
'MobileWebUIClickTracking' ),
- util = M.require( 'util' ),
- query = util.query,
context = M.require( 'context' ),
router = M.require( 'router' ),
browser = M.require( 'browser' );
@@ -16,7 +14,7 @@
*/
function openSearchOverlay( ev ) {
// in alpha we are dealing with an 'a', not an 'input'
- var searchTerm = ( context.isAlphaGroupMember() ) ?
query.search : $( this ).val();
+ var searchTerm = ( context.isAlphaGroupMember() ) ?
mw.util.getParamValue( 'search' ) : $( this ).val();
ev.preventDefault();
uiSchema.log( {
diff --git a/javascripts/modules/tutorials/init.js
b/javascripts/modules/tutorials/init.js
index b7c8f07..d18d28c 100644
--- a/javascripts/modules/tutorials/init.js
+++ b/javascripts/modules/tutorials/init.js
@@ -14,7 +14,6 @@
var PageActionOverlay = M.require(
'modules/tutorials/PageActionOverlay' ),
util = M.require( 'util' ),
escapeHash = util.escapeHash,
- query = util.query,
inEditor = window.location.hash.indexOf( '#editor/' ) > -1,
hash = window.location.hash,
editOverlay, target, $target, href;
@@ -25,7 +24,7 @@
* @returns {Boolean}
*/
function shouldShowLeftNavEditTutorial() {
- return query.campaign === 'leftNavSignup' &&
+ return mw.util.getParamValue( 'campaign' ) === 'leftNavSignup'
&&
mw.config.get( 'wgNamespaceNumber' ) === 0 && !inEditor;
}
@@ -35,7 +34,7 @@
* @returns {Boolean}
*/
function shouldShowTutorial() {
- var shouldShowEditTutorial = query.article_action ===
'signup-edit' && !inEditor;
+ var shouldShowEditTutorial = mw.util.getParamValue(
'article_action' ) === 'signup-edit' && !inEditor;
return shouldShowEditTutorial ||
shouldShowLeftNavEditTutorial();
}
diff --git a/javascripts/specials/watchlist.js
b/javascripts/specials/watchlist.js
index 3734e01..b1569e1 100644
--- a/javascripts/specials/watchlist.js
+++ b/javascripts/specials/watchlist.js
@@ -5,9 +5,7 @@
wlSchema = new SchemaMobileWebClickTracking( {},
'MobileWebWatchlistClickTracking' ),
canonicalName = mw.config.get( 'wgCanonicalSpecialPageName' ),
pageName = canonicalName === 'EditWatchlist' || canonicalName
=== 'Watchlist' ? 'watchlist' : 'diff',
- util = M.require( 'util' ),
- query = util.query,
- subPageName = query.watchlistview || 'a-z';
+ subPageName = mw.util.getParamValue( 'watchlistview' ) || 'a-z';
/**
* Initialises JavaScript on Special:Watchlist
diff --git a/javascripts/util.js b/javascripts/util.js
index ef1642a..0cf2fd6 100644
--- a/javascripts/util.js
+++ b/javascripts/util.js
@@ -1,4 +1,4 @@
-( function ( M, $ ) {
+( function ( M ) {
var util;
/**
@@ -21,30 +21,6 @@
return hash.replace( /(:|\.)/g, '\\$1' );
},
/**
- * Takes a Query string and turns it into a JavaScript object
mapping parameter names
- * to values. Does the opposite of $.param
- *
- * @method
- * @param {String} qs A querystring excluding the ? prefix.
e.g. foo=4&bar=5
- * @return {Object}
- */
- deParam: function ( qs ) {
- var params = {};
- if ( qs ) {
- $.each( qs.split( '&' ), function ( index, p ) {
- p = p.split( '=' );
- params[ p[0] ] = p[1];
- } );
- }
- return params;
- },
- /**
- * Maps current query string parameters to their values.
- *
- * @property {Object} query
- */
- query: {},
- /**
* Return wgWikiBaseItemID config variable or 'wikidataid'
query parameter if exits
* @returns {null|String}
*/
@@ -53,7 +29,7 @@
idOverride;
if ( !id ) {
- idOverride = this.query.wikidataid;
+ idOverride = mw.util.getParamValue(
'wikidataid' );
if ( idOverride ) {
mw.config.set( 'wgWikibaseItemId',
idOverride );
id = idOverride;
@@ -63,7 +39,6 @@
}
};
- util.query = util.deParam( window.location.search.split( '?' )[1] );
M.define( 'util', util );
-}( mw.mobileFrontend, jQuery ) );
+}( mw.mobileFrontend ) );
--
To view, visit https://gerrit.wikimedia.org/r/198251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab3963ff32e961e5942007fa733a03120d9032e7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
