Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162015
Change subject: Use mw.Title#getRelativeText to deal with titles relative to
specific namespaces
......................................................................
Use mw.Title#getRelativeText to deal with titles relative to specific namespaces
Added in MW core in Ie554adef, so this needs to wait for 1.25wmf1
Change-Id: Iedc0319042529d41d29846d1734b5481850e9552
---
M VisualEditor.hooks.php
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
M modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
5 files changed, 6 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/15/162015/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 1540d40..d6179f4 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -17,7 +17,7 @@
// parties who attempt to install VisualEditor onto non-alpha
wikis, as
// this should have no impact on deploying to Wikimedia's wiki
cluster;
// is fine for release tarballs because 1.22wmf11 < 1.22alpha <
1.22.0.
- wfUseMW( '1.24wmf20' );
+ wfUseMW( '1.25wmf1' );
}
/**
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index 2fd38a5..3ad732d 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -63,13 +63,7 @@
.map( function ( template ) {
var title = mw.Title.newFromText( template,
mw.config.get( 'wgNamespaceIds' ).template );
if ( title ) {
- if ( title.getNamespaceId() === 10 ) {
- return title.getMainText();
- } else if ( title.getNamespaceId() === 0 ) {
- return ':' + title.getPrefixedText();
- } else {
- return title.getPrefixedText();
- }
+ return title.getRelativeText( 10 );
} else {
return template;
}
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
index 85d3073..5f20df5 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
@@ -123,15 +123,7 @@
try {
// Normalize and remove namespace prefix if in the
Template: namespace
titleObj = new mw.Title( title );
- if ( titleObj.getNamespaceId() === 10 ) {
- // Template namespace, remove namespace prefix
- title = titleObj.getMainText();
- } else if ( titleObj.getNamespaceId() === 0 ) {
- title = ':' + titleObj.getPrefixedText();
- } else {
- // Other namespace, already has a prefix
- title = titleObj.getPrefixedText();
- }
+ title = titleObj.getRelativeText( 10 );
} catch ( e ) { }
}
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
index ce11b67..5f755d8 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
@@ -17,7 +17,7 @@
* @param {Object} [config] Configuration options
*/
ve.ui.MWTemplatePage = function VeUiMWTemplatePage( template, name, config ) {
- var title, titleText;
+ var title;
// Configuration initialization
config = ve.extendObject( {
@@ -68,18 +68,11 @@
title = mw.Title.newFromText( title );
}
if ( title ) {
- if ( title.getNamespaceId() === 10 ) {
- titleText = title.getMainText();
- } else if ( title.getNamespaceId() === 0 ) {
- titleText = ':' + title.getPrefixedText();
- } else {
- titleText = title.getPrefixedText();
- }
this.$description
.addClass(
've-ui-mwTemplatePage-description-missing' )
.append( ve.msg(
'visualeditor-dialog-transclusion-no-template-description',
- titleText,
+ title.getRelativeText( 10 ),
ve.getHtmlAttributes( { target:
'_blank', href: title.getUrl() } ),
mw.user
) );
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
index 287b542..84bd330 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
@@ -112,13 +112,7 @@
title = new mw.Title( matchingPages[i] );
linkCacheUpdate[matchingPages[i]] = { missing: false };
if ( this.namespace !== null ) {
- if ( title.getNamespaceId() === this.namespace
) {
- value = title.getMainText();
- } else if ( title.getNamespaceId() === 0 ) {
- value = ':' + title.getPrefixedText();
- } else {
- value = title.getPrefixedText();
- }
+ value = title.getRelativeText( this.namespace );
} else {
value = title.getPrefixedText();
}
--
To view, visit https://gerrit.wikimedia.org/r/162015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedc0319042529d41d29846d1734b5481850e9552
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
