jenkins-bot has submitted this change and it was merged.
Change subject: Fix crasher in template wrapping (introduced in 54b4f37bb).
......................................................................
Fix crasher in template wrapping (introduced in 54b4f37bb).
Change-Id: Id640287cc1107d6491b850c863a1980dc111ef76
---
M lib/dom.wrapTemplates.js
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/dom.wrapTemplates.js b/lib/dom.wrapTemplates.js
index 266cf83..e4968c9 100644
--- a/lib/dom.wrapTemplates.js
+++ b/lib/dom.wrapTemplates.js
@@ -596,7 +596,10 @@
};
// Skip template-marker meta-tags
- while (DU.isTplMarkerMeta(encapInfo.target)) {
+ // Also, skip past comments/text nodes found in fosterable
positions
+ // which wouldn't have been span-wrapped in the while-loop
above.
+ while (DU.isTplMarkerMeta(encapInfo.target) ||
!DU.isElt(encapInfo.target)) {
+ console.assert(DU.isElt(encapInfo.target) ||
DU.isFosterablePosition(encapInfo.target));
encapInfo.target = encapInfo.target.nextSibling;
}
--
To view, visit https://gerrit.wikimedia.org/r/130607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id640287cc1107d6491b850c863a1980dc111ef76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Marcoil <marc...@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
