Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/66342
Change subject: Run unpackDOMFragments in its own DOM traverser.
......................................................................
Run unpackDOMFragments in its own DOM traverser.
* "[[Foo|<math>bar</math>]] [[Bar]]" didn't parse correctly.
The a-link carries a dom-fragment payload which had to be
unpacked by unpackDOMFragments handler. However, before that
ran, the linkNeighbors handler ran and returned a result which
stopped further handler processing on the link => the dom fragment
wouldn't be unpacked.
* This patch runs unpackDOMFragment in its own patch.
* Fixes semantic errors on en:Ricther's_scale.
Change-Id: I369de325b79c85317a95869ddc10e1a0884b1ef6
---
M js/lib/mediawiki.DOMPostProcessor.js
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/42/66342/1
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index 29e87cc..39cf432 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -2701,21 +2701,21 @@
this.processors.push(encapsulateTemplateOutput);
}
+ // Handle link prefixes and suffixes
+ var linkHandler = new DOMTraverser();
+ linkHandler.addHandler( 'a', handleLinkNeighbours.bind( null, env ) );
+ this.processors.push(linkHandler.traverse.bind(linkHandler));
- // DOM traverser for passes that can be combined and will run at the end
- // 1. Link prefixes and suffixes
- // 2. Strip marker metas -- removes left over marker metas (ex: metas
- // nested in expanded tpl/extension output).
- // 3. Unpack DOM fragments (reused transclusion and extension content)
- var lastDOMHandler = new DOMTraverser();
- lastDOMHandler.addHandler( 'a', handleLinkNeighbours.bind( null, env )
);
- lastDOMHandler.addHandler( null, unpackDOMFragments );
- this.processors.push(lastDOMHandler.traverse.bind(lastDOMHandler));
+ // Unpack DOM fragments
+ var fragmentUnpacker = new DOMTraverser();
+ fragmentUnpacker.addHandler( null, unpackDOMFragments );
+ this.processors.push(fragmentUnpacker.traverse.bind(fragmentUnpacker));
// A pure DOM transformation
this.processors.push(generateReferences.bind(null,
env.conf.parsoid.nativeExtensions.cite.references));
+ // Strip metas and save data-parsoid (can be combined)
var dataParsoidSaver = new DOMTraverser();
dataParsoidSaver.addHandler( 'meta', stripMarkerMetas );
dataParsoidSaver.addHandler( null, saveDataParsoid );
--
To view, visit https://gerrit.wikimedia.org/r/66342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I369de325b79c85317a95869ddc10e1a0884b1ef6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
