Merge "Fix conflicting configuration name in TitleInputWidget"

diff --git a/includes/widget/TitleInputWidget.php b/includes/widget/TitleInputWidget.php
index 8226148..c262b40 100644 (file)
--- a/includes/widget/TitleInputWidget.php
+++ b/includes/widget/TitleInputWidget.php
@@ -16,7 +16,7 @@ class TitleInputWidget extends \OOUI\TextInputWidget {
        protected $relative = null;
        protected $suggestions = null;
        protected $highlightFirst = null;
-       protected $validate = null;
+       protected $validateTitle = null;
 
        /**
         * @param array $config Configuration options
@@ -26,7 +26,8 @@ class TitleInputWidget extends \OOUI\TextInputWidget {
         * @param bool|null $config['suggestions'] Display search suggestions (default: true)
         * @param bool|null $config['highlightFirst'] Automatically highlight
         *  the first result (default: true)
-        * @param bool|null $config['validate'] Whether the input must be a valid title (default: true)
+        * @param bool|null $config['validateTitle'] Whether the input must
+        *  be a valid title (default: true)
         */
        public function __construct( array $config = array() ) {
                // Parent constructor
@@ -47,8 +48,8 @@ class TitleInputWidget extends \OOUI\TextInputWidget {
                if ( isset( $config['highlightFirst'] ) ) {
                        $this->highlightFirst = $config['highlightFirst'];
                }
-               if ( isset( $config['validate'] ) ) {
-                       $this->validate = $config['validate'];
+               if ( isset( $config['validateTitle'] ) ) {
+                       $this->validateTitle = $config['validateTitle'];
                }
 
                // Initialization
@@ -72,8 +73,8 @@ class TitleInputWidget extends \OOUI\TextInputWidget {
                if ( $this->highlightFirst !== null ) {
                        $config['highlightFirst'] = $this->highlightFirst;
                }
-               if ( $this->validate !== null ) {
-                       $config['validate'] = $this->validate;
+               if ( $this->validateTitle !== null ) {
+                       $config['validateTitle'] = $this->validateTitle;
                }
                return parent::getConfig( $config );
        }

diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 84732aa..abe1228 100644 (file)
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -23,7 +23,7 @@
         * @cfg {boolean} [showRedlink] Show red link to exact match if it doesn't exist
         * @cfg {boolean} [showImages] Show page images
         * @cfg {boolean} [showDescriptions] Show page descriptions
-        * @cfg {boolean} [validate=true] Whether the input must be a valid title
+        * @cfg {boolean} [validateTitle=true] Whether the input must be a valid title
         * @cfg {Object} [cache] Result cache which implements a 'set' method, taking keyed values as an argument
         */
        mw.widgets.TitleWidget = function MwWidgetsTitleWidget( config ) {
@@ -45,7 +45,7 @@
                this.showRedlink = !!config.showRedlink;
                this.showImages = !!config.showImages;
                this.showDescriptions = !!config.showDescriptions;
-               this.validate = config.validate !== undefined ? config.validate : true;
+               this.validateTitle = config.validateTitle !== undefined ? config.validateTitle : true;
                this.cache = config.cache;
 
                // Initialization
@@ -287,7 +287,7 @@
         * @return {boolean} The query is valid
         */
        mw.widgets.TitleWidget.prototype.isQueryValid = function () {
-               return this.validate ? !!this.getTitle() : true;
+               return this.validateTitle ? !!this.getTitle() : true;
        };
 
 }( jQuery, mediaWiki ) );