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

Rename diff-related classes for LTR compatibility

Browse source 
Nothing in the code expects things to be on the left/right, it was just
a naming convention. However, it caused some issues because CSSJanus
flips the attributes in the stylesheet for RTL languages.

So just use more descriptive names that also avoid issues with RTL
languages.

Bug: T290731
Change-Id: I8a383cd1e3981dc8a826ff60eee523d9f71d1d3d
This commit is contained in:
Daimona Eaytoy 2021-09-16 15:47:16 +02:00
parent bea70565d9
commit 25e10bb38a
6 changed files with 64 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/diff/DifferenceEngine.php
View file

@ -1823,12 +1823,12 @@ class DifferenceEngine extends ContextSource {
}
if ( $otitle || $ntitle ) {
// FIXME Hardcoding values from TableDiffFormatter.
$leftClass = 'diff-left';
$rightClass = 'diff-right';
$deletedClass = 'diff-side-deleted';
$addedClass = 'diff-side-added';
$header .= "
<tr class=\"diff-title\" lang=\"{$userLang}\">
<td colspan=\"$colspan\" class=\"diff-otitle {$leftClass}\">{$otitle}</td>
<td colspan=\"$colspan\" class=\"diff-ntitle {$rightClass}\">{$ntitle}</td>
<td colspan=\"$colspan\" class=\"diff-otitle {$deletedClass}\">{$otitle}</td>
<td colspan=\"$colspan\" class=\"diff-ntitle {$addedClass}\">{$ntitle}</td>
</tr>";
}
}

30
includes/diff/TableDiffFormatter.php
View file

@ -35,11 +35,11 @@ class TableDiffFormatter extends DiffFormatter {
/**
* Constants for diff sides. Note: these are also used for context lines.
*/
private const SIDE_LEFT = 'left';
private const SIDE_RIGHT = 'right';
private const SIDE_DELETED = 'deleted';
private const SIDE_ADDED = 'added';
private const SIDE_CLASSES = [
self::SIDE_LEFT => 'diff-left',
self::SIDE_RIGHT => 'diff-right'
self::SIDE_DELETED => 'diff-side-deleted',
self::SIDE_ADDED => 'diff-side-added'
];
public function __construct() {
@ -113,7 +113,7 @@ class TableDiffFormatter extends DiffFormatter {
* @return string
*/
protected function addedLine( $line ) {
return $this->wrapLine( '+', [ 'diff-addedline', $this->getClassForSide( self::SIDE_RIGHT ) ], $line );
return $this->wrapLine( '+', [ 'diff-addedline', $this->getClassForSide( self::SIDE_ADDED ) ], $line );
}
/**
@ -124,14 +124,14 @@ class TableDiffFormatter extends DiffFormatter {
* @return string
*/
protected function deletedLine( $line ) {
return $this->wrapLine( '−', [ 'diff-deletedline', $this->getClassForSide( self::SIDE_LEFT ) ], $line );
return $this->wrapLine( '−', [ 'diff-deletedline', $this->getClassForSide( self::SIDE_DELETED ) ], $line );
}
/**
* HTML-escape parameter before calling this
*
* @param string $line
* @param string $side self::SIDE_LEFT or self::SIDE_RIGHT
* @param string $side self::SIDE_DELETED or self::SIDE_ADDED
*
* @return string
*/
@ -164,7 +164,7 @@ class TableDiffFormatter extends DiffFormatter {
}
/**
* @param string $side self::SIDE_LEFT or self::SIDE_RIGHT
* @param string $side self::SIDE_DELETED or self::SIDE_ADDED
* @return string
*/
protected function emptyLine( string $side ) {
@ -182,7 +182,7 @@ class TableDiffFormatter extends DiffFormatter {
Html::rawElement(
'tr',
[],
$this->emptyLine( self::SIDE_LEFT ) .
$this->emptyLine( self::SIDE_DELETED ) .
$this->addedLine(
Html::element(
'ins',
@ -214,7 +214,7 @@ class TableDiffFormatter extends DiffFormatter {
$line
)
) .
$this->emptyLine( self::SIDE_RIGHT )
$this->emptyLine( self::SIDE_ADDED )
) .
"\n"
);
@ -232,8 +232,8 @@ class TableDiffFormatter extends DiffFormatter {
Html::rawElement(
'tr',
[],
$this->contextLine( htmlspecialchars( $line ), self::SIDE_LEFT ) .
$this->contextLine( htmlspecialchars( $line ), self::SIDE_RIGHT )
$this->contextLine( htmlspecialchars( $line ), self::SIDE_DELETED ) .
$this->contextLine( htmlspecialchars( $line ), self::SIDE_ADDED )
) .
"\n"
);
@ -258,8 +258,8 @@ class TableDiffFormatter extends DiffFormatter {
$nadd = count( $add );
$n = max( $ndel, $nadd );
for ( $i = 0; $i < $n; $i++ ) {
$delLine = $i < $ndel ? $this->deletedLine( $del[$i] ) : $this->emptyLine( self::SIDE_LEFT );
$addLine = $i < $nadd ? $this->addedLine( $add[$i] ) : $this->emptyLine( self::SIDE_RIGHT );
$delLine = $i < $ndel ? $this->deletedLine( $del[$i] ) : $this->emptyLine( self::SIDE_DELETED );
$addLine = $i < $nadd ? $this->addedLine( $add[$i] ) : $this->emptyLine( self::SIDE_ADDED );
$this->writeOutput(
Html::rawElement(
'tr',
@ -274,7 +274,7 @@ class TableDiffFormatter extends DiffFormatter {
/**
* Get a class for the given diff side, or throw if the side is invalid.
*
* @param string $side self::SIDE_LEFT or self::SIDE_RIGHT
* @param string $side self::SIDE_DELETED or self::SIDE_ADDED
* @return string
* @throws InvalidArgumentException
*/

8
resources/src/mediawiki.diff.styles/diff.js
View file

@ -23,10 +23,10 @@
return;
}
if ( $( textNode ).closest( '.diff-left' ).length !== 0 ) {
side = 'left';
} else if ( $( textNode ).closest( '.diff-right' ).length !== 0 ) {
side = 'right';
if ( $( textNode ).closest( '.diff-side-deleted' ).length !== 0 ) {
side = 'deleted';
} else if ( $( textNode ).closest( '.diff-side-added' ).length !== 0 ) {
side = 'added';
} else {
// Not inside the diff, ignore.
return;

4
resources/src/mediawiki.diff.styles/diff.less
View file

@ -226,8 +226,8 @@
}
/* Lock selection to a single side */
.diff[ data-selected-side='left' ] .diff-right,
.diff[ data-selected-side='right' ] .diff-left {
.diff[ data-selected-side='deleted' ] .diff-side-added,
.diff[ data-selected-side='added' ] .diff-side-deleted {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;

75
tests/phpunit/includes/api/ApiComparePagesTest.php
View file

@ -43,12 +43,13 @@ class ApiComparePagesTest extends ApiTestCase {
self::$repl['revB3'] = $this->addPage( 'B', 'B 3' );
self::$repl['revB4'] = $this->addPage( 'B', 'B 4' );
self::$repl['pageB'] = Title::newFromText( 'ApiComparePagesTest B' )->getArticleID();
foreach ( [
$updateTimestamps = [
self::$repl['revB1'] => '20010101011101',
self::$repl['revB2'] => '20020202022202',
self::$repl['revB3'] => '20030303033303',
self::$repl['revB4'] => '20040404044404',
] as $id => $ts ) {
];
foreach ( $updateTimestamps as $id => $ts ) {
$this->db->update(
'revision',
[ 'rev_timestamp' => $this->db->timestamp( $ts ) ],
@ -203,7 +204,7 @@ class ApiComparePagesTest extends ApiTestCase {
'totitle' => 'ApiComparePagesTest B',
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">A </del>4</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">B </ins>4</div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">A </del>4</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">B </ins>4</div></td></tr>' . "\n",
]
],
],
@ -224,7 +225,7 @@ class ApiComparePagesTest extends ApiTestCase {
'totitle' => 'ApiComparePagesTest B',
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">A </del>4</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">B </ins>4</div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">A </del>4</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">B </ins>4</div></td></tr>' . "\n",
]
],
],
@ -245,7 +246,7 @@ class ApiComparePagesTest extends ApiTestCase {
'totitle' => 'ApiComparePagesTest A',
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div>A <del class="diffchange diffchange-inline">2</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div>A <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div>A <del class="diffchange diffchange-inline">2</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div>A <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
]
],
],
@ -267,7 +268,7 @@ class ApiComparePagesTest extends ApiTestCase {
'toarchive' => true,
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">A </del>2</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">C </ins>2</div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">A </del>2</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">C </ins>2</div></td></tr>' . "\n",
]
],
false, true
@ -292,7 +293,7 @@ class ApiComparePagesTest extends ApiTestCase {
'tocommenthidden' => true,
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">A </del>2</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">B </ins>2</div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">A </del>2</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">B </ins>2</div></td></tr>' . "\n",
]
],
false, true
@ -310,7 +311,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
]
],
],
@ -326,7 +327,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
]
],
],
@ -342,7 +343,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text</div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text</div></td></tr>' . "\n",
]
],
],
@ -359,7 +360,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">Test</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">Test</ins></div></td></tr>' . "\n",
]
],
],
@ -376,7 +377,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
]
],
],
@ -393,7 +394,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
]
],
],
@ -410,7 +411,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest C</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest C</ins></div></td></tr>' . "\n",
]
],
false, true
@ -430,11 +431,11 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker"></td><td class="diff-context diff-left"><div>== Section 1 ==</div></td><td class="diff-marker"></td><td class="diff-context diff-right"><div>== Section 1 ==</div></td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">F 1.1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To text?</ins></div></td></tr>' . "\n"
. '<tr><td class="diff-marker"></td><td class="diff-context diff-left"><br/></td><td class="diff-marker"></td><td class="diff-context diff-right"><br/></td></tr>' . "\n"
. '<tr><td class="diff-marker"></td><td class="diff-context diff-left"><div>== Section 2 ==</div></td><td class="diff-marker"></td><td class="diff-context diff-right"><div>== Section 2 ==</div></td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From text?</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">F 1.2</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker"></td><td class="diff-context diff-side-deleted"><div>== Section 1 ==</div></td><td class="diff-marker"></td><td class="diff-context diff-side-added"><div>== Section 1 ==</div></td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">F 1.1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To text?</ins></div></td></tr>' . "\n"
. '<tr><td class="diff-marker"></td><td class="diff-context diff-side-deleted"><br/></td><td class="diff-marker"></td><td class="diff-context diff-side-added"><br/></td></tr>' . "\n"
. '<tr><td class="diff-marker"></td><td class="diff-context diff-side-deleted"><div>== Section 2 ==</div></td><td class="diff-marker"></td><td class="diff-context diff-side-added"><div>== Section 2 ==</div></td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From text?</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">F 1.2</ins></div></td></tr>' . "\n",
]
],
],
@ -467,10 +468,10 @@ class ApiComparePagesTest extends ApiTestCase {
'tosuppressed' => true,
'totimestamp' => '2003-03-03T03:33:03Z',
'next' => '{{REPL:revB4}}',
'diffsize' => 441,
'diffsize' => 454,
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div>B <del class="diffchange diffchange-inline">1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div>B <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div>B <del class="diffchange diffchange-inline">1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div>B <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
]
],
],
@ -507,10 +508,10 @@ class ApiComparePagesTest extends ApiTestCase {
'totimestamp' => '2003-03-03T03:33:03Z',
'prev' => '{{REPL:revB1}}',
'next' => '{{REPL:revB4}}',
'diffsize' => 441,
'diffsize' => 454,
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div>B <del class="diffchange diffchange-inline">2</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div>B <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div>B <del class="diffchange diffchange-inline">2</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div>B <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
]
],
false, true
@ -535,10 +536,10 @@ class ApiComparePagesTest extends ApiTestCase {
'fromcomment' => 'Test for ApiComparePagesTest: B 1',
'fromparsedcomment' => 'Test for ApiComparePagesTest: B 1',
'fromtimestamp' => '2001-01-01T01:11:01Z',
'diffsize' => 464,
'diffsize' => 477,
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">B 1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To text {{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">B 1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To text {{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
]
],
],
@ -616,7 +617,7 @@ class ApiComparePagesTest extends ApiTestCase {
'next' => '{{REPL:revA2}}',
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div> </div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">A 1</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div> </div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">A 1</ins></div></td></tr>' . "\n",
],
],
],
@ -660,7 +661,7 @@ class ApiComparePagesTest extends ApiTestCase {
'bodies' => [
'main' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div>A <del class="diffchange diffchange-inline">1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div>A <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div>A <del class="diffchange diffchange-inline">1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div>A <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
],
],
],
@ -679,7 +680,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
]
],
],
@ -694,7 +695,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
]
],
],
@ -710,7 +711,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text</div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text</div></td></tr>' . "\n",
]
],
],
@ -726,7 +727,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">Test</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">Test</ins></div></td></tr>' . "\n",
]
],
],
@ -742,7 +743,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
]
],
],
@ -758,7 +759,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
]
],
],
@ -774,7 +775,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest C</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest C</ins></div></td></tr>' . "\n",
]
],
false, true
@ -791,8 +792,8 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div>== Section <del class="diffchange diffchange-inline">1 </del>==</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div>== Section <ins class="diffchange diffchange-inline">2 </ins>==</div></td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div><del class="diffchange diffchange-inline">F 1.1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div><ins class="diffchange diffchange-inline">To text?</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div>== Section <del class="diffchange diffchange-inline">1 </del>==</div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div>== Section <ins class="diffchange diffchange-inline">2 </ins>==</div></td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div><del class="diffchange diffchange-inline">F 1.1</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div><ins class="diffchange diffchange-inline">To text?</ins></div></td></tr>' . "\n",
'fromid' => '{{REPL:pageF}}',
'fromrevid' => '{{REPL:revF1}}',
'fromns' => '0',
@ -822,7 +823,7 @@ class ApiComparePagesTest extends ApiTestCase {
'compare' => [
'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td>' . "\n"
. '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-left"><div>B <del class="diffchange diffchange-inline">2</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-right"><div>B <ins class="diffchange diffchange-inline">4</ins></div></td></tr>' . "\n",
. '<tr><td class="diff-marker" data-marker="−"></td><td class="diff-deletedline diff-side-deleted"><div>B <del class="diffchange diffchange-inline">2</del></div></td><td class="diff-marker" data-marker="+"></td><td class="diff-addedline diff-side-added"><div>B <ins class="diffchange diffchange-inline">4</ins></div></td></tr>' . "\n",
'fromid' => '{{REPL:pageB}}',
'fromrevid' => '{{REPL:revB2}}',
'fromns' => 0,

2
tests/phpunit/includes/diff/TextSlotDiffRendererTest.php
View file

@ -114,7 +114,7 @@ class TextSlotDiffRendererTest extends MediaWikiIntegrationTestCase {
];
// Preserve markers when stripping tags
$diff = str_replace( '<td class="diff-marker"></td>', ' ', $diff );
$diff = preg_replace( '@<td colspan="2"( class="diff-[a-z]+")?></td>@', ' ', $diff );
$diff = preg_replace( '@<td colspan="2"( class="(?:diff-side-deleted|diff-side-added)")?></td>@', ' ', $diff );
$diff = preg_replace( '/data-marker="([^"]*)">/', '>$1', $diff );
return str_replace( array_keys( $replacements ), array_values( $replacements ),
trim( strip_tags( $diff ), "\n" ) );