jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 50408) Make migrateStartMetas more robust
......................................................................
(Bug 50408) Make migrateStartMetas more robust
* While the bug in this case is from async pipeline issues,
this patch adds checks to prevent crashers in migrateStartMetas
by refusing to attempt a migration of the meta out of the
document iself!
Change-Id: I941cc217d2f0ea693434e13364f7fdc88b46172e
---
M js/lib/mediawiki.DOMPostProcessor.js
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index 132ecb4..22f4889 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -858,15 +858,17 @@
c = sibling;
}
- var lastChild = node.lastChild;
- if (lastChild && DU.isTplStartMarkerMeta(lastChild)) {
- // console.warn("migration: " + lastChild.innerHTML);
+ if (node.nodeName !== 'HTML') {
+ var lastChild = node.lastChild;
+ if (lastChild && DU.isTplStartMarkerMeta(lastChild)) {
+ // console.warn("migration: " + lastChild.outerHTML);
- // We can migrate the meta-tag across this node's end-tag
barrier only
- // if that end-tag is zero-width.
- var tagWidth = WT_TagWidths[node.nodeName.toLowerCase()];
- if (tagWidth && tagWidth[1] === 0 &&
!DU.isLiteralHTMLNode(node)) {
- node.parentNode.insertBefore(lastChild,
node.nextSibling);
+ // We can migrate the meta-tag across this node's
end-tag barrier only
+ // if that end-tag is zero-width.
+ var tagWidth =
WT_TagWidths[node.nodeName.toLowerCase()];
+ if (tagWidth && tagWidth[1] === 0 &&
!DU.isLiteralHTMLNode(node)) {
+ node.parentNode.insertBefore(lastChild,
node.nextSibling);
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/71169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I941cc217d2f0ea693434e13364f7fdc88b46172e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
