[MediaWiki-commits] [Gerrit] Simplify by using mw.util.getUrl() instead of mw.util.wikiSc... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Simplify by using mw.util.getUrl() instead of
mw.util.wikiScript()
..
Simplify by using mw.util.getUrl() instead of mw.util.wikiScript()
Change-Id: Ie10a5ee79846a4f1465fea7ce1b47da13b0787b7
---
M resources/Resources.php
M resources/src/mediawiki/page/image-pagination.js
M resources/src/mediawiki/page/watch.js
3 files changed, 4 insertions(+), 11 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/Resources.php b/resources/Resources.php
index 6992de1..b206ba3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1680,7 +1680,6 @@
'mediawiki.page.image.pagination' => [
'scripts' => 'resources/src/mediawiki/page/image-pagination.js',
'dependencies' => [
- 'mediawiki.Uri',
'mediawiki.util',
'jquery.spinner',
],
diff --git a/resources/src/mediawiki/page/image-pagination.js
b/resources/src/mediawiki/page/image-pagination.js
index a097b17..02bc1de 100644
--- a/resources/src/mediawiki/page/image-pagination.js
+++ b/resources/src/mediawiki/page/image-pagination.js
@@ -99,16 +99,14 @@
function bindPageNavigation( $container ) {
$container.find( '.multipageimagenavbox' ).one( 'click', 'a',
function ( e ) {
- var page, uri;
+ var page, url;
// Generate the same URL on client side as the one
generated in ImagePage::openShowImage.
// We avoid using the URL in the link directly since it
could have been manipulated (bug 66608)
page = Number( mw.util.getParamValue( 'page', this.href
) );
- uri = new mw.Uri( mw.util.wikiScript() )
- .extend( { title: mw.config.get( 'wgPageName'
), page: page } )
- .toString();
+ url = mw.util.getUrl( mw.config.get( 'wgPageName' ), {
page: page } );
- switchPage( uri );
+ switchPage( url );
e.preventDefault();
} );
diff --git a/resources/src/mediawiki/page/watch.js
b/resources/src/mediawiki/page/watch.js
index 578c846..a57d5c7 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -46,11 +46,7 @@
.text( mw.msg( msgKey ) )
.attr( 'title', mw.msg( 'tooltip-ca-' + action ) )
.updateTooltipAccessKeys()
- .attr( 'href', mw.util.wikiScript() + '?' + $.param( {
- title: title,
- action: action
- } )
- );
+ .attr( 'href', mw.util.getUrl( title, { action: action
} ) );
// Most common ID style
if ( $li.prop( 'id' ) === 'ca-' + otherAction ) {
--
To view, visit https://gerrit.wikimedia.org/r/281649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie10a5ee79846a4f1465fea7ce1b47da13b0787b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Edokter
Gerrit-Reviewer: Gerrit Patch Uploader
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Simplify by using mw.util.getUrl() instead of mw.util.wikiSc... - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281649
Change subject: Simplify by using mw.util.getUrl() instead of
mw.util.wikiScript()
..
Simplify by using mw.util.getUrl() instead of mw.util.wikiScript()
Change-Id: Ie10a5ee79846a4f1465fea7ce1b47da13b0787b7
---
M resources/Resources.php
M resources/src/mediawiki/page/image-pagination.js
M resources/src/mediawiki/page/watch.js
3 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/49/281649/1
diff --git a/resources/Resources.php b/resources/Resources.php
index 6992de1..b206ba3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1680,7 +1680,6 @@
'mediawiki.page.image.pagination' => [
'scripts' => 'resources/src/mediawiki/page/image-pagination.js',
'dependencies' => [
- 'mediawiki.Uri',
'mediawiki.util',
'jquery.spinner',
],
diff --git a/resources/src/mediawiki/page/image-pagination.js
b/resources/src/mediawiki/page/image-pagination.js
index a097b17..02bc1de 100644
--- a/resources/src/mediawiki/page/image-pagination.js
+++ b/resources/src/mediawiki/page/image-pagination.js
@@ -99,16 +99,14 @@
function bindPageNavigation( $container ) {
$container.find( '.multipageimagenavbox' ).one( 'click', 'a',
function ( e ) {
- var page, uri;
+ var page, url;
// Generate the same URL on client side as the one
generated in ImagePage::openShowImage.
// We avoid using the URL in the link directly since it
could have been manipulated (bug 66608)
page = Number( mw.util.getParamValue( 'page', this.href
) );
- uri = new mw.Uri( mw.util.wikiScript() )
- .extend( { title: mw.config.get( 'wgPageName'
), page: page } )
- .toString();
+ url = mw.util.getUrl( mw.config.get( 'wgPageName' ), {
page: page } );
- switchPage( uri );
+ switchPage( url );
e.preventDefault();
} );
diff --git a/resources/src/mediawiki/page/watch.js
b/resources/src/mediawiki/page/watch.js
index 578c846..a57d5c7 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -46,11 +46,7 @@
.text( mw.msg( msgKey ) )
.attr( 'title', mw.msg( 'tooltip-ca-' + action ) )
.updateTooltipAccessKeys()
- .attr( 'href', mw.util.wikiScript() + '?' + $.param( {
- title: title,
- action: action
- } )
- );
+ .attr( 'href', mw.util.getUrl( title, { action: action
} ) );
// Most common ID style
if ( $li.prop( 'id' ) === 'ca-' + otherAction ) {
--
To view, visit https://gerrit.wikimedia.org/r/281649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie10a5ee79846a4f1465fea7ce1b47da13b0787b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
