Merge "resourceloader: Configure eslint to disallow $ and require inside startup"

diff --git a/resources/src/startup/.eslintrc.json b/resources/src/startup/.eslintrc.json
new file mode 100644 (file)
index 0000000..c085e60
--- /dev/null
+++ b/resources/src/startup/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+       "root": true,
+       "extends": "wikimedia",
+       "env": {
+               "browser": true
+       },
+       "rules": {
+               "max-len": 0
+       }
+}

diff --git a/resources/src/startup/mediawiki.log.js b/resources/src/startup/mediawiki.log.js
index af59c7f..9283b16 100644 (file)
--- a/resources/src/startup/mediawiki.log.js
+++ b/resources/src/startup/mediawiki.log.js
@@ -7,7 +7,7 @@
  * @author Trevor Parscal <tparscal@wikimedia.org>
  */
 ( function () {
-       /* global console */
+       /* global console, mw */
        /* eslint-disable no-console */
        var original = mw.log;
 

diff --git a/resources/src/startup/mediawiki.requestIdleCallback.js b/resources/src/startup/mediawiki.requestIdleCallback.js
index 9f8c598..afb4737 100644 (file)
--- a/resources/src/startup/mediawiki.requestIdleCallback.js
+++ b/resources/src/startup/mediawiki.requestIdleCallback.js
@@ -1,3 +1,4 @@
+/* global mw */
 ( function () {
        var maxBusy = 50;
 
@@ -44,7 +45,8 @@
         *  by that time.
         */
        mw.requestIdleCallback = window.requestIdleCallback ?
-               window.requestIdleCallback.bind( window ) : // Bind because it throws TypeError if context is not window
+               // Bind because it throws TypeError if context is not window
+               window.requestIdleCallback.bind( window ) :
                mw.requestIdleCallbackInternal;
        // Note: Polyfill was previously disabled due to
        // https://bugs.chromium.org/p/chromium/issues/detail?id=647870

diff --git a/resources/src/startup/profiler.js b/resources/src/startup/profiler.js
index 588750c..5e9b6ab 100644 (file)
--- a/resources/src/startup/profiler.js
+++ b/resources/src/startup/profiler.js
@@ -4,6 +4,7 @@
  * @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 8e75535..5483ad2 100644 (file)
--- a/resources/src/startup/startup.js
+++ b/resources/src/startup/startup.js
@@ -110,6 +110,7 @@ if ( !isCompatible() ) {
         * The $CODE and $VARS placeholders are substituted in ResourceLoaderStartUpModule.php.
         */
        ( function () {
+               /* global mw */
                mw.config = new mw.Map( $VARS.wgLegacyJavaScriptGlobals );
 
                $CODE.registrations();