Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/51646
Change subject: Entity selector: Using user language when in MediaWiki context ...................................................................... Entity selector: Using user language when in MediaWiki context Change-Id: I001bd969c234b520b889f8f9c09fe1b924f0d79b --- M lib/resources/jquery.valueview.views/wikibaseItem.js M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js M repo/resources/wikibase.ui.entitysearch.js 5 files changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/46/51646/1 diff --git a/lib/resources/jquery.valueview.views/wikibaseItem.js b/lib/resources/jquery.valueview.views/wikibaseItem.js index 5e4140b..0d8bdc0 100644 --- a/lib/resources/jquery.valueview.views/wikibaseItem.js +++ b/lib/resources/jquery.valueview.views/wikibaseItem.js @@ -54,8 +54,6 @@ * @private */ _buildInputDom: function() { - var language = mw.config.get( 'wgUserLanguage' ); - return $( '<textarea/>', { 'class': this.widgetBaseClass + '-input', 'type': 'text', @@ -64,8 +62,6 @@ .inputAutoExpand( { expandWidth: false, expandHeight:true, suppressNewLine: true } ) .entityselector( { url: mw.util.wikiScript( 'api' ), - language: language, - type: 'item', selectOnAutocomplete: true } ) .eachchange( function( event, oldValue ) { diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js index 5605044..c7f9ea4 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js @@ -16,7 +16,9 @@ * * @option url {String} URL to retrieve results from. * - * @option language {String} Code of the language results shall be fetched in. + * @option language {String} (optional when in MediaWiki context) Code of the language results shall + * be fetched in. Required if not in MediaWiki context. + * Default value: User language (when in MediaWiki context) * * @option type {String} (optional) Entity type that will be queried for results. * Default value: 'item' @@ -101,7 +103,7 @@ */ options: { url: null, - language: null, + language: ( IS_MW_CONTEXT ) ? mw.config.get( 'wgUserLanguage' ) : null, type: 'item', limit: null, selectOnAutocomplete: false, diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js index 0e2eb04..4517318 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js @@ -181,12 +181,10 @@ * @return {jQuery} */ _buildPropertySelector: function() { - var self = this, - language = mw.config.get( 'wgUserLanguage' ); + var self = this; return $( '<input/>' ).entityselector( { url: mw.util.wikiScript( 'api' ), - language: language, type: 'property' } ) .prop( 'placeholder', mw.msg( 'wikibase-snakview-property-input-placeholder' ) ) @@ -218,7 +216,8 @@ entity = response.entities[ entityId ], dataTypeId = entity.datatype, dataType = dt.getDataType( dataTypeId ), - label; + label, + language = mw.config.get( 'wgUserLanguage' ); if( entity.labels && entity.labels[ language ] ) { label = entity.labels[ language ].value; diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js index 55e9900..2064ac0 100644 --- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js +++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js @@ -19,8 +19,7 @@ */ var newTestEntitySelector = function( customOptions ) { var options = { - url: 'url', - language: 'language' + url: 'url' }; if ( options ) { $.extend( options, customOptions ); diff --git a/repo/resources/wikibase.ui.entitysearch.js b/repo/resources/wikibase.ui.entitysearch.js index 702f662..e4c0db3 100644 --- a/repo/resources/wikibase.ui.entitysearch.js +++ b/repo/resources/wikibase.ui.entitysearch.js @@ -41,8 +41,7 @@ } } ) .entityselector( { - url: mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/api.php', - language: mw.config.get( 'wgUserLanguage' ) + url: mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/api.php' } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/51646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I001bd969c234b520b889f8f9c09fe1b924f0d79b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits