Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267811
Change subject: Remove flipped flag from template wrapping
......................................................................
Remove flipped flag from template wrapping
* Since metas are converted to comments when html tree building, this
doesn't happen anymore.
* Proof of the pudding is that
Change-Id: Ie19cac039c90eb660fb2d31348b0e6fecf858745
---
M lib/wt2html/pp/wrapTemplates.js
1 file changed, 7 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/11/267811/1
diff --git a/lib/wt2html/pp/wrapTemplates.js b/lib/wt2html/pp/wrapTemplates.js
index d7d609d..cb4a32c 100644
--- a/lib/wt2html/pp/wrapTemplates.js
+++ b/lib/wt2html/pp/wrapTemplates.js
@@ -138,7 +138,6 @@
endElem: endMeta,
id: Util.stripParsoidIdPrefix(startElem.getAttribute("about")),
startOffset: DU.getDataParsoid(startElem).tsr[0],
- flipped: false,
};
// Find common ancestor of startElem and endElem
@@ -239,21 +238,12 @@
updateDSRForFirstTplNode(range.start.nextSibling, startElem);
}
- // Use the negative test since it doesn't mark the range as flipped
- // if range.start === range.end
- if (!DU.inSiblingOrder(range.start, range.end)) {
- // In foster-parenting situations, the end-meta tag (and hence
range.end)
- // can show up before the range.start which would be the table
itself.
- // So, we record this info for later analysis.
- range.flipped = true;
- }
-
env.log("trace/tplwrap/findranges", function() {
var msg = "";
var dp1 = DU.getDataParsoid(range.start);
var dp2 = DU.getDataParsoid(range.end);
msg +=
"\n----------------------------------------------";
- msg += "\nFound range : " + range.id + "; flipped? " +
range.flipped + "; offset: " + range.startOffset;
+ msg += "\nFound range : " + range.id + "; offset: " +
range.startOffset;
msg += "\nstart-elem : " + range.startElem.outerHTML +
"; DP: " + JSON.stringify(DU.getDataParsoid(range.startElem));
msg += "\nend-elem : " + range.endElem.outerHTML + ";
DP: " + JSON.stringify(DU.getDataParsoid(range.endElem));
msg += "\nstart : [TAG_ID " + dp1.tagId + "]: " +
range.start.outerHTML + "; DP: " + JSON.stringify(dp1);
@@ -343,8 +333,8 @@
// start/end elements for intersecting ranges on the same plane and
prev/
// curr are in textual order (which hopefully translates to dom order).
function rangesOverlap(prev, curr) {
- var prevEnd = !r.flipped ? prev.end : prev.start;
- var currStart = !r.flipped ? curr.start : curr.end;
+ var prevEnd = prev.end;
+ var currStart = curr.start;
return DU.inSiblingOrder(currStart, prevEnd);
}
@@ -357,8 +347,8 @@
// node.data as hash-table storage.
for (var i = 0; i < numRanges; i++) {
r = tplRanges[i];
- n = !r.flipped ? r.start : r.end;
- var e = !r.flipped ? r.end : r.start;
+ n = r.start;
+ var e = r.end;
while (n) {
if (DU.isElt(n)) {
@@ -600,8 +590,8 @@
expandRangeToAvoidSpanWrapping(range);
- var n = !range.flipped ? range.start : range.end;
- var e = !range.flipped ? range.end : range.start;
+ var n = range.start;
+ var e = range.end;
var startElem = range.startElem;
var about = startElem.getAttribute('about');
--
To view, visit https://gerrit.wikimedia.org/r/267811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie19cac039c90eb660fb2d31348b0e6fecf858745
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
