jenkins-bot has submitted this change and it was merged.
Change subject: Inject RepoApi into AbstractedRepoApi
......................................................................
Inject RepoApi into AbstractedRepoApi
Change-Id: I4d1e36de00fa8cc9d88f86e003da062027de5928
---
M client/resources/Resources.php
M lib/WikibaseLib.hooks.php
M lib/resources/Resources.php
M lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
M lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
M repo/resources/wikibase.ui.entityViewInit.js
6 files changed, 14 insertions(+), 11 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index 18678a6..ecdc010 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -51,8 +51,7 @@
'wikibase.client.PageConnector.js'
),
'dependencies' => array(
- 'wikibase.sites',
- 'wikibase.RepoApi',
+ 'wikibase.sites'
),
),
'jquery.wikibase.linkitem' => $moduleTemplate + array(
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index b34c6ae..d283df9 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -118,6 +118,7 @@
'dependencies' => array(
'wikibase.tests.qunit.testrunner',
'wikibase',
+ 'wikibase.RepoApi',
'wikibase.AbstractedRepoApi',
'wikibase.datamodel', // For RepoApi.tests
'wikibase.store.FetchedContent',
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index a92e69e..f9f054a 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -156,7 +156,6 @@
'dependencies' => array(
'wikibase.datamodel',
'wikibase.serialization.entities',
- 'wikibase.RepoApi',
)
),
@@ -327,7 +326,6 @@
'wikibase.utilities',
'wikibase.utilities.jQuery',
'wikibase.utilities.jQuery.ui.tagadata',
- 'wikibase.AbstractedRepoApi',
),
'messages' => array(
'wikibase-save-inprogress',
@@ -766,7 +764,6 @@
'jquery.tipsy',
'jquery.ui.toggler',
'jquery.ui.widget',
- 'wikibase.RepoApiError',
),
'messages' => array(
'wikibase-tooltip-error-details',
diff --git a/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
b/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
index 3716c8a..7b29630 100644
--- a/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
+++ b/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
@@ -13,17 +13,23 @@
*
* @constructor
* @since 0.4
+ *
+ * @param {wb.RepoApi} repoApi
*/
-wb.AbstractedRepoApi = function wbAbstractedRepoApi() {};
+wb.AbstractedRepoApi = function wbAbstractedRepoApi( repoApi ) {
+ if ( !repoApi ) {
+ throw new Error( 'You have to pass an wikibase.RepoApi instance
to wikibase.AbstractedRepoApi' );
+ }
+ this._repoApi = repoApi;
+};
$.extend( wb.AbstractedRepoApi.prototype, {
/**
- * wb.RepoApi object for internal usage. By having this initialized in
the prototype, we can
- * share one instance for all instances of the wikibase API.
+ * wb.RepoApi object for internal usage.
* @type wb.RepoApi
*/
- _repoApi: new wb.RepoApi(),
+ _repoApi: null,
/**
* Removes an existing claim.
diff --git a/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
b/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
index 22e7f85..067a6de 100644
--- a/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
+++ b/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
@@ -20,7 +20,7 @@
* @var {Object}
*/
// @FIXME: Don't mix the plain RepoApi with the abstracted one
- var abstractedApi = new wb.AbstractedRepoApi();
+ var abstractedApi = new wb.AbstractedRepoApi( api );
/**
* Queue used run asynchronous tests synchronously.
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 47621ad..0c8729a 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -259,7 +259,7 @@
function createEntityDom( entity, $claims, $claimsParent, repoApi ) {
// FIXME: Initializing entityview on $claims leads to the claim
section inserted as
// child of $claims. It should be direct child of ".wb-entity".
- var abstractedRepoApi = new wb.AbstractedRepoApi();
+ var abstractedRepoApi = new wb.AbstractedRepoApi( repoApi );
var entityStore = new wb.store.EntityStore( abstractedRepoApi );
wb.compileEntityStoreFromMwConfig( entityStore );
--
To view, visit https://gerrit.wikimedia.org/r/145280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d1e36de00fa8cc9d88f86e003da062027de5928
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
Gerrit-Reviewer: Henning Snater <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WikidataJenkins <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
