jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.Title: Add 'params' parameter to #getUrl
......................................................................
mediawiki.Title: Add 'params' parameter to #getUrl
Same as the parameter to mw.util.getUrl(). Also prettify the docs there.
Change-Id: I94489e7d526d69126f3e90b7f41e2ec0430f7f66
---
M resources/mediawiki/mediawiki.Title.js
M resources/mediawiki/mediawiki.util.js
M tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
3 files changed, 9 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki/mediawiki.Title.js
b/resources/mediawiki/mediawiki.Title.js
index dde5abf..481b792 100644
--- a/resources/mediawiki/mediawiki.Title.js
+++ b/resources/mediawiki/mediawiki.Title.js
@@ -550,10 +550,12 @@
* Get the URL to this title
*
* @see mw.util#getUrl
+ * @param {Object} [params] A mapping of query parameter names
to values,
+ * e.g. `{ action: 'edit' }`.
* @return {string}
*/
- getUrl: function () {
- return mw.util.getUrl( this.toString() );
+ getUrl: function ( params ) {
+ return mw.util.getUrl( this.toString(), params );
},
/**
diff --git a/resources/mediawiki/mediawiki.util.js
b/resources/mediawiki/mediawiki.util.js
index a057cce..86f06b8 100644
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -164,8 +164,8 @@
* Get the link to a page name (relative to `wgServer`),
*
* @param {string} str Page name to get the link for.
- * @param {Object} params A mapping of query parameter names to
values,
- * e.g. { action: 'edit' }. Optional.
+ * @param {Object} [params] A mapping of query parameter names
to values,
+ * e.g. `{ action: 'edit' }`.
* @return {string} Location for a page with name of `str` or
boolean false on error.
*/
getUrl: function ( str, params ) {
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
index f0bb0fc..2556cde 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -317,14 +317,15 @@
} );
- QUnit.test( 'getUrl', 2, function ( assert ) {
+ QUnit.test( 'getUrl', 3, function ( assert ) {
var title;
// Config
mw.config.set( 'wgArticlePath', '/wiki/$1' );
title = new mw.Title( 'Foobar' );
- assert.equal( title.getUrl(), '/wiki/Foobar', 'Basic
functionally, getUrl uses mw.util.getUrl' );
+ assert.equal( title.getUrl(), '/wiki/Foobar', 'Basic
functionality, getUrl uses mw.util.getUrl' );
+ assert.equal( title.getUrl({ action: 'edit' }),
'/wiki/Foobar?action=edit', 'Basic functionality, \'params\' parameter' );
title = new mw.Title( 'John Doe', 3 );
assert.equal( title.getUrl(), '/wiki/User_talk:John_Doe',
'Escaping in title and namespace for urls' );
--
To view, visit https://gerrit.wikimedia.org/r/95778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94489e7d526d69126f3e90b7f41e2ec0430f7f66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
