Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Show the inline legend even if $wgShowDiffToggleSwitch = false"

Browse source
This commit is contained in:
jenkins-bot 2023-06-26 03:39:11 +00:00 committed by Gerrit Code Review
commit d192ef7c02
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
includes/diff/TextSlotDiffRenderer.php
View file

@ -184,23 +184,23 @@ class TextSlotDiffRenderer extends SlotDiffRenderer {
$showDiffToggleSwitch = $context->getConfig()->get( MainConfigNames::ShowDiffToggleSwitch );
if ( $showDiffToggleSwitch ) {
// wikidiff2 inline type gets a legend to explain the highlighting colours and show an inline toggle
if ( $this->engine === self::ENGINE_WIKIDIFF2 ||
$this->engine === self::ENGINE_WIKIDIFF2_INLINE ) {
$ins = Html::element( 'span',
[ 'class' => 'mw-diff-inline-legend-ins' ],
$context->msg( 'diff-inline-tooltip-ins' )->plain()
);
$del = Html::element( 'span',
[ 'class' => 'mw-diff-inline-legend-del' ],
$context->msg( 'diff-inline-tooltip-del' )->plain()
);
$hideDiffClass = $this->engine === self::ENGINE_WIKIDIFF2 ? 'mw-diff-element-hidden' : '';
$legend = Html::rawElement( 'div',
[ 'class' => 'mw-diff-inline-legend ' . $hideDiffClass ], "$ins $del"
);
// wikidiff2 inline type gets a legend to explain the highlighting colours and show an inline toggle
if ( $this->engine === self::ENGINE_WIKIDIFF2 ||
$this->engine === self::ENGINE_WIKIDIFF2_INLINE ) {
$ins = Html::element( 'span',
[ 'class' => 'mw-diff-inline-legend-ins' ],
$context->msg( 'diff-inline-tooltip-ins' )->plain()
);
$del = Html::element( 'span',
[ 'class' => 'mw-diff-inline-legend-del' ],
$context->msg( 'diff-inline-tooltip-del' )->plain()
);
$hideDiffClass = $this->engine === self::ENGINE_WIKIDIFF2 ? 'mw-diff-element-hidden' : '';
$legend = Html::rawElement( 'div',
[ 'class' => 'mw-diff-inline-legend ' . $hideDiffClass ], "$ins $del"
);
if ( $showDiffToggleSwitch ) {
$values = $context->getRequest()->getValues();
$isInlineDiffType = isset( $values['diff-type'] ) && $values['diff-type'] === 'inline';
unset( $values[ 'diff-type' ] );