wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-09-25 11:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Template reflist: Re-render when converting for preview (e.g. visual diff)"

Browse source
This commit is contained in:
jenkins-bot 2018-09-19 23:49:12 +00:00 committed by Gerrit Code Review
parent f1cf01f878 eb7bed046b
commit 557e311ab4
2 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
modules/ve-cite/tests/ve.dm.citeExample.js
View file

@ -152,41 +152,6 @@ ve.dm.citeExample.domToDataCases = {
'</li>' + '</li>' +
'</ol>' + '</ol>' +
'</div>', '</div>',
previewBody:
'<p>Foo' +
'<sup typeof="mw:Extension/ref" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;attrs&quot;:{&quot;name&quot;:&quot;bar&quot;}}" class="mw-ref">' +
'<a style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a>' +
'</sup>' +
' Baz' +
'<sup typeof="mw:Extension/ref" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;Quux&quot;},&quot;attrs&quot;:{&quot;group&quot;:&quot;g1&quot;,&quot;name&quot;:&quot;:0&quot;}}" class="mw-ref">' +
'<a data-mw-group="g1" style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[g1 1]</span></a>' +
'</sup>' +
' Whee' +
'<sup typeof="mw:Extension/ref" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;' +
'<a href=\\&quot;./Bar\\&quot; rel=\\&quot;mw:WikiLink\\&quot;>Bar' +
'</a>&quot;},&quot;attrs&quot;:{&quot;name&quot;:&quot;bar&quot;}}" class="mw-ref">' +
'<a style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a>' +
'</sup>' +
' Yay' +
// This reference has .body.id instead of .body.html
'<sup typeof="mw:Extension/ref" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;id&quot;:&quot;mw-cite-3&quot;},&quot;attrs&quot;:{&quot;group&quot;:&quot;g1&quot;}}" class="mw-ref">' +
'<a data-mw-group="g1" style="counter-reset: mw-Ref 2;"><span class="mw-reflink-text">[g1 2]</span></a>' +
'</sup>' +
' Quux' +
'<sup typeof="mw:Extension/ref" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;Different content&quot;},&quot;attrs&quot;:{&quot;name&quot;:&quot;bar&quot;}}" class="mw-ref">' +
'<a style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a>' +
'</sup>' +
' Foo' +
'<sup typeof="mw:Extension/ref" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;attrs&quot;:{&quot;group&quot;:&quot;g1&quot;,&quot;name&quot;:&quot;foo&quot;}}" class="mw-ref">' +
'<a data-mw-group="g1" style="counter-reset: mw-Ref 3;"><span class="mw-reflink-text">[g1 3]</span></a>' +
'</sup>' +
'</p>' +
'<div typeof="mw:Extension/references" ' +
'data-mw="{&quot;name&quot;:&quot;references&quot;,&quot;attrs&quot;:{&quot;group&quot;:&quot;g1&quot;},&quot;body&quot;:{' +
'&quot;html&quot;:&quot;<sup typeof=\\&quot;mw:Extension/ref\\&quot; ' +
'data-mw=\\&quot;{&amp;quot;name&amp;quot;:&amp;quot;ref&amp;quot;,&amp;quot;attrs&amp;quot;:{&amp;quot;group&amp;quot;:&amp;quot;g1&amp;quot;,&amp;quot;name&amp;quot;:&amp;quot;foo&amp;quot;},&amp;quot;body&amp;quot;:{&amp;quot;html&amp;quot;:&amp;quot;Ref in refs&amp;quot;}}' +
'\\&quot; class=\\&quot;mw-ref\\&quot;><a data-mw-group=\\&quot;g1\\&quot; style=\\&quot;counter-reset: mw-Ref 3;\\&quot;><span class=\\&quot;mw-reflink-text\\&quot;>[g1 3]</span></a></sup>&quot;}}">' +
'</div>',
head: '<base href="http://example.com" />', head: '<base href="http://example.com" />',
data: [ data: [
{ type: 'paragraph' }, { type: 'paragraph' },

8
modules/ve-cite/ve.dm.MWReferencesListNode.js
View file

@ -106,7 +106,7 @@ ve.dm.MWReferencesListNode.static.toDataElement = function ( domElements, conver
ve.dm.MWReferencesListNode.static.toDomElements = function ( data, doc, converter ) { ve.dm.MWReferencesListNode.static.toDomElements = function ( data, doc, converter ) {
var el, els, mwData, originalMw, contentsHtml, originalHtml, nextIndex, nextElement, modelNode, viewNode, var el, els, mwData, originalMw, contentsHtml, originalHtml, nextIndex, nextElement, modelNode, viewNode,
isResponsiveDefault = mw.config.get( 'wgCiteResponsiveReferences' ), isResponsiveDefault = mw.config.get( 'wgCiteResponsiveReferences' ),
isForClipboard = converter.isForClipboard(), isForParser = converter.isForParser(),
wrapper = doc.createElement( 'div' ), wrapper = doc.createElement( 'div' ),
originalHtmlWrapper = doc.createElement( 'div' ), originalHtmlWrapper = doc.createElement( 'div' ),
dataElement = data[ 0 ], dataElement = data[ 0 ],
@ -114,12 +114,12 @@ ve.dm.MWReferencesListNode.static.toDomElements = function ( data, doc, converte
contentsData = data.slice( 1, -1 ); contentsData = data.slice( 1, -1 );
// If we are sending a template generated ref back to Parsoid, output it as a template. // If we are sending a template generated ref back to Parsoid, output it as a template.
// This works because the dataElement already as mw, originalMw and originalDomIndex properties. // This works because the dataElement already has mw, originalMw and originalDomIndex properties.
if ( attrs.templateGenerated && !isForClipboard ) { if ( attrs.templateGenerated && isForParser ) {
return ve.dm.MWTransclusionNode.static.toDomElements.call( this, dataElement, doc, converter ); return ve.dm.MWTransclusionNode.static.toDomElements.call( this, dataElement, doc, converter );
} }
if ( isForClipboard ) { if ( !isForParser ) {
// Output needs to be read so re-render // Output needs to be read so re-render
modelNode = ve.dm.nodeFactory.createFromElement( dataElement ); modelNode = ve.dm.nodeFactory.createFromElement( dataElement );
modelNode = new ve.dm.MWReferencesListNode( dataElement ); modelNode = new ve.dm.MWReferencesListNode( dataElement );