From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Wed, 22 Jul 2015 00:01:16 +0000 (+0200)
Subject: widgets: Code quality and cleanup pass
X-Git-Tag: 1.31.0-rc.0~10684^2~1
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=f0f90ef4d00545ef0bae5e6f6e500b4944cc2148;p=lhc%2Fweb%2Fwiklou.git

widgets: Code quality and cleanup pass

Fixing typos, enforcing coding conventions from OOUI,
renaming parameters, formatting code.

Change-Id: I92dc28c8ac3d6c00e40ad48d76730deb29edefec
---

diff --git a/includes/widget/NamespaceInputWidget.php b/includes/widget/NamespaceInputWidget.php
index 69427c502e..2d69ed7c31 100644
--- a/includes/widget/NamespaceInputWidget.php
+++ b/includes/widget/NamespaceInputWidget.php
@@ -40,7 +40,6 @@ class NamespaceInputWidget extends \OOUI\Widget {
 	 */
 	public function __construct( array $config = array() ) {
 		// Configuration initialization
-
 		$config = array_merge(
 			array(
 				'nameNamespace' => 'namespace',
diff --git a/includes/widget/TitleInputWidget.php b/includes/widget/TitleInputWidget.php
index 37c9d9c4b9..d3e2851982 100644
--- a/includes/widget/TitleInputWidget.php
+++ b/includes/widget/TitleInputWidget.php
@@ -7,12 +7,10 @@
  */
 namespace MediaWiki\Widget;
 
-use OOUI\TextInputWidget;
-
 /**
  * Title input widget.
  */
-class TitleInputWidget extends TextInputWidget {
+class TitleInputWidget extends \OOUI\TextInputWidget {
 
 	protected $namespace = null;
 	protected $relative = null;
diff --git a/includes/widget/UserInputWidget.php b/includes/widget/UserInputWidget.php
index 4147fca525..e5663c31d7 100644
--- a/includes/widget/UserInputWidget.php
+++ b/includes/widget/UserInputWidget.php
@@ -1,18 +1,17 @@
 <?php
 /**
- * MediaWiki Widgets – UserInputWidget class.
+ * MediaWiki Widgets – UserInputWidget class.
  *
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
 namespace MediaWiki\Widget;
 
-use OOUI\TextInputWidget;
-
 /**
  * User input widget.
  */
-class UserInputWidget extends TextInputWidget {
+class UserInputWidget extends \OOUI\TextInputWidget {
+
 	/**
 	 * @param array $config Configuration options
 	 */
diff --git a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
index 0558c322cc..05e6f27110 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
@@ -25,7 +25,7 @@
 	 */
 	mw.widgets.NamespaceInputWidget = function MwWidgetsNamespaceInputWidget( config ) {
 		// Parent constructor
-		OO.ui.Widget.call( this, config );
+		mw.widgets.NamespaceInputWidget.parent.call( this, config );
 
 		// Properties
 		this.namespace = config.namespace;
@@ -34,20 +34,20 @@
 		this.allValue = config.allValue;
 
 		// Events
-		config.namespace.connect( this, { change: 'updateCheckboxesState' } );
+		this.namespace.connect( this, { change: 'updateCheckboxesState' } );
 
 		// Initialization
 		this.$element
 			.addClass( 'mw-widget-namespaceInputWidget' )
 			.append(
-				config.namespace.$element,
-				config.invert ? config.invert.$element : '',
-				config.associated ? config.associated.$element : ''
+				this.namespace.$element,
+				this.invert ? this.invert.$element : '',
+				this.associated ? this.associated.$element : ''
 			);
 		this.updateCheckboxesState();
 	};
 
-	/* Inheritance */
+	/* Setup */
 
 	OO.inheritClass( mw.widgets.NamespaceInputWidget, OO.ui.Widget );
 
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index e7153613f4..bee5920375 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
@@ -5,6 +5,7 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 ( function ( $, mw ) {
+
 	/**
 	 * Creates an mw.widgets.TitleInputWidget object.
 	 *
@@ -30,7 +31,7 @@
 		config = config || {};
 
 		// Parent constructor
-		OO.ui.TextInputWidget.call( this, $.extend( {}, config, { autocomplete: false } ) );
+		mw.widgets.TitleInputWidget.parent.call( this, $.extend( {}, config, { autocomplete: false } ) );
 
 		// Mixin constructors
 		OO.ui.mixin.LookupElement.call( this, config );
@@ -67,10 +68,9 @@
 		} );
 	};
 
-	/* Inheritance */
+	/* Setup */
 
 	OO.inheritClass( mw.widgets.TitleInputWidget, OO.ui.TextInputWidget );
-
 	OO.mixinClass( mw.widgets.TitleInputWidget, OO.ui.mixin.LookupElement );
 
 	/* Methods */
@@ -95,7 +95,7 @@
 		this.setLookupsDisabled( true );
 
 		// Parent method
-		retval = OO.ui.TextInputWidget.prototype.focus.apply( this, arguments );
+		retval = mw.widgets.TitleInputWidget.parent.prototype.focus.apply( this, arguments );
 
 		this.setLookupsDisabled( false );
 
@@ -164,10 +164,10 @@
 	 * Get lookup cache item from server response data.
 	 *
 	 * @method
-	 * @param {Mixed} data Response from server
+	 * @param {Mixed} response Response from server
 	 */
-	mw.widgets.TitleInputWidget.prototype.getLookupCacheDataFromResponse = function ( data ) {
-		return data.query || {};
+	mw.widgets.TitleInputWidget.prototype.getLookupCacheDataFromResponse = function ( response ) {
+		return response.query || {};
 	};
 
 	/**
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
index 6623aa789d..ec0c935747 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
@@ -45,9 +45,9 @@
 		}, config );
 
 		// Parent constructor
-		OO.ui.MenuOptionWidget.call( this, config );
+		mw.widgets.TitleOptionWidget.parent.call( this, config );
 
-		// Intialization
+		// Initialization
 		this.$label.wrap( '<a>' );
 		this.$link = this.$label.parent();
 		this.$link.attr( 'href', config.href );
@@ -75,7 +75,7 @@
 		}
 	};
 
-	/* Inheritance */
+	/* Setup */
 
 	OO.inheritClass( mw.widgets.TitleOptionWidget, OO.ui.MenuOptionWidget );
 
diff --git a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
index 903660af0d..d540877a0b 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
@@ -5,6 +5,7 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 ( function ( $, mw ) {
+
 	/**
 	 * Creates a mw.widgets.UserInputWidget object.
 	 *
@@ -21,7 +22,7 @@
 		config = config || {};
 
 		// Parent constructor
-		OO.ui.TextInputWidget.call( this, $.extend( {}, config, { autocomplete: false } ) );
+		mw.widgets.UserInputWidget.parent.call( this, $.extend( {}, config, { autocomplete: false } ) );
 
 		// Mixin constructors
 		OO.ui.mixin.LookupElement.call( this, config );
@@ -34,10 +35,9 @@
 		this.lookupMenu.$element.addClass( 'mw-widget-userInputWidget-menu' );
 	};
 
-	/* Inheritance */
+	/* Setup */
 
 	OO.inheritClass( mw.widgets.UserInputWidget, OO.ui.TextInputWidget );
-
 	OO.mixinClass( mw.widgets.UserInputWidget, OO.ui.mixin.LookupElement );
 
 	/* Methods */
@@ -62,7 +62,7 @@
 		this.setLookupsDisabled( true );
 
 		// Parent method
-		retval = OO.ui.TextInputWidget.prototype.focus.apply( this, arguments );
+		retval = mw.widgets.UserInputWidget.parent.prototype.focus.apply( this, arguments );
 
 		this.setLookupsDisabled( false );
 
@@ -89,10 +89,10 @@
 	 * Get lookup cache item from server response data.
 	 *
 	 * @method
-	 * @param {Mixed} data Response from server
+	 * @param {Mixed} response Response from server
 	 */
-	mw.widgets.UserInputWidget.prototype.getLookupCacheDataFromResponse = function ( data ) {
-		return data.query || {};
+	mw.widgets.UserInputWidget.prototype.getLookupCacheDataFromResponse = function ( response ) {
+		return response.query.allusers || {};
 	};
 
 	/**
@@ -103,11 +103,10 @@
 	 */
 	mw.widgets.UserInputWidget.prototype.getLookupMenuOptionsFromData = function ( data ) {
 		var len, i, user,
-			users = data.allusers,
 			items = [];
 
-		for ( i = 0, len = users.length; i < len; i++ ) {
-			user = users[i] || {};
+		for ( i = 0, len = data.length; i < len; i++ ) {
+			user = data[i] || {};
 			items.push( new OO.ui.MenuOptionWidget( {
 				label: user.name,
 				data: user.name