Merge "resourceloader: Remove obsolete aliases from closure"

diff --git a/.eslintrc.json b/.eslintrc.json
index fbf2a5a..f7a79ac 100644 (file)
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,13 +1,15 @@
 {
        "extends": "wikimedia",
        "env": {
-               "browser": true,
-               "jquery": true
+               "browser": true
        },
        "globals": {
                "require": false,
                "module": false,
+               "mw": false,
+               "$": false,
                "mediaWiki": false,
+               "jQuery": false,
                "OO": false
        },
        "rules": {

diff --git a/resources/src/mediawiki.base/mediawiki.base.js b/resources/src/mediawiki.base/mediawiki.base.js
index 284b21a..16994f5 100644 (file)
--- a/resources/src/mediawiki.base/mediawiki.base.js
+++ b/resources/src/mediawiki.base/mediawiki.base.js
@@ -14,7 +14,6 @@
  *   "mediawiki" module, and will remain a default/implicit dependency for all
  *   regular modules, just like jquery and wikibits already are.
  */
-/* globals mw */
 ( function () {
        'use strict';
 

diff --git a/resources/src/mediawiki.base/mediawiki.errorLogger.js b/resources/src/mediawiki.base/mediawiki.errorLogger.js
index e86aff6..d1fbff0 100644 (file)
--- a/resources/src/mediawiki.base/mediawiki.errorLogger.js
+++ b/resources/src/mediawiki.base/mediawiki.errorLogger.js
@@ -4,7 +4,7 @@
  * @class mw.errorLogger
  * @singleton
  */
-( function ( mw ) {
+( function () {
        'use strict';
 
        mw.errorLogger = {
@@ -55,4 +55,4 @@
        };
 
        mw.errorLogger.installGlobalHandler( window );
-}( mediaWiki ) );
+}() );

diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js
index e665403..54e4588 100644 (file)
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@ -1,7 +1,7 @@
 /**
  * Base library for MediaWiki.
  *
- * Exposed globally as `mediaWiki` with `mw` as shortcut.
+ * Exposed globally as `mw`, with `mediaWiki` as alias.
  *
  * @class mw
  * @alternateClassName mediaWiki

diff --git a/resources/src/startup/mediawiki.log.js b/resources/src/startup/mediawiki.log.js
index a3f3c68..af59c7f 100644 (file)
--- a/resources/src/startup/mediawiki.log.js
+++ b/resources/src/startup/mediawiki.log.js
@@ -6,7 +6,7 @@
  * @author Michael Dale <mdale@wikimedia.org>
  * @author Trevor Parscal <tparscal@wikimedia.org>
  */
-( function ( mw ) {
+( function () {
        /* global console */
        /* eslint-disable no-console */
        var original = mw.log;
@@ -22,4 +22,4 @@
                mw.log.error = original.error;
                mw.log.deprecate = original.deprecate;
        }
-}( mediaWiki ) );
+}() );

diff --git a/resources/src/startup/mediawiki.requestIdleCallback.js b/resources/src/startup/mediawiki.requestIdleCallback.js
index 650092b..9f8c598 100644 (file)
--- a/resources/src/startup/mediawiki.requestIdleCallback.js
+++ b/resources/src/startup/mediawiki.requestIdleCallback.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
        var maxBusy = 50;
 
        mw.requestIdleCallbackInternal = function ( callback ) {
@@ -49,4 +49,4 @@
        // Note: Polyfill was previously disabled due to
        // https://bugs.chromium.org/p/chromium/issues/detail?id=647870
        // See also <http://codepen.io/Krinkle/full/XNGEvv>
-}( mediaWiki ) );
+}() );

diff --git a/resources/src/startup/profiler.js b/resources/src/startup/profiler.js
index 5e9b6ab..588750c 100644 (file)
--- a/resources/src/startup/profiler.js
+++ b/resources/src/startup/profiler.js
@@ -4,7 +4,6 @@
  * @author Timo Tijhof
  * @since 1.32
  */
-/* global mw */
 ( function () {
        'use strict';
 

diff --git a/resources/src/startup/startup.js b/resources/src/startup/startup.js
index 03141b9..8c79c94 100644 (file)
--- a/resources/src/startup/startup.js
+++ b/resources/src/startup/startup.js
@@ -4,7 +4,7 @@
  * - Beware: This file MUST parse without errors on even the most ancient of browsers!
  */
 /* eslint-disable vars-on-top, no-unmodified-loop-condition */
-/* global mw, isCompatible, $VARS, $CODE */
+/* global isCompatible, $VARS, $CODE */
 
 /**
  * See <https://www.mediawiki.org/wiki/Compatibility#Browsers>