jenkins-bot has submitted this change and it was merged.
Change subject: Pass a MessageProvider to ValueView instead of mw
......................................................................
Pass a MessageProvider to ValueView instead of mw
Change-Id: I8649706cffdd3c33fcc24fe0267902e52bf413f0
---
M composer.json
M repo/resources/wikibase.ValueViewBuilder.js
M repo/resources/wikibase.ui.entityViewInit.js
M repo/tests/qunit/wikibase.ValueViewBuilder.tests.js
4 files changed, 14 insertions(+), 21 deletions(-)
Approvals:
Henning Snater: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index ddc8aff..296bf2e 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
"data-values/data-types": "~0.4.0",
"data-values/serialization": "~1.0",
"data-values/javascript": "~0.6.0",
- "data-values/value-view": "~0.12.0",
+ "data-values/value-view": "~0.13.0",
"wikibase/data-model": "~2.5",
"wikibase/data-model-javascript": "~1.0",
diff --git a/repo/resources/wikibase.ValueViewBuilder.js
b/repo/resources/wikibase.ValueViewBuilder.js
index 173342c..6deb800 100644
--- a/repo/resources/wikibase.ValueViewBuilder.js
+++ b/repo/resources/wikibase.ValueViewBuilder.js
@@ -12,21 +12,20 @@
* @param {valueFormatters.ValueFormatterStore} formatterStore
* @param {valueParsers.ValueParserStore} parserStore
* @param {string} language
- * @param {Object} mediaWiki
+ * @param {util.MessageProvider} messageProvider
* @param {util.ContentLanguages} contentLanguages
*/
var SELF = wb.ValueViewBuilder = function(
- expertStore, formatterStore, parserStore, language, mediaWiki,
contentLanguages
+ expertStore, formatterStore, parserStore, language,
messageProvider, contentLanguages
) {
this._baseOptions = {
expertStore: expertStore,
formatterStore: formatterStore,
parserStore: parserStore,
language: language,
+ messageProvider: messageProvider,
contentLanguages: contentLanguages
};
-
- this._mw = mediaWiki;
};
$.extend( SELF.prototype, {
@@ -34,11 +33,6 @@
* @type {Object}
*/
_baseOptions: null,
-
- /**
- * @type {Object}
- */
- _mw: null,
/**
* @param {jQuery} $valueViewDom
@@ -55,10 +49,6 @@
// initializing this over and over again and doing the
checks.
$valueViewDom.valueview( valueViewOptions );
valueView = $valueViewDom.data( 'valueview' );
-
- // Setting this option must be delayed, otherwise the
deep copy call
- // $.extend( true, ... ) in _createWidget() will clone
the full mw object.
- valueView.option( { mediaWiki: this._mw } );
return valueView;
},
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 3489311..3c8d837 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -161,7 +161,11 @@
getFormatterStore( repoApi, dataTypeStore ),
getParserStore( repoApi ),
mw.config.get( 'wgUserLanguage' ),
- mw,
+ {
+ getMessage: function( key, params ) {
+ return mw.msg.apply( mw, [ key
].concat( params ) );
+ }
+ },
contentLanguages
),
dataTypeStore: dataTypeStore
diff --git a/repo/tests/qunit/wikibase.ValueViewBuilder.tests.js
b/repo/tests/qunit/wikibase.ValueViewBuilder.tests.js
index 876b546..1ca2266 100644
--- a/repo/tests/qunit/wikibase.ValueViewBuilder.tests.js
+++ b/repo/tests/qunit/wikibase.ValueViewBuilder.tests.js
@@ -62,24 +62,23 @@
} ) );
} );
- QUnit.test( 'initValueView passes mw', function( assert ) {
+ QUnit.test( 'initValueView passes messageProvider', function( assert ) {
var vvAndDom = getValueViewAndDom(),
- valueView = vvAndDom.vv,
$dom = vvAndDom.$dom,
- mw = {};
+ messageProvider = {};
var valueViewBuilder = new wb.ValueViewBuilder(
null,
null,
null,
null,
- mw
+ messageProvider
);
valueViewBuilder.initValueView( $dom );
- sinon.assert.calledWith( valueView.option, sinon.match( {
- mediaWiki: mw
+ sinon.assert.calledWith( $dom.valueview, sinon.match( {
+ messageProvider: messageProvider
} ) );
} );
--
To view, visit https://gerrit.wikimedia.org/r/188355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8649706cffdd3c33fcc24fe0267902e52bf413f0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Henning Snater <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
