Tobias Gritschacher has submitted this change and it was merged.
Change subject: Revert of I4873abce509e391cbe3104883965c91dd0b592d1 and correct
valueview dependencies
......................................................................
Revert of I4873abce509e391cbe3104883965c91dd0b592d1 and correct valueview
dependencies
The dependencies introduced in I4873abce509e391cbe3104883965c91dd0b592d1
include wikibase specific
code as dependencies which would leave us with twisted dependencies.
Also, the "jquery.valueview.valueview" module is supposed to only load the
basic widget, not
specific valueview expert implementations. Specific experts should be required
by demand. Not all
application do necessarily require to be able to represent all DataValues with
an expert registered
for.
Change-Id: Ie112d030e582123151ba69b2beb6936c836ecf11
---
M ValueView/ValueView.resources.php
1 file changed, 16 insertions(+), 8 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/ValueView/ValueView.resources.php
b/ValueView/ValueView.resources.php
index 2fee09f..afab9e2 100644
--- a/ValueView/ValueView.resources.php
+++ b/ValueView/ValueView.resources.php
@@ -82,9 +82,9 @@
'jquery.valueview.experts', // because vv deals
with ExpertFactory
'jquery.valueview.experts.unsupportedvalue', //
for displaying unsupported values
'jquery.valueview.experts.emptyvalue', // for
displaying empty values
- 'jquery.valueview.experts.stringvalue',
- 'jquery.valueview.experts.entityidvalue',
- 'jquery.valueview.experts.commonsmediatype',
+ // NOTE: don't add further experts here unless
they are required by the valueview
+ // widget directly. All experts are supposed to be
loaded separately, by demand and
+ // by the controller requiring them.
),
),
@@ -101,6 +101,15 @@
'dataValues.values',
'dataTypes',
'valueParsers.parsers',
+ ),
+ ),
+
+ 'jquery.valueview.BifidExpert' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'jquery.valueview/valueview.BifidExpert.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.valueview.experts',
),
),
@@ -136,13 +145,12 @@
)
),
- 'jquery.valueview.experts.entityidvalue' => $moduleTemplate +
array(
+ 'jquery.valueview.experts.staticdom' => $moduleTemplate + array(
'scripts' => array(
- 'jquery.valueview/valueview.BifidExpert.js', //
todo: define separate modules
'jquery.valueview/valueview.experts/experts.StaticDom.js',
),
'dependencies' => array(
- 'jquery.valueview.experts.stringvalue',
+ 'jquery.valueview.experts',
),
),
@@ -159,12 +167,12 @@
'jquery.valueview.experts.commonsmediatype' => $moduleTemplate
+ array(
'scripts' => array(
- 'jquery.valueview/valueview.BifidExpert.js', //
todo: define separate modules
-
'jquery.valueview/valueview.experts/experts.StaticDom.js',
'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',
),
--
To view, visit https://gerrit.wikimedia.org/r/60296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie112d030e582123151ba69b2beb6936c836ecf11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
