Merge "resourceloader: Minor clean up in mw.loader and mw.html"

[lhc/web/wiklou.git] / resources / src / mediawiki.Uri / Uri.js

diff --git a/resources/src/mediawiki.Uri/Uri.js b/resources/src/mediawiki.Uri/Uri.js
index 7467d50..178f169 100644 (file)
--- a/resources/src/mediawiki.Uri/Uri.js
+++ b/resources/src/mediawiki.Uri/Uri.js
@@ -50,7 +50,7 @@
  * @class mw.Uri
  */
 
-( function ( mw, $ ) {
+( function () {
        var parser, properties;
 
        /**
@@ -195,7 +195,7 @@
                                        // Copy data over from existing URI object
                                        for ( prop in uri ) {
                                                // Only copy direct properties, not inherited ones
-                                               if ( uri.hasOwnProperty( prop ) ) {
+                                               if ( Object.prototype.hasOwnProperty.call( uri, prop ) ) {
                                                        // Deep copy object properties
                                                        if ( Array.isArray( uri[ prop ] ) || $.isPlainObject( uri[ prop ] ) ) {
                                                                this[ prop ] = $.extend( true, {}, uri[ prop ] );
@@ -368,6 +368,7 @@
                         */
                        getQueryString: function () {
                                var args = [];
+                               // eslint-disable-next-line no-restricted-properties
                                $.each( this.query, function ( key, val ) {
                                        var k = Uri.encode( key ),
                                                vals = Array.isArray( val ) ? val : [ val ];
@@ -434,4 +435,4 @@
                return location.href;
        } );
 
-}( mediaWiki, jQuery ) );
+}() );