jenkins-bot has submitted this change and it was merged.
Change subject: Add empty lines before/after new block level images
......................................................................
Add empty lines before/after new block level images
Bug: 50314
Change-Id: I7b372eb3560ef0f9d60ca8eaa95b62bfa7aad88e
---
M js/lib/mediawiki.WikitextSerializer.js
M js/tests/parserTests.txt
2 files changed, 35 insertions(+), 0 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.WikitextSerializer.js
b/js/lib/mediawiki.WikitextSerializer.js
index 45cb053..b217cca 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -2386,6 +2386,29 @@
figure: {
handle: function(node, state, cb) {
return state.serializer.figureHandler(node, state, cb);
+ },
+ sepnls: {
+ // TODO: Avoid code duplication
+ before: function (node) {
+ if (
+ DU.isNewElt(node) &&
+ node.parentNode &&
+ node.parentNode.nodeName === 'BODY'
+ ) {
+ return { min: 1 };
+ }
+ return {};
+ },
+ after: function (node) {
+ if (
+ DU.isNewElt(node) &&
+ node.parentNode &&
+ node.parentNode.nodeName === 'BODY'
+ ) {
+ return { min: 1 };
+ }
+ return {};
+ }
}
},
img: {
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index 13f486a..d5205a8 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -15839,6 +15839,18 @@
<p data-parsoid='{"dsr":[0,24,0,0]}'><span typeof="mw:Image"
data-parsoid='{"optList":[{"ck":"width","ak":"100px"}],"cacheKey":"[[Image:Wiki.png|100px]]","img":{"h":115,"w":100,"wdset":true},"dsr":[0,24,null,null]}'><a
href="./File:Wiki.png" data-parsoid='{"a":{"href":"./File:Wiki.png"}}'><img
resource="./File:Wiki.png"
src="//upload.wikimedia.org/wikipedia/en/thumb/b/bc/Wiki.png/100px-Wiki.png"
height="230" width="200"
data-parsoid='{"a":{"resource":"./File:Wiki.png"},"sa":{"resource":"Image:Wiki.png"}}'></a></span></p>
!!end
+!! test
+Image: New block level image should have \n before and after
+!! options
+parsoid=html2wt
+!! input
+123
+[[File:Wiki.png|right|thumb|150x150px]]
+456
+!! result
+<p>123</p><figure typeof="mw:Image/Thumb" class="mw-halign-right"><a
href="./File:Wiki.png"><img
src="http://192.168.142.128/mw/images/thumb/b/bc/Wiki.png/131px-Wiki.png";
width="131" height="150" resource="./File:Wiki.png"></a></figure><p>456</p>
+!!end
+
TODO:
more images
more tables
--
To view, visit https://gerrit.wikimedia.org/r/70949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b372eb3560ef0f9d60ca8eaa95b62bfa7aad88e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Inez <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Inez <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://192.168.142.128/mw/images/thumb/b/bc/Wiki.png/131px-Wiki.png"](http://192.168.142.128/mw/images/thumb/b/bc/Wiki.png/131px-Wiki.png"){kind=link}