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

Save fragments without storing data-* attribs onto the node

Browse source 
* This seems to work and also will make the job of keeping extensions
  free of DOM state easier.

  Arlo clarifies that this wasn't necessary since f7594328 and could
  have been cleaned up there.

Change-Id: I96edaa5b2743f1ce0d8596acfdc59035491541cb
This commit is contained in:
Subramanya Sastry 2020-02-11 19:00:29 -06:00 committed by jenkins-bot
parent 2f9f5e25ef
commit aebd6bcdcd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Parsoid/RefGroup.php
View file

@ -99,6 +99,7 @@ class RefGroup {
); );
if ( $refContentId ) { if ( $refContentId ) {
$content = $extApi->getContentDOM( $refContentId ); $content = $extApi->getContentDOM( $refContentId );
DOMDataUtils::visitAndStoreDataAttribs( $content );
DOMUtils::migrateChildrenBetweenDocs( $content, $reftextSpan ); DOMUtils::migrateChildrenBetweenDocs( $content, $reftextSpan );
DOMDataUtils::visitAndLoadDataAttribs( $reftextSpan ); DOMDataUtils::visitAndLoadDataAttribs( $reftextSpan );
} }

13
src/Parsoid/References.php
View file

@ -121,15 +121,11 @@ class References extends ExtensionTag {
/** @var DOMElement $c */ /** @var DOMElement $c */
$c = $extApi->getContentDOM( $contentId ); $c = $extApi->getContentDOM( $contentId );
DOMUtils::assertElt( $c ); DOMUtils::assertElt( $c );
// All the actions that require loaded data-attributes on `c` are done
// here so that we can quickly store those away for later.
DOMDataUtils::visitAndLoadDataAttribs( $c );
$cDp = DOMDataUtils::getDataParsoid( $c ); $cDp = DOMDataUtils::getDataParsoid( $c );
$refDmw = DOMDataUtils::getDataMw( $c ); $refDmw = DOMDataUtils::getDataMw( $c );
if ( empty( $cDp->empty ) && self::hasRef( $c ) ) { // nested ref-in-ref if ( empty( $cDp->empty ) && self::hasRef( $c ) ) { // nested ref-in-ref
self::processRefs( $extApi, $refsData, $c ); self::processRefs( $extApi, $refsData, $c );
} }
DOMDataUtils::visitAndStoreDataAttribs( $c );
// Use the about attribute on the wrapper with priority, since it's // Use the about attribute on the wrapper with priority, since it's
// only added when the wrapper is a template sibling. // only added when the wrapper is a template sibling.
@ -164,9 +160,7 @@ class References extends ExtensionTag {
$html = ''; $html = '';
$contentDiffers = false; $contentDiffers = false;
if ( $ref->hasMultiples ) { if ( $ref->hasMultiples ) {
// Use the non-pp version here since we've already stored attribs $html = ContentUtils::ppToXML( $c, [ 'innerXML' => true ] );
// before putting them in the map.
$html = ContentUtils::toXML( $c, [ 'innerXML' => true ] );
$contentDiffers = $html !== $ref->cachedHtml; $contentDiffers = $html !== $ref->cachedHtml;
} }
if ( $contentDiffers ) { if ( $contentDiffers ) {
@ -176,6 +170,11 @@ class References extends ExtensionTag {
} }
} }
// FIXME: This leaks internal information about how Parsoid handles the DOM.
// $c may not be in canonical form anymore
// and shouldn't be used beyond this point.
$c = null;
DOMDataUtils::addAttributes( $linkBack, [ DOMDataUtils::addAttributes( $linkBack, [
'about' => $about, 'about' => $about,
'class' => 'mw-ref', 'class' => 'mw-ref',