jenkins-bot has submitted this change and it was merged.
Change subject: Support fragments in getUrl() of mw.Title
......................................................................
Support fragments in getUrl() of mw.Title
Now that mw.util.getUrl() supports fragments, pass it the title
including fragments.
Bug: T103715
Change-Id: I0e3665e74fd4208a7ab0a9b361803aa37f22d61b
---
M resources/src/mediawiki/mediawiki.Title.js
M tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
2 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.Title.js
b/resources/src/mediawiki/mediawiki.Title.js
index 47250ee..033636c 100644
--- a/resources/src/mediawiki/mediawiki.Title.js
+++ b/resources/src/mediawiki/mediawiki.Title.js
@@ -906,7 +906,12 @@
* @return {string}
*/
getUrl: function ( params ) {
- return mw.util.getUrl( this.toString(), params );
+ var fragment = this.getFragment();
+ if ( fragment ) {
+ return mw.util.getUrl( this.toString() + '#' +
this.getFragment(), params );
+ } else {
+ return mw.util.getUrl( this.toString(), params
);
+ }
},
/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
index 4bcb12e..2e63b7a 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -332,7 +332,7 @@
} );
- QUnit.test( 'getUrl', 3, function ( assert ) {
+ QUnit.test( 'getUrl', 4, function ( assert ) {
var title;
// Config
@@ -344,6 +344,9 @@
title = new mw.Title( 'John Doe', 3 );
assert.equal( title.getUrl(), '/wiki/User_talk:John_Doe',
'Escaping in title and namespace for urls' );
+
+ title = new mw.Title( 'John Cena#And_His_Name_Is', 3 );
+ assert.equal( title.getUrl( { meme: true } ),
'/wiki/User_talk:John_Cena?meme=true#And_His_Name_Is', 'title with fragment and
query parameter' );
} );
QUnit.test( 'newFromImg', 44, function ( assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/261171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e3665e74fd4208a7ab0a9b361803aa37f22d61b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Unicornisaurous <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
