Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53974
Change subject: (bug 46075) diff view support for multiline references
......................................................................
(bug 46075) diff view support for multiline references
- when we have multiline references the whole snaklist is
shown in diff view
- added visualization improvement for novaluesnak and somevaluesnak
Change-Id: I6c25d2aa6761bb3f6ffe0107c41c643617ced979
---
M lib/includes/ClaimDifferenceVisualizer.php
M lib/includes/DiffOpValueFormatter.php
2 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/74/53974/1
diff --git a/lib/includes/ClaimDifferenceVisualizer.php
b/lib/includes/ClaimDifferenceVisualizer.php
index 68a8553..9b5a69b 100644
--- a/lib/includes/ClaimDifferenceVisualizer.php
+++ b/lib/includes/ClaimDifferenceVisualizer.php
@@ -224,11 +224,12 @@
$html = '';
foreach ( $snakList as $snak ) {
-
if ( $html !== '' ) {
$html .= Html::rawElement( 'br', array(), '' );
}
- // @fixme
+
+ $html .= $this->getEntityLabel( $snak->getPropertyId()
);
+ $html .= ' / ';
$html .= $this->getMainSnakValue( $snak );
}
@@ -276,8 +277,7 @@
return $diffValueString;
} else {
- // TODO: should be differenced visually (e.g. italic)
- return $snakType;
+ return Html::element( 'i', array(), $snakType );
}
}
@@ -330,13 +330,10 @@
// @todo assert that both reference changes refer to the same
reference
foreach( $referenceChanges as $referenceChange ) {
if ( $referenceChange instanceof \Diff\DiffOpAdd ) {
- $header = $this->getRefHeader(
$referenceChange->getNewValue() );
$newRef = $this->getRefHtml(
$referenceChange->getNewValue() );
} else if ( $referenceChange instanceof
\Diff\DiffOpRemove ) {
- $header = $this->getRefHeader(
$referenceChange->getOldValue() );
$oldRef = $this->getRefHtml(
$referenceChange->getOldValue() );
} else if ( $referenceChange instanceof
\Diff\DiffOpChange ) {
- $header = $this->getRefHeader(
$referenceChange->getNewValue() );
$oldRef = $this->getRefHtml(
$referenceChange->getOldValue() );
$newRef = $this->getRefHtml(
$referenceChange->getNewValue() );
} else {
@@ -345,7 +342,7 @@
}
$valueFormatter = new DiffOpValueFormatter(
- $claimHeader . ' / ' . wfMessage(
'wikibase-diffview-reference' ) . ' / ' . $header,
+ $claimHeader . ' / ' . wfMessage(
'wikibase-diffview-reference' ),
$oldRef,
$newRef
);
diff --git a/lib/includes/DiffOpValueFormatter.php
b/lib/includes/DiffOpValueFormatter.php
index 1b6cd62..38d3f35 100644
--- a/lib/includes/DiffOpValueFormatter.php
+++ b/lib/includes/DiffOpValueFormatter.php
@@ -101,12 +101,12 @@
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-marker' ), '-' );
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-deletedline' ),
Html::rawElement( 'div', array(),
- Html::element( 'del', array( 'class' =>
'diffchange diffchange-inline' ),
+ Html::rawElement( 'del', array( 'class' =>
'diffchange diffchange-inline' ),
$this->oldValue ) ) );
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-marker' ), '+' );
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-addedline' ),
Html::rawElement( 'div', array(),
- Html::element( 'ins', array( 'class' =>
'diffchange diffchange-inline' ),
+ Html::rawElement( 'ins', array( 'class' =>
'diffchange diffchange-inline' ),
$this->newValue ) ) );
$html .= Html::closeElement( 'tr' );
$html .= Html::closeElement( 'tr' );
@@ -127,7 +127,7 @@
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-marker' ), '+' );
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-addedline' ),
Html::rawElement( 'div', array(),
- Html::element( 'ins', array( 'class' =>
'diffchange diffchange-inline' ),
+ Html::rawElement( 'ins', array( 'class' =>
'diffchange diffchange-inline' ),
$this->newValue )
)
);
@@ -148,7 +148,7 @@
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-marker' ), '-' );
$html .= Html::rawElement( 'td', array( 'class' =>
'diff-deletedline' ),
Html::rawElement( 'div', array(),
- Html::element( 'del', array( 'class' =>
'diffchange diffchange-inline' ),
+ Html::rawElement( 'del', array( 'class' =>
'diffchange diffchange-inline' ),
$this->oldValue ) ) );
$html .= Html::rawElement( 'td', array( 'colspan'=>'2' ),
' ' );
$html .= Html::closeElement( 'tr' );
--
To view, visit https://gerrit.wikimedia.org/r/53974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c25d2aa6761bb3f6ffe0107c41c643617ced979
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
