jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388685 )
Change subject: Git rid of unused brokenHTMLTag data-parsoid attribute
......................................................................
Git rid of unused brokenHTMLTag data-parsoid attribute
Change-Id: I969374a8052b9084c84561a40a3354c02a3a396c
---
M lib/wt2html/pegTokenizer.pegjs
M tests/parserTests.txt
2 files changed, 2 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 0bf35ea..c4029cb 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1413,7 +1413,7 @@
attribs:generic_newline_attributes
space_or_newline* // No need to preserve this -- canonicalize on RT via
dirty diff
selfclose:"/"?
- bad_ws:space* // No need to preserve this -- canonicalize on RT via dirty
diff
+ space* // not preserved - canonicalized on RT via dirty diff
">" {
stops.pop('table');
stops.pop('tableCellArg');
@@ -1426,9 +1426,7 @@
var isVoidElt = Util.isVoidElement(lcName) &&
!env.conf.wiki.extensionTags.has(lcName);
// Support </br>
- var broken = false;
if (lcName === 'br' && end) {
- broken = true;
end = null;
}
@@ -1439,10 +1437,6 @@
if (!selfclose && isVoidElt) {
res.dataAttribs.selfClose = undefined;
res.dataAttribs.noClose = true;
- }
-
- if (broken || bad_ws.length > 0) {
- res.dataAttribs.brokenHTMLTag = true;
}
return maybeExtensionTag(res);
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 5e30450..0b5d060 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -9449,7 +9449,7 @@
!! html/parsoid
<div title="" data-parsoid='{"stx":"html","selfClose":true}'></div>
<div title="" data-parsoid='{"stx":"html","selfClose":true}'></div>
-<div title=""
data-parsoid='{"stx":"html","selfClose":true,"brokenHTMLTag":true}'></div>
+<div title="" data-parsoid='{"stx":"html","selfClose":true}'></div>
<div title="bar" data-parsoid='{"stx":"html","selfClose":true}'></div>
<div title="bar" data-parsoid='{"stx":"html","selfClose":true}'></div>
<div title="bar/" data-parsoid='{"stx":"html","autoInsertedEnd":true}'></div>
--
To view, visit https://gerrit.wikimedia.org/r/388685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I969374a8052b9084c84561a40a3354c02a3a396c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[email protected]>
Gerrit-Reviewer: Sbailey <[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
