Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172523
Change subject: Move RepoApi{,Error} usages
......................................................................
Move RepoApi{,Error} usages
Change-Id: I5515fb02f48255e5bb7e629655f6731f1ad84581
---
M client/resources/Resources.php
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
M client/resources/wikibase.client.PageConnector.js
M lib/resources/api/FormatValueCaller.js
M lib/resources/api/ParseValueCaller.js
M lib/resources/api/resources.php
M lib/resources/entityChangers/AliasesChanger.js
M lib/resources/entityChangers/ClaimsChanger.js
M lib/resources/entityChangers/DescriptionsChanger.js
M lib/resources/entityChangers/EntityChangersFactory.js
M lib/resources/entityChangers/LabelsChanger.js
M lib/resources/entityChangers/ReferencesChanger.js
M lib/resources/entityChangers/SiteLinksChanger.js
M lib/resources/entityChangers/resources.php
M lib/resources/formatters/getApiBasedValueFormatterConstructor.js
M lib/resources/formatters/getStore.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
M lib/resources/jquery.wikibase/toolbar/resources.php
M lib/resources/parsers/getApiBasedValueParserConstructor.js
M lib/resources/parsers/getStore.js
M lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
M lib/resources/wikibase.store/store.ApiEntityStore.js
M lib/tests/qunit/entityChangers/AliasesChanger.tests.js
M lib/tests/qunit/entityChangers/ClaimsChanger.tests.js
M lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
M lib/tests/qunit/entityChangers/LabelsChanger.tests.js
M lib/tests/qunit/entityChangers/ReferencesChanger.tests.js
M lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
M repo/resources/Resources.php
M repo/resources/wikibase.ui.entityViewInit.js
35 files changed, 94 insertions(+), 93 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/23/172523/1
diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index 2c90075..0903419 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -86,8 +86,8 @@
'mediawiki.jqueryMsg',
'wikibase.client.currentSite',
'wikibase.sites',
- 'wikibase.RepoApi',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApi',
+ 'wikibase.api.RepoApiError',
'wikibase.client.PageConnector'
),
'messages' => array(
diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index e1bc376..02e9a2a 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -347,7 +347,7 @@
this.targetArticle = $( '#wbclient-linkItem-page' ).val();
this._pageConnector = new wb.PageConnector(
- new wb.RepoApi( this.options.mwApiForRepo ),
+ new wb.api.RepoApi( this.options.mwApiForRepo ),
this.options.globalSiteId,
this.options.pageTitle,
this.targetSite,
@@ -582,7 +582,7 @@
*/
_onError: function( errorCode, errorInfo ) {
var error = errorInfo
- ? wb.RepoApiError.newFromApiResponse( errorInfo )
+ ? wb.api.RepoApiError.newFromApiResponse( errorInfo )
: errorCode;
var $elem = $( '#wbclient-linkItem-page' );
diff --git a/client/resources/wikibase.client.PageConnector.js
b/client/resources/wikibase.client.PageConnector.js
index 01735bd..ba5c5b0 100644
--- a/client/resources/wikibase.client.PageConnector.js
+++ b/client/resources/wikibase.client.PageConnector.js
@@ -10,7 +10,7 @@
* @constructor
* @since 0.5
*
- * @param {wb.RepoApi} repoApi
+ * @param {wikibase.api.RepoApi} repoApi
* @param {string} firstSiteId
* @param {string} firstPageName
* @param {string} secondSiteId
@@ -33,7 +33,7 @@
$.extend( wb.PageConnector.prototype, {
/**
- * @type wikibase.RepoApi
+ * @type wikibase.api.RepoApi
*/
_repoApi: null,
diff --git a/lib/resources/api/FormatValueCaller.js
b/lib/resources/api/FormatValueCaller.js
index 1224b46..9836a1f 100644
--- a/lib/resources/api/FormatValueCaller.js
+++ b/lib/resources/api/FormatValueCaller.js
@@ -10,7 +10,7 @@
/**
* @constructor
*
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
* @param {dataTypes.DataTypeStore} dataTypeStore
*/
var SELF = MODULE.FormatValueCaller = function( api, dataTypeStore ) {
@@ -21,7 +21,7 @@
$.extend( SELF.prototype, {
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -44,7 +44,7 @@
* Resolved parameters:
* - {string} Formatted DataValue.
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
formatValue: function( dataValue, dataType, outputFormat,
options ) {
@@ -78,13 +78,13 @@
if( apiResult.result ) {
deferred.resolve( apiResult.result );
} else {
- deferred.reject( new wb.RepoApiError(
+ deferred.reject( new
wb.api.RepoApiError(
'unexpected-result',
'The formatter API returned an
unexpected result'
) );
}
} ).fail( function( code, details ) {
- deferred.reject(
wb.RepoApiError.newFromApiResponse( code, details ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( code, details ) );
} );
return deferred.promise();
diff --git a/lib/resources/api/ParseValueCaller.js
b/lib/resources/api/ParseValueCaller.js
index 49f6911..07cb134 100644
--- a/lib/resources/api/ParseValueCaller.js
+++ b/lib/resources/api/ParseValueCaller.js
@@ -13,7 +13,7 @@
* @constructor
* @since 0.5
*
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
*/
var SELF = MODULE.ParseValueCaller = function( api ) {
this._api = api;
@@ -22,7 +22,7 @@
$.extend( SELF.prototype, {
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -38,7 +38,7 @@
* Resolved parameters:
* - {Object[]}
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
parseValues: function( parser, values, options ) {
var deferred = $.Deferred();
@@ -47,7 +47,7 @@
this._api.parseValue( parser, values, options ).done( function(
response ) {
if( !response.results ) {
- deferred.reject( new wb.RepoApiError(
+ deferred.reject( new wb.api.RepoApiError(
'result-unexpected',
'The parse API returned an unexpected
result'
) );
@@ -61,9 +61,9 @@
if( result.error ) {
// This is a really strange error
format, and it's not supported by
- //
wikibase.RepoApiError.newFromApiResponse, so we have to parse it manually here.
+ //
wikibase.api.RepoApiError.newFromApiResponse, so we have to parse it manually
here.
// See bug 72947.
- deferred.reject( new wb.RepoApiError(
+ deferred.reject( new
wb.api.RepoApiError(
result.messages[0].name,
result.messages[0].html['*']
) );
@@ -71,7 +71,7 @@
}
if( !( result.value && result.type ) ) {
- deferred.reject( new wb.RepoApiError(
'result-unexpected', 'Unknown API error' ) );
+ deferred.reject( new
wb.api.RepoApiError( 'result-unexpected', 'Unknown API error' ) );
return;
}
@@ -84,7 +84,7 @@
deferred.resolve( dataValuesSerializations );
} ).fail( function( code, details ) {
- deferred.reject( wb.RepoApiError.newFromApiResponse(
code, details ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( code, details ) );
} );
return deferred.promise();
diff --git a/lib/resources/api/resources.php b/lib/resources/api/resources.php
index 1b0236a..778ee55 100644
--- a/lib/resources/api/resources.php
+++ b/lib/resources/api/resources.php
@@ -33,7 +33,7 @@
),
'dependencies' => array(
'wikibase.api.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
)
),
@@ -53,7 +53,7 @@
),
'dependencies' => array(
'wikibase.api.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
)
),
diff --git a/lib/resources/entityChangers/AliasesChanger.js
b/lib/resources/entityChangers/AliasesChanger.js
index ac32909..155f94a 100644
--- a/lib/resources/entityChangers/AliasesChanger.js
+++ b/lib/resources/entityChangers/AliasesChanger.js
@@ -11,7 +11,7 @@
* @constructor
* @since 0.5
*
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
* @param {wikibase.RevisionStore} revisionStore
* @param {wikibase.datamodel.Entity} entity
*/
@@ -33,7 +33,7 @@
_revisionStore: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -43,7 +43,7 @@
* @return {jQuery.Promise}
* No resolved parameters.
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
setAliases: function( aliases, language ) {
var deferred = $.Deferred(),
@@ -68,7 +68,7 @@
deferred.resolve();
} )
.fail( function( errorCode, errorObject ) {
- deferred.reject( wb.RepoApiError.newFromApiResponse(
errorObject, 'save' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( errorObject, 'save' ) );
} );
return deferred.promise();
diff --git a/lib/resources/entityChangers/ClaimsChanger.js
b/lib/resources/entityChangers/ClaimsChanger.js
index fd5ec30..5602b0e 100644
--- a/lib/resources/entityChangers/ClaimsChanger.js
+++ b/lib/resources/entityChangers/ClaimsChanger.js
@@ -11,7 +11,7 @@
* @constructor
* @since 0.5
*
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
* @param {wikibase.RevisionStore} revisionStore
* @param {wikibase.datamodel.Entity} entity
* @param {wikibase.serialization.ClaimSerializer} claimSerializer
@@ -41,7 +41,7 @@
_revisionStore: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -70,7 +70,7 @@
* @return {jQuery.Promise}
* No resolved parameters.
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
removeStatement: function( statement ) {
var deferred = $.Deferred(),
@@ -85,7 +85,7 @@
deferred.resolve();
} )
.fail( function( errorCode, error ) {
- deferred.reject( wb.RepoApiError.newFromApiResponse(
error, 'remove' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error, 'remove' ) );
} );
return deferred.promise();
@@ -98,7 +98,7 @@
* Resolved parameters:
* - {wikibase.datamodel.Claim} The saved claim
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
setClaim: function( claim, index ) {
var self = this,
@@ -121,7 +121,7 @@
deferred.resolve( savedClaim );
} )
.fail( function( errorCode, error ) {
- deferred.reject( wb.RepoApiError.newFromApiResponse(
error, 'save' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error, 'save' ) );
} );
return deferred.promise();
@@ -134,7 +134,7 @@
* Resolved parameters:
* - {wikibase.datamodel.Statement} The saved statement
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
setStatement: function( statement, index ) {
var self = this,
@@ -159,7 +159,7 @@
deferred.resolve( savedStatement );
} )
.fail( function( errorCode, error ) {
- deferred.reject( wb.RepoApiError.newFromApiResponse(
error, 'save' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error, 'save' ) );
} );
return deferred.promise();
diff --git a/lib/resources/entityChangers/DescriptionsChanger.js
b/lib/resources/entityChangers/DescriptionsChanger.js
index 3ff5885..619cb72 100644
--- a/lib/resources/entityChangers/DescriptionsChanger.js
+++ b/lib/resources/entityChangers/DescriptionsChanger.js
@@ -7,7 +7,7 @@
var MODULE = wb.entityChangers;
/**
- * @param {wikibase.RepoApi}
+ * @param {wikibase.api.RepoApi}
* @param {wikibase.RevisionStore}
* @param {wikibase.datamodel.Entity}
*/
@@ -29,7 +29,7 @@
_revisionStore: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -40,7 +40,7 @@
* Resolved parameters:
* - {string} The saved description
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
setDescription: function( description, language ) {
var self = this,
@@ -65,7 +65,7 @@
deferred.resolve( savedDescription );
} )
.fail( function( errorCode, error ) {
- deferred.reject(
wb.RepoApiError.newFromApiResponse( error, 'save' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error, 'save' ) );
} );
return deferred.promise();
diff --git a/lib/resources/entityChangers/EntityChangersFactory.js
b/lib/resources/entityChangers/EntityChangersFactory.js
index 955e5a7..31575e3 100644
--- a/lib/resources/entityChangers/EntityChangersFactory.js
+++ b/lib/resources/entityChangers/EntityChangersFactory.js
@@ -11,7 +11,7 @@
* @constructor
* @since 0.5
*
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
* @param {wikibase.RevisionStore} revisionStore
* @param {wikibase.datamodel.Entity} entity
*/
@@ -33,7 +33,7 @@
_revisionStore: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
diff --git a/lib/resources/entityChangers/LabelsChanger.js
b/lib/resources/entityChangers/LabelsChanger.js
index 311c64e..6c1cc8c 100644
--- a/lib/resources/entityChangers/LabelsChanger.js
+++ b/lib/resources/entityChangers/LabelsChanger.js
@@ -7,7 +7,7 @@
var MODULE = wb.entityChangers;
/**
- * @param {wikibase.RepoApi}
+ * @param {wikibase.api.RepoApi}
* @param {wikibase.RevisionStore}
* @param {wikibase.datamodel.Entity}
*/
@@ -29,7 +29,7 @@
_revisionStore: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -40,7 +40,7 @@
* Resolved parameters:
* - {string} The saved label
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
setLabel: function( label, language ) {
var self = this,
@@ -65,7 +65,7 @@
deferred.resolve( savedLabel );
} )
.fail( function( errorCode, error ) {
- deferred.reject(
wb.RepoApiError.newFromApiResponse( error, 'save' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error, 'save' ) );
} );
return deferred.promise();
diff --git a/lib/resources/entityChangers/ReferencesChanger.js
b/lib/resources/entityChangers/ReferencesChanger.js
index 3242bbe..2809188 100644
--- a/lib/resources/entityChangers/ReferencesChanger.js
+++ b/lib/resources/entityChangers/ReferencesChanger.js
@@ -11,7 +11,7 @@
* @constructor
* @since 0.5
*
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
* @param {wikibase.RevisionStore} revisionStore
* @param {wikibase.datamodel.Entity} entity
* @param {wikibase.serialization.ReferenceSerializer} referenceSerializer
@@ -43,7 +43,7 @@
_revisionStore: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -63,7 +63,7 @@
* @return {jQuery.Promise}
* No resolved parameters.
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
removeReference: function( statementGuid, reference ) {
var deferred = $.Deferred(),
@@ -81,7 +81,7 @@
deferred.resolve();
} )
.fail( function( errorCode, error ) {
- deferred.reject( wb.RepoApiError.newFromApiResponse(
error, 'remove' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error, 'remove' ) );
} );
return deferred.promise();
@@ -95,7 +95,7 @@
* Resolved parameters:
* - {wikibase.datamodel.Reference} The saved reference
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
setReference: function( statementGuid, reference, index ) {
var deferred = $.Deferred(),
@@ -120,7 +120,7 @@
deferred.resolve( savedReference );
} )
.fail( function( errorCode, error ) {
- deferred.reject( wb.RepoApiError.newFromApiResponse(
error, 'save' ) );
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error, 'save' ) );
} );
return deferred.promise();
diff --git a/lib/resources/entityChangers/SiteLinksChanger.js
b/lib/resources/entityChangers/SiteLinksChanger.js
index 23e18b3..8cf1df9 100644
--- a/lib/resources/entityChangers/SiteLinksChanger.js
+++ b/lib/resources/entityChangers/SiteLinksChanger.js
@@ -7,7 +7,7 @@
var MODULE = wb.entityChangers;
/**
- * @param {wikibase.RepoApi}
+ * @param {wikibase.api.RepoApi}
* @param {wikibase.RevisionStore}
* @param {wikibase.datamodel.Entity}
*/
@@ -29,7 +29,7 @@
_revisionStore: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_api: null,
@@ -40,7 +40,7 @@
* Resolved parameters:
* - {string} The saved siteLink
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
setSiteLink: function( siteLink, language ) {
var self = this,
@@ -72,7 +72,7 @@
deferred.resolve( savedSiteLink );
} )
.fail( function( errorCode, error ) {
- deferred.reject(
wb.RepoApiError.newFromApiResponse(
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse(
error,
siteLink.getPageName() === '' ?
'remove' : 'save' )
);
diff --git a/lib/resources/entityChangers/resources.php
b/lib/resources/entityChangers/resources.php
index 2c1cb28..c0eb1ae 100644
--- a/lib/resources/entityChangers/resources.php
+++ b/lib/resources/entityChangers/resources.php
@@ -34,7 +34,7 @@
'dependencies' => array(
'wikibase.datamodel.MultiTerm',
'wikibase.entityChangers.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
),
),
@@ -44,7 +44,7 @@
),
'dependencies' => array(
'wikibase.entityChangers.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
),
),
@@ -54,7 +54,7 @@
),
'dependencies' => array(
'wikibase.entityChangers.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
)
),
@@ -85,7 +85,7 @@
),
'dependencies' => array(
'wikibase.entityChangers.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
)
),
@@ -95,7 +95,7 @@
),
'dependencies' => array(
'wikibase.entityChangers.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
),
),
@@ -105,7 +105,7 @@
),
'dependencies' => array(
'wikibase.entityChangers.__namespace',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
)
),
diff --git a/lib/resources/formatters/getApiBasedValueFormatterConstructor.js
b/lib/resources/formatters/getApiBasedValueFormatterConstructor.js
index 2ed4b46..fe84f56 100644
--- a/lib/resources/formatters/getApiBasedValueFormatterConstructor.js
+++ b/lib/resources/formatters/getApiBasedValueFormatterConstructor.js
@@ -10,12 +10,13 @@
var PARENT = vf.ValueFormatter;
/**
- * Get a constructor for a ValueFormatter which formats using the given
wb.api.ParseValueCaller
+ * Get a constructor for a ValueFormatter which formats using the given
wikibase.api.FormatValueCaller
*
* This is necessary since valueFormatter.ValueFormatterStore returns a
constructor, not an
- * instance, and we have to pass in the RepoApi wrapped in a
wb.api.FormatValueCaller.
+ * instance, and we have to pass in the wikibase.api.RepoApi wrapped in
a
+ * wikibase.api.FormatValueCaller.
*
- * @param {wb.api.FormatValueCaller} apiValueFormatter
+ * @param {wikibase.api.FormatValueCaller} apiValueFormatter
*/
wb.formatters.getApiBasedValueFormatterConstructor = function(
apiValueFormatter ) {
/**
@@ -44,7 +45,7 @@
var deferred = $.Deferred();
// Since dataTypeId and outputType are optional
parameters to this function as well as
- // to wb.RepoApi.ValueFormatter.formatValue, we
use this complicated apply arguments pattern.
+ // to
wikibase.api.FormatValueCaller.formatValue, we use this complicated apply
arguments pattern.
apiValueFormatter.formatValue.apply(
apiValueFormatter,
$.makeArray( arguments ).concat(
[this._options] )
diff --git a/lib/resources/formatters/getStore.js
b/lib/resources/formatters/getStore.js
index 483512d..3d5287d 100644
--- a/lib/resources/formatters/getStore.js
+++ b/lib/resources/formatters/getStore.js
@@ -8,7 +8,7 @@
wb.formatters = wb.formatters || {};
/**
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
* @param {dataTypes.DataTypeStore} dataTypeStore
*/
wb.formatters.getStore = function( api, dataTypeStore ) {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index 75cda6d..95b2c02 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -64,7 +64,7 @@
*
* @event toggleerror: Triggered when an error occurred or is resolved.
* (1) {jQuery.Event} event
- * (2) {wb.RepoApiError|undefined} wb.RepoApiError object if an error
occurred, undefined if
+ * (2) {wikibase.api.RepoApiError|undefined} RepoApiError object if an
error occurred, undefined if
* the current error state is resolved.
*/
$.widget( 'wikibase.claimview', PARENT, {
@@ -623,7 +623,7 @@
* Sets/removes error state from the widget.
* @since 0.4
*
- * @param {wb.RepoApiError} [error]
+ * @param {wikibase.api.RepoApiError} [error]
*/
setError: function( error ) {
if ( error ) {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 57ecc33..0270ee9 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -53,7 +53,7 @@
*
* @event toggleerror: Triggered when an error occurred or is resolved.
* (1) {jQuery.Event} event
- * (2) {wb.RepoApiError|undefined} wb.RepoApiError object if an error
occurred, undefined if
+ * (2) {wikibase.api.RepoApiError|undefined} RepoApiError object if an
error occurred, undefined if
* the current error state is resolved.
*/
$.widget( 'wikibase.referenceview', PARENT, {
@@ -562,7 +562,7 @@
* Sets/removes error state from the widget.
* @since 0.4
*
- * @param {wb.RepoApiError} [error]
+ * @param {wkibase.api.RepoApiError} [error]
*/
setError: function( error ) {
if ( error ) {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index c285bba..76bdce5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -747,7 +747,7 @@
* Resolved parameters:
* - {Object}
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
_saveSiteLink: function( siteLink ) {
var self = this;
@@ -775,7 +775,7 @@
* Resolved parameters:
* - {Object}
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
remove: function( sitelinkview ) {
var self = this,
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index ee61459..5948a46 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -565,7 +565,7 @@
* Resolved parameters:
* - {wikibase.datamodel.Statement} The saved statement
* Rejected parameters:
- * - {wikibase.RepoApiError}
+ * - {wikibase.api.RepoApiError}
*/
_saveStatementApiCall: function() {
var self = this,
@@ -646,7 +646,7 @@
* Sets/removes error state from the widget.
* @since 0.4
*
- * @param {wb.RepoApiError} [error]
+ * @param {wikibase.api.RepoApiError} [error]
*/
setError: function( error ) {
if( error ) {
diff --git
a/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
b/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
index 08ddcce..c455a0e 100644
--- a/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
+++ b/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
@@ -243,7 +243,7 @@
}
} )
.on( prefix + 'toggleerror.' + this.widgetName, function(
event, error ) {
- if( isInteractionWidgetNode( event.target ) && error
instanceof wb.RepoApiError ) {
+ if( isInteractionWidgetNode( event.target ) && error
instanceof wb.api.RepoApiError ) {
var $anchor;
if( error.action === 'save' ) {
@@ -448,7 +448,7 @@
/**
* Displays an error message.
*
- * @param {wikibase.RepoApiError} error
+ * @param {wikibase.api.RepoApiError} error
* @param {jQuery} $anchor Node the tooltip shall be attached to.
*/
displayError: function( error, $anchor ) {
diff --git a/lib/resources/jquery.wikibase/toolbar/resources.php
b/lib/resources/jquery.wikibase/toolbar/resources.php
index 4dec8cd..d69b0a7 100644
--- a/lib/resources/jquery.wikibase/toolbar/resources.php
+++ b/lib/resources/jquery.wikibase/toolbar/resources.php
@@ -42,7 +42,7 @@
'jquery.wikibase.toolbar',
'jquery.wikibase.toolbarbutton',
'jquery.wikibase.wbtooltip',
- 'wikibase.RepoApiError',
+ 'wikibase.api.RepoApiError',
),
'messages' => array(
'wikibase-cancel',
diff --git a/lib/resources/parsers/getApiBasedValueParserConstructor.js
b/lib/resources/parsers/getApiBasedValueParserConstructor.js
index c373488..3633d4e 100644
--- a/lib/resources/parsers/getApiBasedValueParserConstructor.js
+++ b/lib/resources/parsers/getApiBasedValueParserConstructor.js
@@ -14,7 +14,7 @@
* @since 0.5
*
* This is necessary since valueParser.ValueParserStore returns a constructor,
not an instance, and
- * we have to pass in the RepoApi wrapped in a wb.api.ParseValueCaller.
+ * we have to pass in the RepoApi wrapped in a wikibase.api.ParseValueCaller.
*
* @param {wikibase.api.ParseValueCaller} apiValueParser
* @return {Function}
diff --git a/lib/resources/parsers/getStore.js
b/lib/resources/parsers/getStore.js
index f4718e3..3ce93f2 100644
--- a/lib/resources/parsers/getStore.js
+++ b/lib/resources/parsers/getStore.js
@@ -10,7 +10,7 @@
/**
* @since 0.5
*
- * @param {wikibase.RepoApi} api
+ * @param {wikibase.api.RepoApi} api
* @return {valueParsers.ValueParserStore}
*/
wb.parsers.getStore = function( api ) {
diff --git a/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
b/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
index fe27261..36a34ce 100644
--- a/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
+++ b/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
@@ -83,7 +83,7 @@
* @param {Object} details Object returned from the API containing
detailed information
* @param {string} [apiAction] API action (e.g. 'save', 'remove') that
may be passed to
* determine a specific message
- * @return {wikibase.RepoApiError}
+ * @return {wikibase.api.RepoApiError}
*/
SELF.newFromApiResponse = function( details, apiAction ) {
var errorCode = '',
diff --git a/lib/resources/wikibase.store/store.ApiEntityStore.js
b/lib/resources/wikibase.store/store.ApiEntityStore.js
index 4de7e72..ee75fe3 100644
--- a/lib/resources/wikibase.store/store.ApiEntityStore.js
+++ b/lib/resources/wikibase.store/store.ApiEntityStore.js
@@ -13,7 +13,7 @@
* @extends wikibase.store.EntityStore
* @since 0.5
*
- * @param {wikibase.RepoApi} repoApi
+ * @param {wikibase.api.RepoApi} repoApi
* @param {wikibase.store.FetchedContentUnserializer}
fetchedEntityUnserializer;
* @param {string[]} languages
*/
@@ -45,7 +45,7 @@
_languages: null,
/**
- * @type {wikibase.RepoApi}
+ * @type {wikibase.api.RepoApi}
*/
_repoApi: null,
diff --git a/lib/tests/qunit/entityChangers/AliasesChanger.tests.js
b/lib/tests/qunit/entityChangers/AliasesChanger.tests.js
index 9e9f0f1..0f17f44 100644
--- a/lib/tests/qunit/entityChangers/AliasesChanger.tests.js
+++ b/lib/tests/qunit/entityChangers/AliasesChanger.tests.js
@@ -103,7 +103,7 @@
QUnit.start();
assert.ok(
- error instanceof wb.RepoApiError,
+ error instanceof wb.api.RepoApiError,
'setAliases failed with a RepoApiError'
);
diff --git a/lib/tests/qunit/entityChangers/ClaimsChanger.tests.js
b/lib/tests/qunit/entityChangers/ClaimsChanger.tests.js
index 8713052..00c8842 100644
--- a/lib/tests/qunit/entityChangers/ClaimsChanger.tests.js
+++ b/lib/tests/qunit/entityChangers/ClaimsChanger.tests.js
@@ -110,7 +110,7 @@
} )
.fail( function( error ) {
assert.ok(
- error instanceof wb.RepoApiError,
+ error instanceof wb.api.RepoApiError,
'removeStatement did not fail with a
RepoApiError'
);
@@ -209,7 +209,7 @@
} )
.fail( function( error ) {
assert.ok(
- error instanceof wb.RepoApiError,
+ error instanceof wb.api.RepoApiError,
'setClaim failed with a RepoApiError'
);
@@ -323,7 +323,7 @@
} )
.fail( function( error ) {
assert.ok(
- error instanceof wb.RepoApiError,
+ error instanceof wb.api.RepoApiError,
'setStatement failed with a RepoApiError'
);
diff --git a/lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
b/lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
index 7fab678..4b47b87 100644
--- a/lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
+++ b/lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
@@ -91,7 +91,7 @@
} )
.fail( function( error ) {
QUnit.start();
- assert.ok( error instanceof wb.RepoApiError,
'setDescription did not fail with a RepoApiError' );
+ assert.ok( error instanceof wb.api.RepoApiError,
'setDescription did not fail with a RepoApiError' );
assert.equal( error.code, 'errorCode' );
} );
} );
diff --git a/lib/tests/qunit/entityChangers/LabelsChanger.tests.js
b/lib/tests/qunit/entityChangers/LabelsChanger.tests.js
index eca8024..953ba1e 100644
--- a/lib/tests/qunit/entityChangers/LabelsChanger.tests.js
+++ b/lib/tests/qunit/entityChangers/LabelsChanger.tests.js
@@ -91,7 +91,7 @@
} )
.fail( function( error ) {
QUnit.start();
- assert.ok( error instanceof wb.RepoApiError, 'setLabel
did not fail with a RepoApiError' );
+ assert.ok( error instanceof wb.api.RepoApiError,
'setLabel did not fail with a RepoApiError' );
assert.equal( error.code, 'errorCode' );
} );
} );
diff --git a/lib/tests/qunit/entityChangers/ReferencesChanger.tests.js
b/lib/tests/qunit/entityChangers/ReferencesChanger.tests.js
index 893b583..caaaba1 100644
--- a/lib/tests/qunit/entityChangers/ReferencesChanger.tests.js
+++ b/lib/tests/qunit/entityChangers/ReferencesChanger.tests.js
@@ -106,7 +106,7 @@
QUnit.start();
assert.ok(
- error instanceof wb.RepoApiError,
+ error instanceof wb.api.RepoApiError,
'removeReference did not fail with a
RepoApiError'
);
@@ -201,7 +201,7 @@
QUnit.start();
assert.ok(
- error instanceof wb.RepoApiError,
+ error instanceof wb.api.RepoApiError,
'setReference did not fail with a RepoApiError'
);
diff --git a/lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js
b/lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js
index 0803a9e..92cb97d 100644
--- a/lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js
+++ b/lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js
@@ -91,7 +91,7 @@
} )
.fail( function( error ) {
QUnit.start();
- assert.ok( error instanceof wb.RepoApiError,
'setSiteLink did not fail with a RepoApiError' );
+ assert.ok( error instanceof wb.api.RepoApiError,
'setSiteLink did not fail with a RepoApiError' );
assert.equal( error.code, 'errorCode' );
} );
} );
diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
index 8f4e016..0e6265c 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
@@ -160,7 +160,7 @@
} );
QUnit.test( 'Show and hide error tooltip.', function( assert ) {
- var error = new wb.RepoApiError( 'error-code', 'detailed
message' ),
+ var error = new wb.api.RepoApiError( 'error-code', 'detailed
message' ),
$node = createTestTooltip( { content: error } ),
tooltip = $node.data( 'wbtooltip' );
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 1f4a6cc..f13fa91 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -59,7 +59,7 @@
'wikibase.formatters.getStore',
'wikibase.EntityInitializer',
'wikibase.parsers.getStore',
- 'wikibase.RepoApi',
+ 'wikibase.api.RepoApi',
'wikibase.RevisionStore',
'wikibase.serialization.EntityDeserializer',
'wikibase.sites',
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 89aa5d2..ba38076 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -85,7 +85,7 @@
* Builds an entity store.
* @todo Move to a top-level factory or application scope
*
- * @param {wikibase.RepoApi} repoApi
+ * @param {wikibase.api.RepoApi} repoApi
* @return {wikibase.store.CombiningEntityStore}
*/
function buildEntityStore( repoApi ) {
@@ -112,7 +112,7 @@
function createEntityDom( entity, $entityview ) {
var repoConfig = mw.config.get( 'wbRepo' );
var mwApi = wb.api.getLocationAgnosticMwApi( repoConfig.url +
repoConfig.scriptPath + '/api.php' );
- var repoApi = new wb.RepoApi( mwApi ),
+ var repoApi = new wb.api.RepoApi( mwApi ),
entityStore = buildEntityStore( repoApi ),
revisionStore = new wb.RevisionStore( mw.config.get(
'wgCurRevisionId' ) ),
entityChangersFactory = new
wb.entityChangers.EntityChangersFactory(
--
To view, visit https://gerrit.wikimedia.org/r/172523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5515fb02f48255e5bb7e629655f6731f1ad84581
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
