https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112459
Revision: 112459
Author: demon
Date: 2012-02-27 00:16:40 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
MFT r112458
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/CodeReview/backend/DiffHighlighter.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/CodeReview/backend/DiffHighlighter.php
Modified:
branches/wmf/1.19wmf1/extensions/CodeReview/backend/DiffHighlighter.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/CodeReview/backend/DiffHighlighter.php
2012-02-27 00:09:59 UTC (rev 112458)
+++ branches/wmf/1.19wmf1/extensions/CodeReview/backend/DiffHighlighter.php
2012-02-27 00:16:40 UTC (rev 112459)
@@ -86,18 +86,19 @@
function formatLine( $content, $class = null ) {
- if( is_null($class) ) {
+ if ( $class === null ) {
return Html::rawElement( 'tr', $this->getLineIdAttr(),
- Html::Element( 'td', array(
'class'=>'linenumbers' ), $this->left )
- . Html::Element( 'td', array(
'class'=>'linenumbers' ), $this->right )
- . Html::Element( 'td', array() ,
$content )
+ Html::element( 'td', array( 'class'
=> 'linenumbers' ), $this->left )
+ . Html::element( 'td', array( 'class'
=> 'linenumbers' ), $this->right )
+ . Html::rawElement( 'td', array() ,
Html::element( 'span', array() , $content ) )
);
}
# Skip line number when they do not apply
$left = $right = ' ';
+ $inlineWrapEl = 'span';
- switch( $class ) {
+ switch ( $class ) {
case 'chunkdelimiter':
$left = $right = '—';
break;
@@ -107,20 +108,22 @@
break;
case 'del':
$left = $this->left;
+ $inlineWrapEl = 'del';
break;
case 'ins':
$right = $this->right;
+ $inlineWrapEl = 'ins';
break;
default:
# Rely on $left, $right initialization above
}
- $classAttr = is_null($class) ? array() : array( 'class' =>
$class );
+ $classAttr = is_null( $class ) ? array() : array( 'class' =>
$class );
return Html::rawElement( 'tr', $this->getLineIdAttr(),
- Html::rawElement( 'td', array(
'class'=>'linenumbers' ), $left )
- . Html::rawElement( 'td', array(
'class'=>'linenumbers' ), $right )
- . Html::Element( 'td', $classAttr, $content )
+ Html::element( 'td', array( 'class' =>
'linenumbers' ), $left )
+ . Html::element( 'td', array( 'class' =>
'linenumbers' ), $right )
+ . Html::rawElement( 'td', $classAttr ,
Html::element( $inlineWrapEl, array() , $content ) )
);
}
Property changes on:
branches/wmf/1.19wmf1/extensions/CodeReview/backend/DiffHighlighter.php
___________________________________________________________________
Added: svn:mergeinfo
+ /backend/DiffHighlighter.php:91549
/trunk/extensions/CodeReview/backend/DiffHighlighter.php:112096,112458
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
