Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84682
Change subject: Always use multi-part format for transclusions
......................................................................
Always use multi-part format for transclusions
The Parsoid team has changed their spec to always use multi-part
format even for one-part transclusions. This commit changes VE's
output format to always be multi-part, but still accepts single-part
format on the way in.
Change-Id: I6b3156b0b599ad042bb52d7f53dcdeb1c4a0954a
---
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/82/84682/1
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index 310a8ec..a824436 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -59,6 +59,7 @@
var i, len, part;
// Convert single part format to multi-part format
+ // Parsoid doesn't use this format any more, but we accept it for
backwards compatibility
if ( data.params && data.target ) {
data = { 'parts': [ { 'template': data } ] };
}
@@ -242,11 +243,6 @@
if ( obj.parts.length === 0 ) {
return null;
- }
-
- // Use single-part format when possible
- if ( obj.parts.length === 1 ) {
- obj = obj.parts[0].template;
}
return obj;
--
To view, visit https://gerrit.wikimedia.org/r/84682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b3156b0b599ad042bb52d7f53dcdeb1c4a0954a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
