jenkins-bot has submitted this change and it was merged.
Change subject: Move jquery.valueview.experts.commonsmediatype to mediawiki
resources, define dependency
......................................................................
Move jquery.valueview.experts.commonsmediatype to mediawiki resources, define
dependency
On test.wikidata, it's not finding mediawiki.util.wikiUrlencode with
resource loader. Works in debug mode.
this expert 1) depends on mediawiki 2) try to explicitly define
the dependency, even though mediawiki.util is always loaded...
maybe just not in the correct order now.
Change-Id: I93f1cb373aae1cbd4079916780223c0d5f446c05
---
M ValueView/ValueView.resources.mw.php
M ValueView/ValueView.resources.php
2 files changed, 14 insertions(+), 13 deletions(-)
Approvals:
Henning Snater: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ValueView/ValueView.resources.mw.php
b/ValueView/ValueView.resources.mw.php
index 472f641..0cf1aa1 100644
--- a/ValueView/ValueView.resources.mw.php
+++ b/ValueView/ValueView.resources.mw.php
@@ -37,6 +37,20 @@
),
),
+ 'jquery.valueview.experts.commonsmediatype' => $moduleTemplate
+ array(
+ 'scripts' => array(
+
'jquery.valueview/valueview.experts/experts.SuggestedStringValue.js',
+
'jquery.valueview/valueview.experts/experts.CommonsMediaType.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.valueview.experts.staticdom',
+ 'jquery.valueview.BifidExpert',
+ 'jquery.valueview.experts.stringvalue',
+ 'jquery.ui.suggester',
+ 'mediawiki.util'
+ ),
+ ),
+
// Dependencies required by jQuery.valueview library:
'jquery.PurposedCallbacks' => $moduleTemplate + array(
'scripts' => array(
diff --git a/ValueView/ValueView.resources.php
b/ValueView/ValueView.resources.php
index 86a0a47..552e608 100644
--- a/ValueView/ValueView.resources.php
+++ b/ValueView/ValueView.resources.php
@@ -269,19 +269,6 @@
),
),
- 'jquery.valueview.experts.commonsmediatype' => $moduleTemplate
+ array(
- 'scripts' => array(
-
'jquery.valueview/valueview.experts/experts.SuggestedStringValue.js',
-
'jquery.valueview/valueview.experts/experts.CommonsMediaType.js',
- ),
- 'dependencies' => array(
- 'jquery.valueview.experts.staticdom',
- 'jquery.valueview.BifidExpert',
- 'jquery.valueview.experts.stringvalue',
- 'jquery.ui.suggester',
- ),
- ),
-
'jquery.valueview.experts.urltype' => $moduleTemplate + array(
'scripts' => array(
'jquery.valueview/valueview.experts/experts.UrlType.js',
--
To view, visit https://gerrit.wikimedia.org/r/99582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93f1cb373aae1cbd4079916780223c0d5f446c05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Lydia Pintscher <lydia.pintsc...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
