Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/66127
Change subject: Unwrap excess <p>s in inline template rendering
......................................................................
Unwrap excess <p>s in inline template rendering
This is a hack, in the future Parsoid will have a template re-expansion
API that will produce the correct result.
Change-Id: I328c11330fb3db71c51882717d6b84099c9270d1
---
M modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/27/66127/1
diff --git a/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
b/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
index 3aaeb24..5e611ed 100644
--- a/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
+++ b/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
@@ -76,8 +76,14 @@
* @param {Object} response Response data
*/
ve.ce.MWTemplateNode.prototype.onParseSuccess = function ( promise, response )
{
- var data = response.visualeditor;
- promise.resolve( $( data.content ).get() );
+ var data = response.visualeditor, contentNodes = $( data.content
).get();
+ // HACK: if $content consists of a single paragraph, unwrap it.
+ // We have to do this because the PHP parser wraps everything in <p>s,
and inline templates
+ // will render strangely when wrapped in <p>s.
+ if ( contentNodes.length === 1 &&
contentNodes[0].nodeName.toLowerCase() === 'p' ) {
+ contentNodes = contentNodes[0].childNodes;
+ }
+ promise.resolve( contentNodes );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/66127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I328c11330fb3db71c51882717d6b84099c9270d1
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
