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

ParsoidExtensionAPI: Cleanup the toHTML / innerHTML mess

Browse source 
This is cleaner and less prone to subtle errors since it forces
extension developers to explicitly choose the more performant version.

Bug: T242746
Change-Id: Ia25bc3ae261b43dba97d369940065254faacdd80
This commit is contained in:
Subramanya Sastry 2020-03-26 15:27:52 -05:00 committed by jenkins-bot
parent 6db523d642
commit d5c4583649
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Parsoid/Ref.php
View file

@ -101,7 +101,7 @@ class Ref extends ExtensionTag {
$bodyElt = DOMCompat::getElementById( $editedDoc, $dataMw->body->id );
}
if ( $bodyElt ) {
$html = ParsoidExtensionAPI::innerHTML( $bodyElt );
$html = $extApi->toHTML( $bodyElt, true );
} else {
// Some extra debugging for VisualEditor
$extraDebug = '';

12
src/Parsoid/References.php
View file

@ -152,10 +152,8 @@ class References extends ExtensionTag {
$html = '';
$contentDiffers = false;
if ( $ref->hasMultiples ) {
$html = $extApi->toHTML( $c );
// ParsoidExtensionAPI says $c shouldn't used beyond the toHTML call
// So, set $c to null to explicitly prevent that usage.
$c = null;
$html = $extApi->toHTML( $c, true, true );
$c = null; // $c is being release in the call above
$contentDiffers = $html !== $ref->cachedHtml;
}
if ( $contentDiffers ) {
@ -219,8 +217,8 @@ class References extends ExtensionTag {
} else {
// We don't need to delete the node now since it'll be removed in
// `insertReferencesIntoDOM` when all the children are cleaned out.
array_push( $nestedRefsHTML, $extApi->toHTML( $linkBack, false ), "\n" );
$linkBack = null; // should not be used beyond this point as per 'toHTML' docs
array_push( $nestedRefsHTML, $extApi->toHTML( $linkBack, false, true ), "\n" );
$linkBack = null; // $linkBack is being released in the toHTML call above
}
// Keep the first content to compare multiple <ref>s with the same name.
@ -356,7 +354,7 @@ class References extends ExtensionTag {
): string {
$domBody = DOMCompat::getBody( $extApi->parseHTML( $str ) );
self::processRefs( $extApi, $refsData, $domBody );
return $extApi->toHTML( $domBody );
return $extApi->toHTML( $domBody, true, true );
}
/**