Merge "Update MWLanguageInputWidget to new API"

lib/ve

@@ -1 +1 @@
-Subproject commit b6b80c2712044f04b93c1f7c601c42dc5cc77d47
+Subproject commit 7406d4ba5d90f067e13e0c3b63168ee60656f82f

modules/ve-mw/i18n/en.json

@@ -131,6 +131,7 @@
     "visualeditor-formatdropdown-format-mw-heading4": "Sub-heading 2",
     "visualeditor-formatdropdown-format-mw-heading5": "Sub-heading 3",
     "visualeditor-formatdropdown-format-mw-heading6": "Sub-heading 4",
+    "visualeditor-languageinspector-widget-changelang": "Find language",
     "visualeditor-languages-tool": "Languages",
     "visualeditor-linkinspector-illegal-title": "Invalid page title",
     "visualeditor-linkinspector-suggest-external-link": "External link",

modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js

@@ -128,7 +128,7 @@ ve.ui.MWCategoriesPage.prototype.onUpdateSortKey = function ( item ) {
 /**
  * Bound to MetaList insert event for adding meta dialog components.
  *
- * @param {Object} ve.dm.MetaItem
+ * @param {ve.dm.MetaItem} metaItem
  */
 ve.ui.MWCategoriesPage.prototype.onMetaListInsert = function ( metaItem ) {
 	// Responsible for adding UI components
@@ -143,7 +143,7 @@ ve.ui.MWCategoriesPage.prototype.onMetaListInsert = function ( metaItem ) {
 /**
  * Bound to MetaList insert event for removing meta dialog components.
  *
- * @param {Object} ve.dm.MetaItem
+ * @param {ve.dm.MetaItem} metaItem
  */
 ve.ui.MWCategoriesPage.prototype.onMetaListRemove = function ( metaItem ) {
 	var item;
@@ -183,7 +183,7 @@ ve.ui.MWCategoriesPage.prototype.getCategoryItems = function () {
 /**
  * Gets category item from meta list item
  *
- * @param {Object} ve.dm.MWCategoryMetaItem
+ * @param {ve.dm.MWCategoryMetaItem} metaItem
  * @returns {Object} item
  */
 ve.ui.MWCategoriesPage.prototype.getCategoryItemFromMetaListItem = function ( metaItem ) {

modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js

@@ -123,7 +123,7 @@ ve.ui.MWLanguagesPage.prototype.onAllLanguageItemsSuccess = function ( deferred,
 /**
  * Gets language item from meta list item
  *
- * @param {Object} ve.dm.MWLanguageMetaItem
+ * @param {ve.dm.MWLanguageMetaItem} metaItem
  * @returns {Object} item
  */
 ve.ui.MWLanguagesPage.prototype.getLanguageItemFromMetaListItem = function ( metaItem ) {

modules/ve-mw/ui/styles/ve.ui.MWWidget.css

@@ -5,6 +5,13 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 
+/* ve.ui.MWLanguageInputWidget */
+
+.ve-ui-mwLangugageInputWidget-uls {
+	text-align: center;
+	margin-bottom: 0.5em;
+}
+
 /* ve.ui.MWLinkTargetInputWidget */
 
 .ve-ui-mwLinkTargetInputWidget-menu {

modules/ve-mw/ui/widgets/ve.ui.MWLanguageInputWidget.js

@@ -17,25 +17,8 @@
 ve.ui.MWLanguageInputWidget = function VeUiMWLanguageInputWidget( config ) {
 	// Parent constructor
 	ve.ui.LanguageInputWidget.call( this, config );
-};
 
-/* Inheritance */
-
-OO.inheritClass( ve.ui.MWLanguageInputWidget, ve.ui.LanguageInputWidget );
-
-/* Static properties */
-
-/* Methods */
-
-/**
- * @inheritdoc
- */
-ve.ui.MWLanguageInputWidget.prototype.initialize = function () {
-	// Parent method
-	ve.ui.LanguageInputWidget.prototype.initialize.call( this );
-
-	// Properties
-	this.changeButton = new OO.ui.ButtonWidget( {
+	var changeButton = new OO.ui.ButtonWidget( {
 		'label': ve.msg( 'visualeditor-languageinspector-widget-changelang' ),
 		// Add 'href' so the button returns true on click and triggers ULS
 		'href': '#',
@@ -43,12 +26,9 @@ ve.ui.MWLanguageInputWidget.prototype.initialize = function () {
 	} );
 
 	// Events
-	this.changeButton.$element.uls( {
+	changeButton.$element.uls( {
 		'onSelect': ve.bind( function ( language ) {
-			this.setValue( {
-				'lang': language,
-				'dir': $.uls.data.getDir( language )
-			} );
+			this.setAnnotationFromValues( language, $.uls.data.getDir( language ) );
 		}, this ),
 		'compact': true,
 		// Temporary Quicklist for the Prototype:
@@ -60,5 +40,9 @@ ve.ui.MWLanguageInputWidget.prototype.initialize = function () {
 	// TODO: Consider using getAutonym to display a nicer language name label somewhere
 
 	// Initialization
-	this.$element.append( this.changeButton.$element );
+	this.$element.prepend( $( '<div>' ).addClass( 've-ui-mwLangugageInputWidget-uls' ).append( changeButton.$element ) );
 };
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWLanguageInputWidget, ve.ui.LanguageInputWidget );