jenkins-bot has submitted this change and it was merged.
Change subject: Don't remove <meta>s with data-mw
......................................................................
Don't remove <meta>s with data-mw
Fix over-removal of <meta> tags in
dcba4032057c416984c66405b1bc6b203e9caf59 in cases where there's
data-mw present. If the element is also a mw:Extension/ref/Marker
remove anyway, as those should always dissapear.
Test:
$ echo "{{CinteMurarieProvinciaGrosseto}}" |
node parse --prefix itwiki --wt2wt
Change-Id: Ia4704bce0730458bdd9302f769abd0bc663b2af6
---
M lib/dom.cleanup.js
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/dom.cleanup.js b/lib/dom.cleanup.js
index fd28dbe..e22fe0e 100644
--- a/lib/dom.cleanup.js
+++ b/lib/dom.cleanup.js
@@ -11,7 +11,9 @@
function stripMarkerMetas(rtTestMode, node, atTopLevel) {
// Sometimes a non-tpl meta node might get the mw:Transclusion typeof
// element attached to it. So, check the property to make sure it is not
- // of those metas before deleting it.
+ // of those metas before deleting it. Also check if the node has
data-mw, in
+ // which case we also have to keep it, except if it's also a
mw:extension/ref/Marker
+ // in which case it'll have data-mw but we have to remove the node.
//
// Ex: {{compactTOC8|side=yes|seealso=yes}} generates a
mw:PageProp/notoc meta
// that gets the mw:Transclusion typeof attached to it. It is not okay
to
@@ -19,7 +21,8 @@
var metaType = node.getAttribute("typeof");
var metaTestRE = atTopLevel ? topLevelRE : nonTopLevelRE;
if (metaType
- && ((metaTestRE.test(metaType) &&
!node.getAttribute("property"))
+ && ((metaTestRE.test(metaType) && !node.getAttribute("property")
+ && (!DU.getNodeData(node).mw ||
metaType.match(/mw:Extension\/ref\/Marker/)))
|| (!rtTestMode && metaType ===
"mw:Placeholder/StrippedTag"))
)
{
--
To view, visit https://gerrit.wikimedia.org/r/189519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4704bce0730458bdd9302f769abd0bc663b2af6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil <[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
