Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201168
Change subject: Move wikibase.getLanguageNameByCode from repo/ to view/
......................................................................
Move wikibase.getLanguageNameByCode from repo/ to view/
Change-Id: I2659cc1a49c32df85026f18a67bab7cc63b6329c
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/wikibase/resources.php
R view/resources/wikibase/wikibase.getLanguageNameByCode.js
M view/tests/qunit/wikibase/resources.php
R view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
6 files changed, 22 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/68/201168/1
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index a9fd256..ea77e26 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -59,15 +59,6 @@
),
),
- 'wikibase.getLanguageNameByCode' => $moduleTemplate + array(
- 'scripts' => array(
- 'wikibase.getLanguageNameByCode.js'
- ),
- 'dependencies' => array(
- 'wikibase'
- )
- ),
-
'wikibase.templates' => $moduleTemplate + array(
'class' => 'Wikibase\TemplateModule',
'scripts' => 'templates.js',
@@ -207,7 +198,6 @@
);
if ( defined( 'ULS_VERSION' ) ) {
- $modules['wikibase.getLanguageNameByCode']['dependencies'][] =
'ext.uls.mediawiki';
$modules['wikibase.special.itemDisambiguation']['dependencies'][] =
'ext.uls.mediawiki';
$modules['wikibase.special.entitiesWithout']['dependencies'][]
= 'ext.uls.mediawiki';
$modules['wikibase.WikibaseContentLanguages']['dependencies'][]
= 'ext.uls.languagenames';
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index df5caa1..8f46b44 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -65,15 +65,6 @@
),
),
- 'wikibase.getLanguageNameByCode.tests' => $moduleBase + array(
- 'scripts' => array(
- 'wikibase.getLanguageNameByCode.tests.js'
- ),
- 'dependencies' => array(
- 'wikibase.getLanguageNameByCode'
- )
- ),
-
);
return array_merge(
diff --git a/view/resources/wikibase/resources.php
b/view/resources/wikibase/resources.php
index d0eacc6..408f52e 100644
--- a/view/resources/wikibase/resources.php
+++ b/view/resources/wikibase/resources.php
@@ -16,6 +16,15 @@
$modules = array(
+ 'wikibase.getLanguageNameByCode' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'wikibase.getLanguageNameByCode.js'
+ ),
+ 'dependencies' => array(
+ 'wikibase'
+ )
+ ),
+
'wikibase.RevisionStore' => $moduleTemplate + array(
'scripts' => array(
'wikibase.RevisionStore.js',
@@ -37,5 +46,9 @@
);
+ if ( defined( 'ULS_VERSION' ) ) {
+ $modules['wikibase.getLanguageNameByCode']['dependencies'][] =
'ext.uls.mediawiki';
+ }
+
return $modules;
} );
diff --git a/repo/resources/wikibase.getLanguageNameByCode.js
b/view/resources/wikibase/wikibase.getLanguageNameByCode.js
similarity index 100%
rename from repo/resources/wikibase.getLanguageNameByCode.js
rename to view/resources/wikibase/wikibase.getLanguageNameByCode.js
diff --git a/view/tests/qunit/wikibase/resources.php
b/view/tests/qunit/wikibase/resources.php
index fe0bea8..0897832 100644
--- a/view/tests/qunit/wikibase/resources.php
+++ b/view/tests/qunit/wikibase/resources.php
@@ -15,6 +15,15 @@
$modules = array(
+ 'wikibase.getLanguageNameByCode.tests' => $moduleBase + array(
+ 'scripts' => array(
+ 'wikibase.getLanguageNameByCode.tests.js'
+ ),
+ 'dependencies' => array(
+ 'wikibase.getLanguageNameByCode'
+ )
+ ),
+
'wikibase.ValueViewBuilder.tests' => $moduleBase + array(
'scripts' => array(
'wikibase.ValueViewBuilder.tests.js'
diff --git a/repo/tests/qunit/wikibase.getLanguageNameByCode.tests.js
b/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
similarity index 100%
rename from repo/tests/qunit/wikibase.getLanguageNameByCode.tests.js
rename to view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
--
To view, visit https://gerrit.wikimedia.org/r/201168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2659cc1a49c32df85026f18a67bab7cc63b6329c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.he...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
