jenkins-bot has submitted this change and it was merged.

Change subject: Slimmed down Expert store initialization
......................................................................


Slimmed down Expert store initialization

Change-Id: Ief8668d6935b2149ebe6902a7ec97f0741515577
---
M repo/resources/experts/getStore.js
1 file changed, 15 insertions(+), 37 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/resources/experts/getStore.js 
b/repo/resources/experts/getStore.js
index 1d6a447..e88ae5d 100644
--- a/repo/resources/experts/getStore.js
+++ b/repo/resources/experts/getStore.js
@@ -36,44 +36,22 @@
        // Register experts for data types defined in Wikibase. Since those 
data types are defined by a
        // setting, it needs to be checked whether they are actually defined.
 
-       var commonsMediaType = dataTypeStore.getDataType( 'commonsMedia' );
-       if( commonsMediaType ) {
-               expertStore.registerDataTypeExpert(
-                       vv.experts.CommonsMediaType,
-                       commonsMediaType.getId()
-               );
-       }
+       var dataTypeIdToExpertConstructor = {
+               'commonsMedia': vv.experts.CommonsMediaType,
+               'monolingualtext': vv.experts.MonolingualText,
+               'url': vv.experts.StringValue,
+               'wikibase-item': wb.experts.Item,
+               'wikibase-property': wb.experts.Property
+       };
 
-       var monoTextType = dataTypeStore.getDataType( 'monolingualtext' );
-       if( monoTextType ) {
-               expertStore.registerDataTypeExpert(
-                       vv.experts.MonolingualText,
-                       monoTextType.getId()
-               );
-       }
-
-       var urlType = dataTypeStore.getDataType( 'url' );
-       if( urlType ) {
-               expertStore.registerDataTypeExpert(
-                       vv.experts.StringValue,
-                       urlType.getId()
-               );
-       }
-
-       var wikibaseItemType = dataTypeStore.getDataType( 'wikibase-item' );
-       if( wikibaseItemType ) {
-               expertStore.registerDataTypeExpert(
-                       wb.experts.Item,
-                       wikibaseItemType.getId()
-               );
-       }
-
-       var wikibasePropertyType = dataTypeStore.getDataType( 
'wikibase-property' );
-       if( wikibasePropertyType ) {
-               expertStore.registerDataTypeExpert(
-                       wb.experts.Property,
-                       wikibasePropertyType.getId()
-               );
+       for( var dataTypeId in dataTypeIdToExpertConstructor ) {
+               var dataType = dataTypeStore.getDataType( dataTypeId );
+               if( dataType ) {
+                       expertStore.registerDataTypeExpert(
+                               dataTypeIdToExpertConstructor[dataTypeId],
+                               dataType.getId()
+                       );
+               }
        }
 
        return expertStore;

-- 
To view, visit https://gerrit.wikimedia.org/r/180147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief8668d6935b2149ebe6902a7ec97f0741515577
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf12c
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to