wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 06:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

MWTemplatePage: Account for template.title being null

Browse source 
Example:
* Transclusion with html comment in target
  {{ Unsigned <!-- ignored -->  |Example}}.
* Transclusion with wikitext expression as target
  {{ {{echo|Unsigned}} <!-- ignored -->  |Example}}.

The first case was handled already (Parsoid strips the comment
when it normalises the target title). The second case, however,
is not handled and ends in template.title being null.

This was already documented (MWTemplateModel#getTitle returns
{string|null}), but not used correctly.

The title of the dialog is unaffected as it fallsback to
displaying target.wt instead of target.title.

Bug: 66724
Change-Id: Ib6696ac3538f6cb9e93da2f6f8666f373247eeb4
This commit is contained in:
Timo Tijhof 2014-07-09 22:09:05 +02:00 committed by Krinkle
parent 9e26fdf0f7
commit fd83cafa4b
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
View file

@ -62,23 +62,32 @@ ve.ui.MWTemplatePage = function VeUiMWTemplatePage( template, name, config ) {
if ( this.spec.getDescription() ) {
this.$description.text( this.spec.getDescription() );
} else {
title = new mw.Title( this.template.getTitle() );
if ( title.getNamespaceId() === 10 ) {
titleText = title.getMainText();
} else if ( title.getNamespaceId() === 0 ) {
titleText = ':' + title.getPrefixedText();
} else {
titleText = title.getPrefixedText();
title = this.template.getTitle();
// The transcluded page may be dynamically generated or unspecified in the DOM
// for other reasons (bug 66724). In that case we can't tell the user what
// the template is called nor link to the template page.
if ( title ) {
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,
ve.getHtmlAttributes( { 'target': '_blank', 'href': title.getUrl() } ),
mw.user
) );
}
this.$description
.addClass( 've-ui-mwTemplatePage-description-missing' )
.append( ve.msg(
'visualeditor-dialog-transclusion-no-template-description',
titleText,
ve.getHtmlAttributes( { 'target': '_blank', 'href': title.getUrl() } ),
mw.user
) );
}
this.infoFieldset.$element.append( this.$description );
this.$more
.addClass( 've-ui-mwTemplatePage-more' )