Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/173773
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 lib/resources/Resources.php M lib/tests/qunit/resources.php 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 7 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/73/173773/1 diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index 6d4c30c..cd28662 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -83,9 +83,9 @@ ), ), - 'wikibase.dataTypes' => $moduleTemplate + array( + 'wikibase.dataTypeStore' => $moduleTemplate + array( 'scripts' => array( - 'wikibase.dataTypes/wikibase.dataTypes.js', + 'wikibase.dataTypes/wikibase.dataTypeStore.js', ), 'dependencies' => array( 'dataTypes.DataType', diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php index 608c56a..b2ea9b3 100644 --- a/lib/tests/qunit/resources.php +++ b/lib/tests/qunit/resources.php @@ -35,13 +35,13 @@ ), ), - 'wikibase.dataTypes.tests' => $moduleBase + array( + 'wikibase.dataTypeStore.tests' => $moduleBase + array( 'scripts' => array( - 'wikibase.dataTypes/wikibase.dataTypes.tests.js', + 'wikibase.dataTypes/wikibase.dataTypeStore.tests.js', ), 'dependencies' => array( 'dataTypes.DataTypeStore', - 'wikibase.dataTypes', + 'wikibase.dataTypeStore', ), ), diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index bbe86b1..8ac0467 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -111,9 +111,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', @@ -161,7 +161,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..c856ff5 100644 --- a/repo/resources/wikibase.ui.entityViewInit.js +++ b/repo/resources/wikibase.ui.entityViewInit.js @@ -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 51508dc..89313b5 100644 --- a/repo/tests/qunit/resources.php +++ b/repo/tests/qunit/resources.php @@ -82,13 +82,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: newchange Gerrit-Change-Id: Ib885aeafe03e7ac9e3319416273fa5ceed30630e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits