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

Merge "Fix logical conflicts from the transclusion merge."

Browse source
This commit is contained in:
jenkins-bot 2013-06-17 18:14:29 +00:00 committed by Gerrit Code Review
parent 7445b4931f 642a84483e
commit 59bf9966b4
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,7 +176,7 @@ ve.dm.MWTransclusionModel.prototype.getPlainObject = function () {
// Use single-part format when possible
if ( obj.parts.length === 1 ) {
obj = this.content.parts[0].template;
obj = obj.parts[0].template;
}
return obj;

5
modules/ve/ui/dialogs/ve.ui.MWTransclusionDialog.js
View file

@ -97,11 +97,10 @@ ve.ui.MWTransclusionDialog.prototype.onClose = function ( action ) {
// TODO: Wrap attribute changes in ve.dm.SurfaceFragment
surfaceModel.change(
ve.dm.Transaction.newFromAttributeChange(
ve.dm.Transaction.newFromAttributeChanges(
surfaceModel.getDocument(),
this.node.getOffset(),
'mw',
this.transclusion.getPlainObject()
{ 'mw': this.transclusion.getPlainObject() }
)
);
}