jenkins-bot has submitted this change and it was merged.

Change subject: Render block templates as <div>s and inline ones as <span>s
......................................................................


Render block templates as <div>s and inline ones as <span>s

Right now block templates are rendered as <span>s

Change-Id: I4c941a03e0e34a435990f0392080a3a8bf3e2835
---
M modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
M modules/ve/ce/styles/ve.ce.Node.css
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js 
b/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
index 1aa33b0..85e16f5 100644
--- a/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
+++ b/modules/ve/ce/nodes/ve.ce.MWTemplateNode.js
@@ -126,6 +126,8 @@
 
 ve.ce.MWTemplateBlockNode.static.name = 'mwTemplateBlock';
 
+ve.ce.MWTemplateBlockNode.static.tagName = 'div';
+
 /**
  * ContentEditable MediaWiki template inline node.
  *
@@ -150,6 +152,8 @@
 
 ve.ce.MWTemplateInlineNode.static.name = 'mwTemplateInline';
 
+ve.ce.MWTemplateInlineNode.static.tagName = 'span';
+
 /* Registration */
 
 ve.ce.nodeFactory.register( ve.ce.MWTemplateNode );
diff --git a/modules/ve/ce/styles/ve.ce.Node.css 
b/modules/ve/ce/styles/ve.ce.Node.css
index 8e23d7a..68233f1 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -155,10 +155,6 @@
 
 /* ve.ce.MWTemplateNode */
 
-.ve-ce-mwTemplateBlockNode {
-       display: block;
-}
-
 .ve-ce-mwTemplateInlineNode {
        display: inline-block;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/67390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c941a03e0e34a435990f0392080a3a8bf3e2835
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to