Merge "TitleInputWidget: Override getJavaScriptClassName and remove infuse hack"

diff --git a/includes/widget/TitleInputWidget.php b/includes/widget/TitleInputWidget.php
index 7ddc67a..bbab699 100644 (file)
--- a/includes/widget/TitleInputWidget.php
+++ b/includes/widget/TitleInputWidget.php
@@ -39,6 +39,10 @@ class TitleInputWidget extends TextInputWidget {
                $this->addClasses( array( 'mw-widget-TitleInputWidget' ) );
        }
 
+       protected function getJavaScriptClassName() {
+               return 'mw.widgets.TitleInputWidget';
+       }
+
        public function getConfig( &$config ) {
                if ( $this->namespace !== null ) {
                        $config['namespace'] = $this->namespace;

diff --git a/resources/Resources.php b/resources/Resources.php
index 19c2878..3217503 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1748,7 +1748,6 @@ return array(
                        'resources/src/mediawiki.widgets/mw.widgets.js',
                        'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',
-                       'resources/src/mediawiki.widgets/mw.widgets.infuse.js',
                ),
                'skinStyles' => array(
                        'default' => 'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css',

diff --git a/resources/src/mediawiki.widgets/mw.widgets.infuse.js b/resources/src/mediawiki.widgets/mw.widgets.infuse.js
deleted file mode 100644 (file)
index 98480bb..0000000
--- a/resources/src/mediawiki.widgets/mw.widgets.infuse.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// HACK: OO.ui.infuse assumes all widgets are in the OO.ui. namespace.
-// Make it so until this is fixed. (T104989)
-jQuery.extend( OO.ui, mediaWiki.widgets );