Subramanya Sastry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398674 )
Change subject: Move linting pass to the very end ...................................................................... Move linting pass to the very end * This requires marker meta stripping to be moved to the end as well. Change-Id: I74e8351065203ebc76aae505da91f6da3bc63816 --- M lib/wt2html/DOMPostProcessor.js 1 file changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/74/398674/1 diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js index 113073f..e0df1b6 100644 --- a/lib/wt2html/DOMPostProcessor.js +++ b/lib/wt2html/DOMPostProcessor.js @@ -177,31 +177,27 @@ domVisitor.addHandler(null, CleanUp.handleEmptyElements); addPP('handleEmptyElts', domVisitor.traverse.bind(domVisitor)); + domVisitor = new DOMTraverser(env); + var tableFixer = new TableFixups(env); + // 1. Deal with <li>-hack and move trailing categories in <li>s out of the list + domVisitor.addHandler('li', liFixups.handleLIHack); + domVisitor.addHandler('li', liFixups.migrateTrailingCategories); + // 2. Fix up issues from templated table cells and table cell attributes + domVisitor.addHandler('td', tableFixer.stripDoubleTDs.bind(tableFixer)); + domVisitor.addHandler('td', tableFixer.handleTableCellTemplates.bind(tableFixer)); + domVisitor.addHandler('th', tableFixer.handleTableCellTemplates.bind(tableFixer)); + // 3. Add heading anchors + domVisitor.addHandler(null, headings.genAnchors); + addPP('(li+table)Fixups+headings', domVisitor.traverse.bind(domVisitor)); + + // Add <section> wrappers around sections + addPP('wrapSections', wrapSections); + if (env.conf.parsoid.linting) { domVisitor = new DOMTraverser(env); domVisitor.addHandler(null, linter.logWikitextFixups); addPP('linter', domVisitor.traverse.bind(domVisitor)); } - - domVisitor = new DOMTraverser(env); - var tableFixer = new TableFixups(env); - // 1. Strip marker metas -- removes left over marker metas (ex: metas - // nested in expanded tpl/extension output). - domVisitor.addHandler('meta', - CleanUp.stripMarkerMetas.bind(null, env.conf.parsoid.rtTestMode)); - // 2. Deal with <li>-hack and move trailing categories in <li>s out of the list - domVisitor.addHandler('li', liFixups.handleLIHack); - domVisitor.addHandler('li', liFixups.migrateTrailingCategories); - // 3. Fix up issues from templated table cells and table cell attributes - domVisitor.addHandler('td', tableFixer.stripDoubleTDs.bind(tableFixer)); - domVisitor.addHandler('td', tableFixer.handleTableCellTemplates.bind(tableFixer)); - domVisitor.addHandler('th', tableFixer.handleTableCellTemplates.bind(tableFixer)); - // 4. Add heading anchors - domVisitor.addHandler(null, headings.genAnchors); - addPP('stripMarkers+(li+table)Fixups+headings', domVisitor.traverse.bind(domVisitor)); - - // Add <section> wrappers around sections - addPP('wrapSections', wrapSections); // Make heading IDs unique domVisitor = new DOMTraverser(env); @@ -240,7 +236,11 @@ } return true; }); - addPP('heading id uniqueness', domVisitor.traverse.bind(domVisitor)); + // Strip marker metas -- removes left over marker metas (ex: metas + // nested in expanded tpl/extension output). + domVisitor.addHandler('meta', + CleanUp.stripMarkerMetas.bind(null, env.conf.parsoid.rtTestMode)); + addPP('heading id uniqueness + stripMarkerMetas', domVisitor.traverse.bind(domVisitor)); // Save data.parsoid into data-parsoid html attribute. // Make this its own thing so that any changes to the DOM -- To view, visit https://gerrit.wikimedia.org/r/398674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74e8351065203ebc76aae505da91f6da3bc63816 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry <ssas...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits