Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/269097
Change subject: [Hygiene] Use mediawiki.Uri for URI manipulation ...................................................................... [Hygiene] Use mediawiki.Uri for URI manipulation Change-Id: I8cfc1009aa9f522adf49d0c851536c8faff534f5 --- M resources/ext.quicksurveys.views/ExternalSurvey.js 1 file changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys refs/changes/97/269097/1 diff --git a/resources/ext.quicksurveys.views/ExternalSurvey.js b/resources/ext.quicksurveys.views/ExternalSurvey.js index dd2558f..4f84a77 100644 --- a/resources/ext.quicksurveys.views/ExternalSurvey.js +++ b/resources/ext.quicksurveys.views/ExternalSurvey.js @@ -23,25 +23,20 @@ */ renderButtons: function () { var $btnContainer = this.initialPanel.$element.find( '.survey-button-container' ), - queryParams = {}, btnHref, buttons, self = this; - btnHref = mw.message( this.config.survey.link ).parse(); + btnHref = new mw.Uri( mw.message( this.config.survey.link ).parse() ); + if ( this.config.survey.instanceTokenParameterName ) { - if ( btnHref.indexOf( '?' ) === -1 ) { - btnHref += '?'; - } else { - btnHref += '&'; - } - queryParams[this.config.survey.instanceTokenParameterName] = this.config.surveyInstanceToken; - btnHref += $.param( queryParams ); + btnHref.query[this.config.survey.instanceTokenParameterName] = + this.config.surveyInstanceToken; } buttons = [ { - href: btnHref, + href: btnHref.toString(), target: '_blank', label: mw.msg( 'ext-quicksurveys-external-survey-yes-button' ), flags: 'constructive', -- To view, visit https://gerrit.wikimedia.org/r/269097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cfc1009aa9f522adf49d0c851536c8faff534f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: dev Gerrit-Owner: Phuedx <g...@samsmith.io> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits