jenkins-bot has submitted this change and it was merged.
Change subject: Bug fix serializing mw:Entity nodes.
......................................................................
Bug fix serializing mw:Entity nodes.
* Fixes problem with mw:DiffMarker ending up in serialized
output when the diff-marker is added by dom-diff inside the
mw:Entity span.
Change-Id: Ib39c2e80633ba1aeab0ecb5c3c3c85f3abe3bb59
---
M lib/mediawiki.WikitextSerializer.js
M tests/parserTests-blacklist.js
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index e3def9f..514950b 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -679,9 +679,8 @@
}
}
};
- } else if (typeOf === "mw:Entity") {
- var contentSrc = node.childNodes.length === 1 &&
node.textContent ||
- node.innerHTML;
+ } else if (typeOf === "mw:Entity" && node.childNodes.length ===
1) {
+ var contentSrc = node.textContent || node.innerHTML;
return {
handle: function () {
if ( contentSrc === dp.srcContent ) {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 58baace..87514f1 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -2455,7 +2455,7 @@
add("selser", "Handling of sections up to level 6 and beyond
[0,0,1,3,1,3,4,2,[2],3,3,4,1,0,0,2,0,4,1]", "= Level 1 Heading=\n== Level 2
Heading==\n=== Level 3
Heading===\n9vzolj02qqepzaor\n\nb09ymjngm4730udi\n=====56wtakel8yyzaor Level 5
Heading=====\nyiggx30v5j4z33di\n======<nowiki>= Level 7
Heading=</nowiki>======\n======== Level 8
Heading========\n068cf3hs8nuvunmi\n========= Level 9
Heading=========\nqpbi9sagcpbq33di\n======<nowiki>==== Level 10
Heading====</nowiki>======");
add("selser", "Handling of sections up to level 6 and beyond
[0,0,4,0,4,0,0,0,4,0,0,2,[3],4,0,0,[3],0,3]", "= Level 1
Heading=\nhu2xawss5ze61or\n\n7euacpk0x86ywrk9\n==== Level 4
Heading====\n66btsq84yh0vn29\n====== Level 6
Heading======\n4ctl6u9fv9lfpqfr\n======<nowiki/>======\n9vstzsttpthdunmi\n========
Level 8 Heading========\n======<nowiki/>======\n");
add("selser", "Header with special characters (bug 25462)
[1,2,2,0,3,4,0,4,[2],3,0,0,1,0,[3],0,0,2,4,0,1]", "The tooltips shall not show
entities to the user (ie. be double
escaped)\n\n8z7x1wcux3v26gvi\n\ns1o423l9ajg7gb9\n== text > text
==\n2whgc18x6v3d6lxr\n== text < text
==\nt5l87q61pf0z4cxr\n\n92ysy522qy28d7visection 2\n\n== text & text ==\nsection
3\n\n==<nowiki/>==\nsection
4\n\nozk2j78opgajdcxr\n\nw7mpykjqlaowp14i\n\nsection 5");
-add("selser", "Header with space, plus and underscore as entity
[0,2,2,0,0,0,0,0,[4],0,4,4,1,0,[2,0,2,0,0],3,[3],2,4,4,1,0,3,0,3,4,[2,0,3,0,[3],0,2,0,[2],2,3]]",
"Id should not contain + for spaces\n\n1s8n9ebujmoyldi\n\nx2dm134ehi2akyb9\n==
Space between Text ==\nsection 1\n\n== Space-Entity between Text
==\nctsg93fg7nfjemi\n\nfii5im4snhyyzaor\n\ntr1uqz2py5koi529\n\nsection
3\n\n==mdub6jo1drcqh0k9 Plus-Entity<meta
typeof=\"mw:DiffMarker\">+cp7nt180xjxuhaorbetween<meta
typeof=\"mw:DiffMarker\">+Text
==\n\n93x8kyc14qpycik9\n\nmy6t4zb9wnq4zpvi\n\nfsqir1dx869a4i\n\nsection
5\n\ncnlyy146abofajor\n\nxv9ysrtv3ni885mi[[#Space between
Text]]\n\n[[#Plus+between+Text|<nowiki/>]]\n8xc1shdmq3pfzuxr[[#Plus-Entity+between+Text]]\n[[#Underscore_between_Text|3v175tm601nstt9#Underscore_between_Text]]1y56jaqn4d6ajor\n");
+add("selser", "Header with space, plus and underscore as entity
[0,2,2,0,0,0,0,0,[4],0,4,4,1,0,[2,0,2,0,0],3,[3],2,4,4,1,0,3,0,3,4,[2,0,3,0,[3],0,2,0,[2],2,3]]",
"Id should not contain + for spaces\n\n1s8n9ebujmoyldi\n\nx2dm134ehi2akyb9\n==
Space between Text ==\nsection 1\n\n== Space-Entity between Text
==\nctsg93fg7nfjemi\n\nfii5im4snhyyzaor\n\ntr1uqz2py5koi529\n\nsection
3\n\n==mdub6jo1drcqh0k9 Plus-Entitycp7nt180xjxuhaorbetweenText
==\n\n93x8kyc14qpycik9\n\nmy6t4zb9wnq4zpvi\n\nfsqir1dx869a4i\n\nsection
5\n\ncnlyy146abofajor\n\nxv9ysrtv3ni885mi[[#Space between
Text]]\n\n[[#Plus+between+Text|<nowiki/>]]\n8xc1shdmq3pfzuxr[[#Plus-Entity+between+Text]]\n[[#Underscore_between_Text|3v175tm601nstt9#Underscore_between_Text]]1y56jaqn4d6ajor\n");
add("selser", "Header with space, plus and underscore as entity
[0,0,0,0,[4],4,4,0,[3],4,2,0,2,2,[0,0,0,0,4],3,[4],3,0,3,2,0,3,0,0,3,[3,0,0,0,[3],4,2,0,4,0,0]]",
"Id should not contain + for spaces\n\n== Space between Text
==\n8xyfc0i8t2h2gldi\n\nzb4aaqq1s96q1tt9\n\n15bmoldrhl2i6bt9\n\ncfupe02lilhumcxr\n\n6a9prcw3fzcfecdi\n==
Plus+between+Text ==\n2gbrll83w49m5cdi\n\nsection 3\n\nc17wpd542d1xxbt9\n\n==
Plus-Entity+between+8yfotmkftysc3di==\ndrq2cqynku0rizfr\n\n==
Underscore_between_Text ==\ngp6czug4zgfx0f6r\n\nsection 5\n\nsection
6\n\n[[#Space-Entity between Text]]\n[[#Plus+between+Text|<nowiki/>]]<nowiki/>agpzebxg8xvtpgb9fopm0ncoqgf7ds4i[[#Plus-Entity+between+Text]]\nh7rvv79vf6qadcxr\n[[#Underscore-Entity_between_Text]]");
add("selser", "Single-line or multiline-comments can follow headings
[2,4,3,1,0,4,[2],3]",
"u9j9ywtzcjbawcdi\n==foo==\ndrrd423rrk1vpldi\n==bar==\n<!--c1-->z66d0aderf9lik9\n==nxo7we9vvk70t3xrbaz==<!--\nc2\nc3-->");
add("selser", "div with single-quoted attribute [2]", "qu686umowmw8kt9<div
id='rock'>HTML rocks</div>");
--
To view, visit https://gerrit.wikimedia.org/r/167986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib39c2e80633ba1aeab0ecb5c3c3c85f3abe3bb59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Marcoil <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
