jenkins-bot has submitted this change and it was merged.
Change subject: Rename dataTypes to dataTypeStore
......................................................................
Rename dataTypes to dataTypeStore
wbDataTypes is the settings array. This is not an array but a store
object. I hope I did not forget something. Please double check.
Change-Id: Ib885aeafe03e7ac9e3319416273fa5ceed30630e
---
M repo/resources/Resources.php
R repo/resources/dataTypes/wikibase.dataTypeStore.js
M repo/resources/wikibase.ui.entityViewInit.js
R repo/tests/qunit/dataTypes/wikibase.dataTypeStore.tests.js
M repo/tests/qunit/resources.php
5 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 2ba824c..9c071f6 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -108,9 +108,9 @@
'datatypesconfigvarname' => 'wbDataTypes',
),
- 'wikibase.dataTypes' => $moduleTemplate + array(
+ 'wikibase.dataTypeStore' => $moduleTemplate + array(
'scripts' => array(
- 'dataTypes/wikibase.dataTypes.js',
+ 'dataTypes/wikibase.dataTypeStore.js',
),
'dependencies' => array(
'dataTypes.DataType',
@@ -167,7 +167,7 @@
'jquery.wikibase.claimgrouplabelscroll',
'jquery.wikibase.sitelinkgroupview',
'wikibase.api.getLocationAgnosticMwApi',
- 'wikibase.dataTypes',
+ 'wikibase.dataTypeStore',
'wikibase.entityChangers.EntityChangersFactory',
'wikibase.experts.getStore',
'wikibase.formatters.getStore',
diff --git a/repo/resources/dataTypes/wikibase.dataTypes.js
b/repo/resources/dataTypes/wikibase.dataTypeStore.js
similarity index 89%
rename from repo/resources/dataTypes/wikibase.dataTypes.js
rename to repo/resources/dataTypes/wikibase.dataTypeStore.js
index 38204d3..0d93c8e 100644
--- a/repo/resources/dataTypes/wikibase.dataTypes.js
+++ b/repo/resources/dataTypes/wikibase.dataTypeStore.js
@@ -3,7 +3,7 @@
* @author Daniel Werner < daniel.wer...@wikimedia.de >
* @author H. Snater < mediaw...@snater.com >
*/
-wikibase.dataTypes = ( function( $, mw, dataTypes ) {
+wikibase.dataTypeStore = ( function( $, mw, dataTypes ) {
'use strict';
var dataTypeStore = new dataTypes.DataTypeStore(),
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index f117734..ce73efa 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -4,7 +4,7 @@
* @author Daniel Werner < daniel.werner at wikimedia.de >
*/
-( function( $, mw, wb, dataTypes, getExpertsStore, getFormatterStore,
getParserStore ) {
+( function( $, mw, wb, dataTypeStore, getExpertsStore, getFormatterStore,
getParserStore ) {
'use strict';
mw.hook( 'wikipage.content' ).add( function() {
@@ -127,13 +127,13 @@
entityChangersFactory: entityChangersFactory,
entityStore: entityStore,
valueViewBuilder: new wb.ValueViewBuilder(
- getExpertsStore( dataTypes ),
- getFormatterStore( repoApi, dataTypes ),
+ getExpertsStore( dataTypeStore ),
+ getFormatterStore( repoApi, dataTypeStore ),
getParserStore( repoApi ),
mw.config.get( 'wgUserLanguage' ),
mw
),
- dataTypeStore: dataTypes,
+ dataTypeStore: dataTypeStore,
languages: getUserLanguages()
} )
.on( 'labelviewchange labelviewafterstopediting', function(
event ) {
@@ -342,7 +342,7 @@
jQuery,
mediaWiki,
wikibase,
- wikibase.dataTypes,
+ wikibase.dataTypeStore,
wikibase.experts.getStore,
wikibase.formatters.getStore,
wikibase.parsers.getStore
diff --git a/repo/tests/qunit/dataTypes/wikibase.dataTypes.tests.js
b/repo/tests/qunit/dataTypes/wikibase.dataTypeStore.tests.js
similarity index 67%
rename from repo/tests/qunit/dataTypes/wikibase.dataTypes.tests.js
rename to repo/tests/qunit/dataTypes/wikibase.dataTypeStore.tests.js
index fb9884f..e5d19f8 100644
--- a/repo/tests/qunit/dataTypes/wikibase.dataTypes.tests.js
+++ b/repo/tests/qunit/dataTypes/wikibase.dataTypeStore.tests.js
@@ -7,13 +7,13 @@
( function( QUnit, dataTypeStore, dataTypes ) {
'use strict';
- QUnit.module( 'wikibase.dataTypes' );
+ QUnit.module( 'wikibase.dataTypeStore' );
QUnit.test( 'instance check', function( assert ) {
assert.ok(
dataTypeStore instanceof dataTypes.DataTypeStore,
- 'wikibase.dataTypes is a data type store.'
+ 'wikibase.dataTypeStore is a DataTypeStore.'
);
} );
-}( QUnit, wikibase.dataTypes, dataTypes ) );
+}( QUnit, wikibase.dataTypeStore, dataTypes ) );
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index f2925f3..7db7af2 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -91,13 +91,13 @@
),
),
- 'wikibase.dataTypes.tests' => $moduleBase + array(
+ 'wikibase.dataTypeStore.tests' => $moduleBase + array(
'scripts' => array(
- 'dataTypes/wikibase.dataTypes.tests.js',
+ 'dataTypes/wikibase.dataTypeStore.tests.js',
),
'dependencies' => array(
'dataTypes.DataTypeStore',
- 'wikibase.dataTypes',
+ 'wikibase.dataTypeStore',
),
),
--
To view, visit https://gerrit.wikimedia.org/r/173773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib885aeafe03e7ac9e3319416273fa5ceed30630e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
