Merge "auth: Follow up on e907d4328dc3e"

[lhc/web/wiklou.git] / resources / src / mediawiki.widgets / MediaSearch / mw.widgets.APIResultsProvider.js

diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js
index dd07b92..781ad08 100644 (file)
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js
@@ -3,7 +3,7 @@
  *
  * @copyright 2011-2016 VisualEditor Team and others; see http://ve.mit-license.org
  */
-( function ( $, mw ) {
+( function () {
 
        /**
         * API Results Provider object.
@@ -61,16 +61,10 @@
 
                xhr = $.getJSON( this.getAPIurl(), allParams )
                        .done( function ( data ) {
-                               if (
-                                       $.type( data ) !== 'array' ||
-                                       (
-                                               $.type( data ) === 'array' &&
-                                               data.length === 0
-                                       )
-                               ) {
-                                       deferred.resolve();
-                               } else {
+                               if ( Array.isArray( data ) && data.length ) {
                                        deferred.resolve( data );
+                               } else {
+                                       deferred.resolve();
                                }
                        } );
                return deferred.promise( { abort: xhr.abort } );
@@ -226,4 +220,4 @@
        mw.widgets.APIResultsProvider.prototype.setAjaxSettings = function ( settings ) {
                this.ajaxSettings = settings;
        };
-}( jQuery, mediaWiki ) );
+}() );