wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ve.dm.MWTransclusionModel: Don't create undefined normalisation target"

Browse source
This commit is contained in:
jenkins-bot 2013-06-21 16:18:20 +00:00 committed by Gerrit Code Review
parent 1ea9016cf8 8f9093ea07
commit 210019de59
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/ve/dm/models/ve.dm.MWTransclusionModel.js
View file

@ -7,6 +7,9 @@
/*global mw */
( function () {
var hasOwn = Object.hasOwnProperty;
/**
* MediaWiki transclusion model.
*
@ -128,13 +131,17 @@ ve.dm.MWTransclusionModel.prototype.fetchSpecs = function ( templates ) {
// Cross-reference under normalized titles
if ( data.normalized ) {
for ( i = 0, len = data.normalized.length; i < len; i++ ) {
specs[data.normalized[i].from] = specs[data.normalized[i].to];
// Only define the alias if the target exists, otherwise
// we create a new property with an invalid "undefined" value.
if ( hasOwn.call( specs, data.normalized[i].to ) ) {
specs[data.normalized[i].from] = specs[data.normalized[i].to];
}
}
}
// Load into existing templates
for ( i = 0, len = templates.length; i < len; i++ ) {
title = templates[i].getTitle();
if ( specs.hasOwnProperty( title ) ) {
if ( hasOwn.call( specs, title ) ) {
templates[i].getSpec().extend( specs[title] );
}
}
@ -228,7 +235,7 @@ ve.dm.MWTransclusionModel.prototype.addTemplate = function ( target, index ) {
var part = new ve.dm.MWTemplateModel( this, target ),
title = part.getTitle();
if ( this.specs.hasOwnProperty( title ) ) {
if ( hasOwn.call( this.specs, title ) ) {
part.getSpec().extend( this.specs[title] );
}
this.addPart( part, index );
@ -321,3 +328,5 @@ ve.dm.MWTransclusionModel.prototype.getPartFromId = function ( id ) {
ve.dm.MWTransclusionModel.prototype.getTemplateSpec = function ( name ) {
return this.specs[name];
};
}() );