jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup in the serializer
......................................................................
Cleanup in the serializer
Change-Id: I1eccba69c21e46a10c069b2f765c0455aa459d8e
---
M lib/mediawiki.WikitextSerializer.js
1 file changed, 12 insertions(+), 14 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index 7665724..d542cab 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -315,8 +315,8 @@
};
WSP._handleLIHackIfApplicable = function(node, cb) {
- var liHackSrc = DU.getDataParsoid( node ).liHackSrc,
- prev = DU.previousNonSepSibling(node);
+ var liHackSrc = DU.getDataParsoid( node ).liHackSrc;
+ var prev = DU.previousNonSepSibling(node);
// If we are dealing with an LI hack, then we must ensure that
// we are dealing with either
@@ -564,12 +564,7 @@
srcParts.push(">");
if (typeof dataMW.body.html === 'string' ||
typeof dataMW.body.id === 'string') {
- var wts = new WikitextSerializer({
- logType: this.logType,
- env: state.env,
- extName: extName
- }),
- htmlText;
+ var htmlText;
// First look for the extension's content in
data-mw.body.html
if (dataMW.body.html) {
htmlText = dataMW.body.html;
@@ -611,7 +606,10 @@
}
}
if (htmlText) {
-
srcParts.push(wts.serializeDOM(DU.parseHTML(htmlText).body));
+ srcParts.push(this.serializeHTML({
+ env: state.env,
+ extName: extName,
+ }, htmlText));
}
} else if (dataMW.body.extsrc !== null && dataMW.body.extsrc
!== undefined) {
srcParts.push(dataMW.body.extsrc);
@@ -971,13 +969,13 @@
function traceNodeName(node) {
switch (node.nodeType) {
case node.ELEMENT_NODE:
- return DU.isMarkerMeta(node, "mw:DiffMarker") ? "DIFF_MARK" : "NODE:
" + node.nodeName;
+ return DU.isMarkerMeta(node, "mw:DiffMarker") ? "DIFF_MARK" :
"NODE: " + node.nodeName;
case node.TEXT_NODE:
- return "TEXT: " + JSON.stringify(node.nodeValue);
+ return "TEXT: " + JSON.stringify(node.nodeValue);
case node.COMMENT_NODE:
- return "CMT : " + JSON.stringify(WTSUtils.commentWT(node.nodeValue));
+ return "CMT : " +
JSON.stringify(WTSUtils.commentWT(node.nodeValue));
default:
- return node.nodeName;
+ return node.nodeName;
}
}
@@ -1394,7 +1392,7 @@
// Wrapper CB for every chunk that emits any required separators
// before emitting the chunk itself.
var chunkCBWrapper = function(chunk, node, atEOF) {
- var accum = function(chunk) { out += chunk; };
+ var accum = function(o) { out += o; };
state.emitSepAndOutput(chunk, node, accum, "OUT:");
state.atStartOfOutput = false;
if (atEOF === 'EOF') {
--
To view, visit https://gerrit.wikimedia.org/r/204302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1eccba69c21e46a10c069b2f765c0455aa459d8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
