diff --git a/.eslintrc.json b/.eslintrc.json index a4396f288..19cd003bd 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -11,8 +11,8 @@ "rules": { "max-len": "off", "max-statements-per-line": "off", - "jquery/no-noop": "off", - "jquery/no-now": "off", - "jquery/no-support": "off" + "no-jquery/no-noop": "off", + "no-jquery/no-now": "off", + "no-jquery/no-support": "off" } } diff --git a/package.json b/package.json index 4d3febcef..75448e62a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "doc": "jsduck" }, "devDependencies": { - "eslint-config-wikimedia": "0.10.1", + "eslint-config-wikimedia": "0.11.0", "grunt": "1.0.3", "grunt-banana-checker": "0.7.0", "grunt-eslint": "21.0.0", diff --git a/resources/mmv/logging/mmv.logging.PerformanceLogger.js b/resources/mmv/logging/mmv.logging.PerformanceLogger.js index 202dde156..fc03c57db 100644 --- a/resources/mmv/logging/mmv.logging.PerformanceLogger.js +++ b/resources/mmv/logging/mmv.logging.PerformanceLogger.js @@ -206,7 +206,7 @@ stats.XCache = xcache; varnishXCache = this.parseVarnishXCacheHeader( xcache ); - // eslint-disable-next-line jquery/no-each-util + // eslint-disable-next-line no-jquery/no-each-util $.each( varnishXCache, function ( key, value ) { stats[ key ] = value; } ); diff --git a/resources/mmv/mmv.lightboxinterface.js b/resources/mmv/mmv.lightboxinterface.js index df11999be..49d836bc3 100644 --- a/resources/mmv/mmv.lightboxinterface.js +++ b/resources/mmv/mmv.lightboxinterface.js @@ -62,7 +62,7 @@ */ LIP.init = function () { // SVG filter, needed to achieve blur in Firefox - // eslint-disable-next-line jquery/no-parse-html-literal + // eslint-disable-next-line no-jquery/no-parse-html-literal this.$filter = $( '' ); this.$wrapper = $( '
' ) diff --git a/resources/mmv/provider/mmv.provider.Api.js b/resources/mmv/provider/mmv.provider.Api.js index 02dca689e..e6d6524dd 100644 --- a/resources/mmv/provider/mmv.provider.Api.js +++ b/resources/mmv/provider/mmv.provider.Api.js @@ -176,7 +176,7 @@ // pages is an associative array indexed by pageid, // we need to iterate through to find the right page - // eslint-disable-next-line jquery/no-each-util + // eslint-disable-next-line no-jquery/no-each-util $.each( data.query.pages, function ( id, page ) { if ( page.title === pageName ) { pageData = page; diff --git a/resources/mmv/ui/mmv.ui.canvas.js b/resources/mmv/ui/mmv.ui.canvas.js index c155e346a..e6b2c6770 100644 --- a/resources/mmv/ui/mmv.ui.canvas.js +++ b/resources/mmv/ui/mmv.ui.canvas.js @@ -316,7 +316,7 @@ // The blurred class has an opacity < 1. This animated the image to become fully opaque // FIXME: Use CSS transition - // eslint-disable-next-line jquery/no-animate + // eslint-disable-next-line no-jquery/no-animate this.$image .addClass( 'blurred' ) .animate( { opacity: 1.0 }, animationLength ); @@ -324,7 +324,7 @@ // During the same amount of time (animationLength) we animate a blur value from 3.0 to 0.0 // We pass that value to an inline CSS Gaussian blur effect // FIXME: Use CSS transition - // eslint-disable-next-line jquery/no-animate + // eslint-disable-next-line no-jquery/no-animate $( { blur: 3.0 } ).animate( { blur: 0.0 }, { duration: animationLength, step: function ( step ) { @@ -407,7 +407,7 @@ */ C.getDimensions = function ( forFullscreen ) { var $window = $( window ), - // eslint-disable-next-line jquery/no-global-selector + // eslint-disable-next-line no-jquery/no-global-selector $aboveFold = $( '.mw-mmv-above-fold' ), isFullscreened = !!$aboveFold.closest( '.jq-fullscreened' ).length, // Don't rely on this.$imageWrapper's sizing because it's fragile. diff --git a/resources/mmv/ui/mmv.ui.canvasButtons.js b/resources/mmv/ui/mmv.ui.canvasButtons.js index c92437ddd..7c85ed9c0 100644 --- a/resources/mmv/ui/mmv.ui.canvasButtons.js +++ b/resources/mmv/ui/mmv.ui.canvasButtons.js @@ -150,7 +150,7 @@ // We don't use animation chaining because delay() can't be stop()ed this.buttonsFadeTimeout = setTimeout( function () { // FIXME: Use CSS transition - // eslint-disable-next-line jquery/no-animate + // eslint-disable-next-line no-jquery/no-animate buttons.$buttons.not( '.disabled' ).animate( { opacity: 0 }, 1000, 'swing', function () { buttons.$buttons.addClass( 'hidden' ); diff --git a/resources/mmv/ui/mmv.ui.metadataPanelScroller.js b/resources/mmv/ui/mmv.ui.metadataPanelScroller.js index 4d04cdfd3..ba90e9007 100644 --- a/resources/mmv/ui/mmv.ui.metadataPanelScroller.js +++ b/resources/mmv/ui/mmv.ui.metadataPanelScroller.js @@ -189,7 +189,7 @@ this.$container.trigger( 'mmv-metadata-reveal-truncated-text' ); scrollTopTarget = this.getScrollTopWhenOpen(); } - // eslint-disable-next-line jquery/no-global-selector, jquery/no-animate + // eslint-disable-next-line no-jquery/no-global-selector return $( 'html, body' ).animate( { scrollTop: scrollTopTarget }, 'fast' ).promise(); } }; diff --git a/resources/mmv/ui/mmv.ui.permission.js b/resources/mmv/ui/mmv.ui.permission.js index 92fac682e..2332e0d35 100644 --- a/resources/mmv/ui/mmv.ui.permission.js +++ b/resources/mmv/ui/mmv.ui.permission.js @@ -143,7 +143,7 @@ mw.mmv.actionLogger.log( 'terms-open' ); // FIXME: Use CSS transition - // eslint-disable-next-line jquery/no-animate + // eslint-disable-next-line no-jquery/no-animate this.$box.addClass( 'full-size' ) .stop( true ) .animate( { backgroundColor: '#FFFFA0' }, 500 ) diff --git a/resources/mmv/ui/mmv.ui.progressBar.js b/resources/mmv/ui/mmv.ui.progressBar.js index b3556325f..44f73214e 100644 --- a/resources/mmv/ui/mmv.ui.progressBar.js +++ b/resources/mmv/ui/mmv.ui.progressBar.js @@ -72,12 +72,12 @@ // When a 100% update comes in, we make sure that the bar is visible, we animate // fast to 100 and we hide the bar when the animation is done // FIXME: Use CSS transition - // eslint-disable-next-line jquery/no-animate + // eslint-disable-next-line no-jquery/no-animate this.$percent.animate( { width: percent + '%' }, 50, 'swing', panel.hide.bind( panel ) ); } else { // When any other % update comes in, we make sure the bar is visible // and we animate to the right position - // eslint-disable-next-line jquery/no-animate + // eslint-disable-next-line no-jquery/no-animate this.$percent.animate( { width: percent + '%' } ); } }; diff --git a/resources/mmv/ui/mmv.ui.truncatableTextField.js b/resources/mmv/ui/mmv.ui.truncatableTextField.js index f4532cd76..151991bf6 100644 --- a/resources/mmv/ui/mmv.ui.truncatableTextField.js +++ b/resources/mmv/ui/mmv.ui.truncatableTextField.js @@ -223,7 +223,7 @@ .addClass( newClass ); this.expanded = false; - // eslint-disable-next-line jquery/no-each-util + // eslint-disable-next-line no-jquery/no-each-util $.each( this.options.styles, function ( k, v ) { if ( !field.isTruncatable() ) { return false; diff --git a/tests/qunit/.eslintrc.json b/tests/qunit/.eslintrc.json index 00e4c3346..6fc837142 100644 --- a/tests/qunit/.eslintrc.json +++ b/tests/qunit/.eslintrc.json @@ -4,10 +4,10 @@ "../../.eslintrc.json" ], "rules": { - "jquery/no-parse-html-literal": "off", - "jquery/no-global-selector": "off", - "jquery/no-noop": "off", - "jquery/no-now": "off", - "jquery/no-support": "off" + "no-jquery/no-parse-html-literal": "off", + "no-jquery/no-global-selector": "off", + "no-jquery/no-noop": "off", + "no-jquery/no-now": "off", + "no-jquery/no-support": "off" } }