diff --git a/.eslintrc.json b/.eslintrc.json index f866cbd..7112cf5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -2,12 +2,12 @@ "root": true, "extends": "wikimedia", "env": { - "browser": true, - "jquery": true + "browser": true }, "globals": { "OO": false, "mw": false, + "$": false, "Hogan": false, "require": false }, diff --git a/resources/skins.minerva.mainMenu/MainMenu.js b/resources/skins.minerva.mainMenu/MainMenu.js index cbe0504..3a75df1 100644 --- a/resources/skins.minerva.mainMenu/MainMenu.js +++ b/resources/skins.minerva.mainMenu/MainMenu.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var browser = M.require( 'mobile.startup/Browser' ).getSingleton(), View = M.require( 'mobile.startup/View' ); @@ -130,4 +130,4 @@ M.define( 'skins.minerva.mainMenu/MainMenu', MainMenu ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.notifications/init.js b/resources/skins.minerva.notifications/init.js index e760dc2..036953c 100644 --- a/resources/skins.minerva.notifications/init.js +++ b/resources/skins.minerva.notifications/init.js @@ -2,7 +2,7 @@ * This code loads the necessary modules for the notifications overlay, not to be confused * with the Toast notifications defined by common/toast.js. */ -( function ( M, $ ) { +( function ( M ) { var mainMenu = M.require( 'skins.minerva.scripts.top/mainMenu' ), router = require( 'mediawiki.router' ), NotificationBadge = M.require( 'skins.minerva.notifications/NotificationBadge' ), @@ -78,4 +78,4 @@ } ); } ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.options/BackToTopOverlay.js b/resources/skins.minerva.options/BackToTopOverlay.js index 5d6a78a..a08a695 100644 --- a/resources/skins.minerva.options/BackToTopOverlay.js +++ b/resources/skins.minerva.options/BackToTopOverlay.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var View = M.require( 'mobile.startup/View' ); @@ -49,4 +49,4 @@ M.define( 'skins.minerva.options/BackToTopOverlay', BackToTopOverlay ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.options/backtotop.js b/resources/skins.minerva.options/backtotop.js index 23a4caf..66b98c4 100644 --- a/resources/skins.minerva.options/backtotop.js +++ b/resources/skins.minerva.options/backtotop.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var BackToTopOverlay = M.require( 'skins.minerva.options/BackToTopOverlay' ), backtotop = new BackToTopOverlay(), features = mw.config.get( 'wgMinervaFeatures', {} ), @@ -19,4 +19,4 @@ backtotop.hide(); } } ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.options/categories.js b/resources/skins.minerva.options/categories.js index 24c4f34..74b14ca 100644 --- a/resources/skins.minerva.options/categories.js +++ b/resources/skins.minerva.options/categories.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var loader = M.require( 'mobile.startup/rlModuleLoader' ), features = mw.config.get( 'wgMinervaFeatures', {} ), @@ -51,4 +51,4 @@ $( initButton ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.scripts.top/init.js b/resources/skins.minerva.scripts.top/init.js index 170c14e..7d85512 100644 --- a/resources/skins.minerva.scripts.top/init.js +++ b/resources/skins.minerva.scripts.top/init.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var MainMenu = M.require( 'skins.minerva.mainMenu/MainMenu' ), mainMenu = createMainMenu(); @@ -29,4 +29,4 @@ } ); M.define( 'skins.minerva.scripts.top/mainMenu', mainMenu ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.scripts/init.js b/resources/skins.minerva.scripts/init.js index 8a01711..7cec722 100644 --- a/resources/skins.minerva.scripts/init.js +++ b/resources/skins.minerva.scripts/init.js @@ -1,4 +1,4 @@ -( function ( M, track, config, $ ) { +( function ( M, track, config ) { var toast = M.require( 'mobile.startup/toast' ), time = M.require( 'mobile.startup/time' ), @@ -368,4 +368,4 @@ } ); M.define( 'skins.minerva.scripts/overlayManager', overlayManager ); -}( mw.mobileFrontend, mw.track, mw.config, jQuery ) ); +}( mw.mobileFrontend, mw.track, mw.config ) ); diff --git a/resources/skins.minerva.scripts/initLogging.js b/resources/skins.minerva.scripts/initLogging.js index e7dfc5b..f30f076 100644 --- a/resources/skins.minerva.scripts/initLogging.js +++ b/resources/skins.minerva.scripts/initLogging.js @@ -1,9 +1,9 @@ // This initialises EventLogging for main menu and some prominent links in the UI. // This code should only be loaded on the Minerva skin, it does not apply to other skins. -( function ( M, $ ) { +( function ( M ) { var mainMenu = M.require( 'skins.minerva.scripts.top/mainMenu' ); $( function () { mainMenu.enableLogging(); } ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.scripts/mobileRedirect.js b/resources/skins.minerva.scripts/mobileRedirect.js index 62ec4ef..04c22df 100644 --- a/resources/skins.minerva.scripts/mobileRedirect.js +++ b/resources/skins.minerva.scripts/mobileRedirect.js @@ -2,7 +2,7 @@ * Warn people if they're trying to switch to desktop but have cookies disabled. */ -( function ( M, $ ) { +( function ( M ) { var popup = M.require( 'mobile.startup/toast' ); @@ -47,4 +47,4 @@ $( '#mw-mf-display-toggle' ).on( 'click', desktopViewClick ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.scripts/pageIssues.js b/resources/skins.minerva.scripts/pageIssues.js index f09ce13..08ff7d5 100644 --- a/resources/skins.minerva.scripts/pageIssues.js +++ b/resources/skins.minerva.scripts/pageIssues.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var Page = M.require( 'mobile.startup/Page' ), allIssues = {}, KEYWORD_ALL_SECTIONS = 'all', @@ -216,4 +216,4 @@ } } ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.scripts/references.js b/resources/skins.minerva.scripts/references.js index 5652fed..477602c 100644 --- a/resources/skins.minerva.scripts/references.js +++ b/resources/skins.minerva.scripts/references.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var drawer, skin = M.require( 'skins.minerva.scripts/skin' ), page = M.getCurrentPage(), @@ -113,4 +113,4 @@ skin.on( 'references-loaded', function ( page ) { setup( page ); } ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.scripts/search.js b/resources/skins.minerva.scripts/search.js index e130d85..136f3eb 100644 --- a/resources/skins.minerva.scripts/search.js +++ b/resources/skins.minerva.scripts/search.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var SearchOverlay = M.require( 'mobile.search/SearchOverlay' ), SearchGateway = M.require( 'mobile.search.api/SearchGateway' ), overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ), @@ -70,4 +70,4 @@ getSearchOverlay().showKeyboard(); } ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.tablet.scripts/toc.js b/resources/skins.minerva.tablet.scripts/toc.js index 80f851a..1237319 100644 --- a/resources/skins.minerva.tablet.scripts/toc.js +++ b/resources/skins.minerva.tablet.scripts/toc.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var TableOfContents = M.require( 'mobile.toc/TableOfContents' ), Toggler = M.require( 'mobile.toggle/Toggler' ); @@ -36,4 +36,4 @@ init( M.getCurrentPage() ); } -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.talk/init.js b/resources/skins.minerva.talk/init.js index 119d643..5379e96 100644 --- a/resources/skins.minerva.talk/init.js +++ b/resources/skins.minerva.talk/init.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var loader = M.require( 'mobile.startup/rlModuleLoader' ), LoadingOverlay = M.require( 'mobile.startup/LoadingOverlay' ), $talk = $( '.talk' ), @@ -90,4 +90,4 @@ }, 10 ); } ); } -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.toggling/init.js b/resources/skins.minerva.toggling/init.js index 9f67db9..1a9ec50 100644 --- a/resources/skins.minerva.toggling/init.js +++ b/resources/skins.minerva.toggling/init.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var page = M.getCurrentPage(), $contentContainer = $( '#mw-content-text > .mw-parser-output' ), Toggler = M.require( 'mobile.toggle/Toggler' ); @@ -41,4 +41,4 @@ ) { init( $contentContainer, 'content-', page ); } -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) ); diff --git a/resources/skins.minerva.watchstar/init.js b/resources/skins.minerva.watchstar/init.js index 301bca0..a03f134 100644 --- a/resources/skins.minerva.watchstar/init.js +++ b/resources/skins.minerva.watchstar/init.js @@ -1,4 +1,4 @@ -( function ( M, $ ) { +( function ( M ) { var Watchstar = M.require( 'mobile.watchstar/Watchstar' ), user = M.require( 'mobile.startup/user' ); @@ -25,4 +25,4 @@ } init( M.getCurrentPage() ); -}( mw.mobileFrontend, jQuery ) ); +}( mw.mobileFrontend ) );