diff options
5 files changed, 11 insertions, 17 deletions
diff --git a/resources/src/jquery.spinner/spinner.js b/resources/src/jquery.spinner/spinner.js index 502468867718..5dfbab709476 100644 --- a/resources/src/jquery.spinner/spinner.js +++ b/resources/src/jquery.spinner/spinner.js @@ -61,7 +61,7 @@ createSpinner: function ( opts ) { var $spinner; - if ( opts !== undefined && $.type( opts ) !== 'object' ) { + if ( typeof opts === 'string' ) { opts = { id: opts }; diff --git a/resources/src/mediawiki.Title/Title.js b/resources/src/mediawiki.Title/Title.js index 44baa8b79b1d..def9f68a1f03 100644 --- a/resources/src/mediawiki.Title/Title.js +++ b/resources/src/mediawiki.Title/Title.js @@ -508,7 +508,7 @@ var namespace, m, id, ext, parts; // defaultNamespace is optional; check whether options moves up - if ( arguments.length < 3 && $.type( defaultNamespace ) === 'object' ) { + if ( arguments.length < 3 && typeof defaultNamespace === 'object' ) { options = defaultNamespace; defaultNamespace = undefined; } diff --git a/resources/src/mediawiki.cookie.js b/resources/src/mediawiki.cookie.js index 5923ff8fccbf..76038f6f1138 100644 --- a/resources/src/mediawiki.cookie.js +++ b/resources/src/mediawiki.cookie.js @@ -26,7 +26,7 @@ * @param {string} key * @param {string|null} value Value of cookie. If `value` is `null` then this method will * instead remove a cookie by name of `key`. - * @param {Object|Date} [options] Options object, or expiry date + * @param {Object|Date|number} [options] Options object, or expiry date * @param {Date|number|null} [options.expires] The expiry date of the cookie, or lifetime in seconds. * * If `options.expires` is null, then a session cookie is set. @@ -61,8 +61,8 @@ }; // Options argument can also be a shortcut for the expiry - // Expiry can be a Date or null - if ( $.type( options ) !== 'object' ) { + // Expiry can be a Date, number or null + if ( !options || options instanceof Date || typeof options === 'number' ) { // Also takes care of options = undefined, in which case we also don't need $.extend() defaultOptions.expires = options; options = defaultOptions; diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js index 8f8ef53f50e4..781ad088fe1b 100644 --- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js +++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js @@ -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 } ); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js index 3f3cc2c2e514..4a3215772106 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js @@ -151,15 +151,15 @@ var i; for ( i = 0; i < cases.valid.length; i++ ) { assert.strictEqual( - $.type( mw.Title.newFromText( cases.valid[ i ] ) ), + typeof mw.Title.newFromText( cases.valid[ i ] ), 'object', cases.valid[ i ] ); } for ( i = 0; i < cases.invalid.length; i++ ) { assert.strictEqual( - $.type( mw.Title.newFromText( cases.invalid[ i ] ) ), - 'null', + mw.Title.newFromText( cases.invalid[ i ] ), + null, cases.invalid[ i ] ); } |