Merge "SearchInputWidget: Actually connect to change event"

diff --combined resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 40c0a1d,194f714..c25ab45
--- 1/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
--- 2/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@@ -33,7 -33,8 +33,7 @@@
                        icon: 'search',
                        maxLength: undefined,
                        performSearchOnClick: true,
 -                      dataLocation: 'header',
 -                      namespace: 0
 +                      dataLocation: 'header'
                }, config );
  
                // Parent constructor
@@@ -66,6 -67,10 +66,10 @@@
                        } );
                }.bind( this ) );
  
+               this.connect( this, {
+                       change: 'onChange'
+               } );
+ 
                this.$element.addClass( 'oo-ui-textInputWidget-type-search' );
                this.updateSearchIndicator();
                this.connect( this, {
@@@ -116,7 -121,6 +120,6 @@@
         * @see OO.ui.SearchInputWidget#onChange
         */
        mw.widgets.SearchInputWidget.prototype.onChange = function () {
-               mw.widgets.SearchInputWidget.parent.prototype.onChange.call( this );
                this.updateSearchIndicator();
        };
  
@@@ -183,12 -187,9 +186,12 @@@
         */
        mw.widgets.SearchInputWidget.prototype.getOptionsFromData = function ( data ) {
                var items = [],
 +                      titles = data.data[ 1 ],
 +                      descriptions = data.data[ 2 ],
 +                      urls = data.data[ 3 ],
                        self = this;
  
 -              $.each( data.data[ 1 ], function ( i, result ) {
 +              $.each( titles, function ( i, result ) {
                        items.push( new mw.widgets.TitleOptionWidget(
                                self.getOptionWidgetData(
                                        result,
@@@ -196,9 -197,10 +199,9 @@@
                                        // the parent's API query.
                                        {
                                                data: result,
 -                                              // data[ 3 ][ i ] is the link for this result
 -                                              url: data.data[ 3 ][ i ],
 -                                              imageUrl: null,
 -                                              description: null,
 +                                              url: urls[ i ],
 +                                              imageUrl: null, // The JSON 'opensearch' API doesn't have images
 +                                              description: descriptions[ i ],
                                                missing: false,
                                                redirect: false,
                                                disambiguation: false