wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-12-01 01:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Bug 49555) Support nested refs

Browse source 
* After trying various hacks, came up with a relatively simple
  fix/hack to support nested refs.

  The fix looks for {{#tag:ref..}} and short-circuits full
  pipeline expansion and converts that to an extension tag
  in place.

* Tested with the following wikitext which parses and RTs correctly

A <ref name='foo' />
B {{#tag:ref|nested ref <ref>bar</ref> |name=foo}}
<references />

* Also tested on en:Fomitiporia_ellipsoidea from the bug report
  and verified correct parse and round tripping.

* Verified that the nested ref in <ref> foo <ref>bar</ref> </ref>
  continues to be parsed as plain text.

* No change in parser test results -- have to make another
  round of updates to parser tests.

Change-Id: I43bb8b710bd10a9ddbea27818ff8aaf97ddb3fdc
This commit is contained in:
Subramanya Sastry 2013-06-18 14:48:57 -05:00
parent 7d93200a91
commit 53bbcbb37e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
js/lib/ext.Cite.js
View file

@ -92,7 +92,7 @@ Ref.prototype.reset = function() { };
*/ */
Ref.prototype.handleRef = function ( manager, pipelineOpts, refTok, cb ) { Ref.prototype.handleRef = function ( manager, pipelineOpts, refTok, cb ) {
// Nested <ref> tags are not supported // Nested <ref> tags are not supported
if (pipelineOpts.extTag === "ref") { if (!pipelineOpts.inTagRef && pipelineOpts.extTag === "ref" && pipelineOpts.wrapTemplates) {
cb({ tokens: [refTok.getAttribute("source")] }); cb({ tokens: [refTok.getAttribute("source")] });
return; return;
} }
@ -123,6 +123,7 @@ Ref.prototype.handleRef = function ( manager, pipelineOpts, refTok, cb ) {
// Full pipeline for processing ref-content // Full pipeline for processing ref-content
pipelineType: 'text/x-mediawiki/full', pipelineType: 'text/x-mediawiki/full',
pipelineOpts: { pipelineOpts: {
inTagRef: refTok.getAttribute("inTagRef"),
extTag: "ref" extTag: "ref"
}, },
res: [], res: [],