Adrian Lang has submitted this change and it was merged.
Change subject: Use the same EntityInfo for JS and HTML
......................................................................
Use the same EntityInfo for JS and HTML
Change-Id: I5feac8e2a8a4e33c7187fef6a88fd2517ad3b14f
---
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/View/EntityViewFactory.php
2 files changed, 6 insertions(+), 16 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 8ef03f7..d8aa25b 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -2,11 +2,9 @@
namespace Wikibase;
-use Language;
use ParserOutput;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
-use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\Property;
@@ -134,7 +132,7 @@
$this->addHtmlToParserOutput(
$parserOutput,
$entityRevision,
- $usedEntityIds,
+ $entityInfo,
$editable
);
}
@@ -218,9 +216,6 @@
private function getEntityInfo( array $entityIds ) {
wfProfileIn( __METHOD__ );
- // @todo: use same instance of entity info, as for the view
(see below)
- // but appears there are some differences in what is collected
for each.
-
// @todo: apply language fallback!
$entityInfoBuilder =
$this->entityInfoBuilderFactory->newEntityInfoBuilder( $entityIds );
@@ -256,17 +251,15 @@
/**
* @param ParserOutput $parserOutput
* @param EntityRevision $entityRevision
- * @param array $entityIds obtained from
EntityInfoBuilder::getEntityInfo
- * $param boolean $editable
+ * @param array $entityInfo obtained from
EntityInfoBuilder::getEntityInfo
+ * @param boolean $editable
*/
private function addHtmlToParserOutput(
ParserOutput $parserOutput,
EntityRevision $entityRevision,
- array $entityIds,
+ array $entityInfo,
$editable
) {
- $entityInfo = $this->getEntityInfo( $entityIds );
-
$entityView = $this->entityViewFactory->newEntityView(
$this->languageFallbackChain,
$this->languageCode,
diff --git a/repo/includes/View/EntityViewFactory.php
b/repo/includes/View/EntityViewFactory.php
index 89e3759..9866484 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -7,20 +7,16 @@
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
use Wikibase\ClaimHtmlGenerator;
+use Wikibase\EntityView;
use Wikibase\ItemView;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityRetrievingTermLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\LanguageLabelLookup;
use Wikibase\PropertyView;
-use Wikibase\Repo\View\ClaimsView;
-use Wikibase\Repo\View\FingerprintView;
-use Wikibase\Repo\View\SectionEditLinkGenerator;
-use Wikibase\Repo\View\SnakHtmlGenerator;
/**
* @since 0.5
@@ -68,6 +64,7 @@
* @param string $languageCode
* @param string $entityType
*
+ * @throws InvalidArgumentException
* @return EntityView
*/
public function newEntityView(
--
To view, visit https://gerrit.wikimedia.org/r/173275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5feac8e2a8a4e33c7187fef6a88fd2517ad3b14f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
