Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327398 )
Change subject: Allow 'T-' prefixed sections, and redirect if section link
title isn't current page
......................................................................
Allow 'T-' prefixed sections, and redirect if section link title isn't current
page
Bug: T153176
Change-Id: Ic6fda78d00715777df4a273e7d3e150f20185185
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/98/327398/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 2abcf62..b1e8406 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -103,8 +103,8 @@
function parseSection( section ) {
var parsedSection = section;
- // Section must be 'new' or a number
- if ( section !== 'new' ) {
+ // Section must be a number, 'new' or 'T-' prefixed
+ if ( section !== 'new' && section.indexOf( 'T-' ) !== 0 ) {
parsedSection = +section;
if ( isNaN( parsedSection ) ) {
parsedSection = null;
@@ -660,9 +660,16 @@
* @param {number|string} [section] Override edit section,
taken from link URL if not specified
*/
onEditSectionLinkClick: function ( mode, e, section ) {
- var targetPromise;
+ var targetPromise,
+ uri = new mw.Uri( e.target.href ),
+ title = mw.Title.newFromText( uri.query.title
|| '' );
+
if ( !init.isUnmodifiedLeftClick( e ) ) {
return;
+ }
+ if ( title && title.getPrefixedText() !== new mw.Title(
mw.config.get( 'wgRelevantPageName' ) ).getPrefixedText() ) {
+ // title param doesn't match current page, let
default event happen (navigate to other page)
+ return true;
}
e.preventDefault();
if ( isLoading ) {
@@ -690,7 +697,7 @@
} else {
// Use section from URL
if ( section === undefined ) {
- section = parseSection( new mw.Uri(
e.target.href ).query.section );
+ section = parseSection(
uri.query.section );
}
targetPromise = getTarget( mode, section );
}
--
To view, visit https://gerrit.wikimedia.org/r/327398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6fda78d00715777df4a273e7d3e150f20185185
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
