jenkins-bot has submitted this change and it was merged.
Change subject: Clean up SiteLinksChanger.js
......................................................................
Clean up SiteLinksChanger.js
Meant as a reminder. Merge after all the other patches.
Change-Id: Ib62c551f8dccea42a45d6f1c9860384cc9450157
---
M view/resources/wikibase/entityChangers/SiteLinksChanger.js
1 file changed, 12 insertions(+), 15 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
Adrian Heine: Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/wikibase/entityChangers/SiteLinksChanger.js
b/view/resources/wikibase/entityChangers/SiteLinksChanger.js
index e7144ad..74b95fa 100644
--- a/view/resources/wikibase/entityChangers/SiteLinksChanger.js
+++ b/view/resources/wikibase/entityChangers/SiteLinksChanger.js
@@ -35,14 +35,13 @@
/**
* @param {wikibase.datamodel.SiteLink} siteLink
- * @param {string} language
* @return {jQuery.Promise}
* Resolved parameters:
* - {string} The saved siteLink
* Rejected parameters:
* - {wikibase.api.RepoApiError}
*/
- setSiteLink: function( siteLink, language ) {
+ setSiteLink: function( siteLink ) {
var self = this,
deferred = $.Deferred();
@@ -54,7 +53,8 @@
siteLink.getBadges()
)
.done( function( result ) {
- var siteId = siteLink.getSiteId();
+ var siteId = siteLink.getSiteId(),
+ resultData =
result.entity.sitelinks[siteId];
// Update revision store
self._revisionStore.setSitelinksRevision(
result.entity.lastrevid, siteId );
@@ -63,18 +63,15 @@
// FIXME: Introduce Item.setSiteLinks
- var resultData =
result.entity.sitelinks[siteId];
- var savedSiteLink;
- if ( resultData.removed === '' ) {
- savedSiteLink = null;
- } else {
- savedSiteLink = new
wb.datamodel.SiteLink(
- siteId,
- resultData.title,
- resultData.badges
- );
- }
- deferred.resolve( savedSiteLink );
+ deferred.resolve(
+ typeof resultData.removed !==
'undefined'
+ ? null
+ : new wb.datamodel.SiteLink(
+ siteId,
+ resultData.title,
+ resultData.badges
+ )
+ );
} )
.fail( function( errorCode, error ) {
deferred.reject(
wb.api.RepoApiError.newFromApiResponse(
--
To view, visit https://gerrit.wikimedia.org/r/298340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib62c551f8dccea42a45d6f1c9860384cc9450157
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
