From f0d74cc23a22e3c083b303eed71bd94e1c5f24b5 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 25 May 2018 15:00:55 -0700 Subject: [PATCH] resourceloader: Remove use of $.params in mediawiki.js Bug: T192623 Change-Id: I05ce4a05fda5ae13ad85c3d8da8362488b5d46af --- resources/src/mediawiki/mediawiki.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js index 2d3f6ad33f..b00cbffcb0 100644 --- a/resources/src/mediawiki/mediawiki.js +++ b/resources/src/mediawiki/mediawiki.js @@ -1577,6 +1577,17 @@ } } + /** + * @private + * @param {Object} params Map of parameter names to values + * @return {string} + */ + function makeQueryString( params ) { + return Object.keys( params ).map( function ( key ) { + return encodeURIComponent( key ) + '=' + encodeURIComponent( params[ key ] ); + } ).join( '&' ); + } + /** * Create network requests for a batch of modules. * @@ -1610,7 +1621,7 @@ // combining versions from the module query string in-order. (T188076) query.version = getCombinedVersion( packed.list ); query = sortQuery( query ); - addScript( sourceLoadScript + '?' + $.param( query ) ); + addScript( sourceLoadScript + '?' + makeQueryString( query ) ); } if ( !batch.length ) { @@ -1666,7 +1677,7 @@ // > '&modules='.length === 9 // > '&version=1234567'.length === 16 // > 9 + 16 = 25 - currReqBaseLength = $.param( currReqBase ).length + 25; + currReqBaseLength = makeQueryString( currReqBase ).length + 25; // We may need to split up the request to honor the query string length limit, // so build it piece by piece. -- 2.20.1