golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hygiene: replace mobile.startup/paths with props 

Replace all occurrences of `M.require( 'mobile.startup/pathToModule' )`
with `M.require( 'mobile.startup' ).pathToModule`. Where multiple
requires existed, add an intermediate variable,
`var mobile = M.require( 'mobile.startup' )`, and dot off that.

This changes improves the consistency of MinervaNeue which currently
contains a mix of require styles and eliminates any deprecated requires.

Bug: T208915
Change-Id: If14f280672d914d07275197100b12421bb217b67
This commit is contained in:
Stephen Niedzielski 2019-02-07 09:34:18 -07:00
parent 63e52a302a
commit 5593b23aa8
20 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/skins.minerva.mainMenu/MainMenu.js
View File

@ -1,6 +1,8 @@
( function ( M ) {
var browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
View = M.require( 'mobile.startup/View' );
var
mobile = M.require( 'mobile.startup' ),
browser = mobile.Browser.getSingleton(),
View = mobile.View;
/**
* Representation of the main menu

2
resources/skins.minerva.mainMenu/schema.js
View File

@ -11,7 +11,7 @@ mw.loader.using( [
editCount = mw.config.get( 'wgUserEditCount' ),
// Schema provided by ext.eventLogging.subscriber class
Schema = mw.eventLog.Schema, // resource-modules-disable-line
context = M.require( 'mobile.startup/context' ),
context = M.require( 'mobile.startup' ).context,
/**
* MobileWebMainMenuClickTracking schema
* https://meta.wikimedia.org/wiki/Schema:MobileWebMainMenuClickTracking

10
resources/skins.minerva.notifications.badge/NotificationBadge.js
View File

@ -1,12 +1,14 @@
( function ( M ) {
var View = M.require( 'mobile.startup/View' ),
util = M.require( 'mobile.startup/util' ),
Icon = M.require( 'mobile.startup/Icon' ),
var
mobile = M.require( 'mobile.startup' ),
View = mobile.View,
util = mobile.util,
Icon = mobile.Icon,
notificationIcon = new Icon( {
name: 'notifications',
glyphPrefix: 'minerva'
} ),
icons = M.require( 'mobile.startup/icons' );
icons = mobile.icons;
/**
* A notification button for communicating with an NotificationOverlay

7
resources/skins.minerva.options/BackToTopOverlay.js
View File

@ -1,7 +1,8 @@
( function ( M ) {
var View = M.require( 'mobile.startup/View' ),
util = M.require( 'mobile.startup/util' );
var
mobile = M.require( 'mobile.startup' ),
View = mobile.View,
util = mobile.util;
/**
* Displays a little arrow at the bottom right of the viewport.

5
resources/skins.minerva.options/backtotop.js
View File

@ -2,8 +2,9 @@
var BackToTopOverlay = M.require( 'skins.minerva.options/BackToTopOverlay' ),
backtotop = new BackToTopOverlay(),
features = mw.config.get( 'wgMinervaFeatures', {} ),
browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
eventBus = M.require( 'mobile.startup/eventBusSingleton' );
mobile = M.require( 'mobile.startup' ),
browser = mobile.Browser.getSingleton(),
eventBus = mobile.eventBusSingleton;
// check if browser user agent is iOS (T141598)
if ( browser.isIos() || !features.backToTop ) {

7
resources/skins.minerva.options/categories.js
View File

@ -1,9 +1,10 @@
( function ( M ) {
var loader = M.require( 'mobile.startup/rlModuleLoader' ),
var
mobile = M.require( 'mobile.startup' ),
loader = mobile.rlModuleLoader,
features = mw.config.get( 'wgMinervaFeatures', {} ),
overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ),
eventBus = M.require( 'mobile.startup/eventBusSingleton' ),
eventBus = mobile.eventBusSingleton,
isAnon = mw.user.isAnon();
// check the categories feature has been turned on

2
resources/skins.minerva.options/shareIcon.js
View File

@ -1,5 +1,5 @@
( function ( M, msg, config ) {
var Icon = M.require( 'mobile.startup/Icon' );
var Icon = M.require( 'mobile.startup' ).Icon;
/**
* Generate a mouse event that when run

2
resources/skins.minerva.scripts/downloadPageAction.js
View File

@ -4,7 +4,7 @@
Icon = mobile.Icon,
icons = mobile.icons,
lazyImageLoader = mobile.lazyImages.lazyImageLoader,
browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
browser = mobile.Browser.getSingleton(),
GLYPH = 'download';
/**

2
resources/skins.minerva.scripts/errorLogging.js
View File

@ -12,7 +12,7 @@
sessionToken = user.sessionId(),
EVENT_CLIENT_ERROR_LOG = 'wikimedia.event.WebClientError',
page = M.getCurrentPage(),
util = M.require( 'mobile.startup/util' ),
util = M.require( 'mobile.startup' ).util,
errorExperiment = {
name: 'WebClientError',
enabled: errorSamplingRate > 0,

21
resources/skins.minerva.scripts/init.js
View File

@ -1,22 +1,23 @@
( function ( M, track, config ) {
var
toast = M.require( 'mobile.startup/toast' ),
time = M.require( 'mobile.startup/time' ),
mobile = M.require( 'mobile.startup' ),
toast = mobile.toast,
time = mobile.time,
skin = M.require( 'mobile.init/skin' ),
issues = M.require( 'skins.minerva.scripts/pageIssues' ),
downloadPageAction = M.require( 'skins.minerva.scripts/downloadPageAction' ),
loader = M.require( 'mobile.startup/rlModuleLoader' ),
loader = mobile.rlModuleLoader,
router = require( 'mediawiki.router' ),
OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
CtaDrawer = M.require( 'mobile.startup/CtaDrawer' ),
Icon = M.require( 'mobile.startup/Icon' ),
Button = M.require( 'mobile.startup/Button' ),
Anchor = M.require( 'mobile.startup/Anchor' ),
OverlayManager = mobile.OverlayManager,
CtaDrawer = mobile.CtaDrawer,
Icon = mobile.Icon,
Button = mobile.Button,
Anchor = mobile.Anchor,
overlayManager = OverlayManager.getSingleton(),
page = M.getCurrentPage(),
api = new mw.Api(),
thumbs = page.getThumbnails(),
eventBus = M.require( 'mobile.startup/eventBusSingleton' );
eventBus = mobile.eventBusSingleton;
/**
* Event handler for clicking on an image thumbnail
@ -150,7 +151,7 @@
var lang = mw.config.get( 'wgUserLanguage' );
return loader.loadModule( 'mobile.languages.structured', true ).then( function ( loadingOverlay ) {
var PageGateway = M.require( 'mobile.startup/PageGateway' ),
var PageGateway = mobile.PageGateway,
gateway = new PageGateway( api ),
LanguageOverlay = M.require( 'mobile.languages.structured/LanguageOverlay' );

2
resources/skins.minerva.scripts/mobileRedirect.js
View File

@ -4,7 +4,7 @@
( function ( M ) {
var popup = M.require( 'mobile.startup/toast' );
var popup = M.require( 'mobile.startup' ).toast;
/**
* Checks whether cookies are enabled

2
resources/skins.minerva.scripts/page-issues/overlay/pageIssuesOverlay.js
View File

@ -1,6 +1,6 @@
( function ( M, mwMsg ) {
var
Overlay = M.require( 'mobile.startup/Overlay' ),
Overlay = M.require( 'mobile.startup' ).Overlay,
IssueList = M.require( 'skins.minerva.scripts/IssueList' ),
KEYWORD_ALL_SECTIONS = 'all',
NS_MAIN = 0,

2
resources/skins.minerva.scripts/pageIssues.js
View File

@ -1,5 +1,5 @@
( function ( M ) {
var Page = M.require( 'mobile.startup/Page' ),
var Page = M.require( 'mobile.startup' ).Page,
allIssues = {},
KEYWORD_ALL_SECTIONS = 'all',
config = mw.config,

2
resources/skins.minerva.scripts/pageIssuesParser.js
View File

@ -14,7 +14,7 @@
* @prop {string} text HTML string.
*/
var Icon = M.require( 'mobile.startup/Icon' ),
var Icon = M.require( 'mobile.startup' ).Icon,
// Icons are matching the type selector below use a TYPE_* icon. When unmatched, the icon is
// chosen by severity. Their color is always determined by severity, too.
ICON_NAME = {

2
resources/skins.minerva.scripts/preInit.js
View File

@ -8,7 +8,7 @@
( function ( M ) {
var skin = M.require( 'mobile.init/skin' ),
mainMenu = M.require( 'skins.minerva.scripts.top/mainMenu' ),
toast = M.require( 'mobile.startup/toast' );
toast = M.require( 'mobile.startup' ).toast;
// Proxy to MobileFrontend defined skin
M.define( 'skins.minerva.scripts/skin', skin );

6
resources/skins.minerva.talk/init.js
View File

@ -1,6 +1,8 @@
( function ( M, EventEmitter ) {
var loader = M.require( 'mobile.startup/rlModuleLoader' ),
LoadingOverlay = M.require( 'mobile.startup/LoadingOverlay' ),
var
mobile = M.require( 'mobile.startup' ),
loader = mobile.rlModuleLoader,
LoadingOverlay = mobile.LoadingOverlay,
eventBus = new EventEmitter(),
// eslint-disable-next-line jquery/no-global-selector
$talk = $( '.talk' ),

8
resources/skins.minerva.toggling/init.js
View File

@ -1,9 +1,11 @@
( function ( M ) {
var page = M.getCurrentPage(),
var
page = M.getCurrentPage(),
// eslint-disable-next-line jquery/no-global-selector
$contentContainer = $( '#mw-content-text > .mw-parser-output' ),
Toggler = M.require( 'mobile.startup' ).Toggler,
eventBus = M.require( 'mobile.startup/eventBusSingleton' );
mobile = M.require( 'mobile.startup' ),
Toggler = mobile.Toggler,
eventBus = mobile.eventBusSingleton;
if ( !page.getLeadSectionElement() ) {
// Operating in desktop Minerva mode. Stop execution. (T172948)

2
tests/qunit/skins.minerva.notifications.badge/NotificationBadge.test.js
View File

@ -1,5 +1,5 @@
( function ( M ) {
var OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
var OverlayManager = M.require( 'mobile.startup' ).OverlayManager,
NotificationBadge = M.require( 'skins.minerva.notifications/NotificationBadge' );
QUnit.module( 'Minerva NotificationBadge', {

2
tests/qunit/skins.minerva.scripts/AB.test.js
View File

@ -1,7 +1,7 @@
( function ( M ) {
var AB = M.require( 'skins.minerva.scripts/AB' ),
util = M.require( 'mobile.startup/util' ),
util = M.require( 'mobile.startup' ).util,
defaultConfig = {
testName: 'WME.MinervaABTest',
samplingRate: 0.5,

10
tests/qunit/skins.minerva.scripts/pageIssues.test.js
View File

@ -1,6 +1,8 @@
( function ( M ) {
var pageIssues = M.require( 'skins.minerva.scripts/pageIssues' ),
util = M.require( 'mobile.startup/util' ),
var
pageIssues = M.require( 'skins.minerva.scripts/pageIssues' ),
mobile = M.require( 'mobile.startup' ),
util = mobile.util,
createBanner = pageIssues.test.createBanner,
icon = {},
MEDIUM_ISSUE = {
@ -28,8 +30,8 @@
text: 't'
},
getAllIssuesSections = pageIssues.test.getAllIssuesSections,
OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
Page = M.require( 'mobile.startup/Page' ),
OverlayManager = mobile.OverlayManager,
Page = mobile.Page,
overlayManager = new OverlayManager( require( 'mediawiki.router' ) ),
$mockContainer = $(
'<div id=\'bodyContent\'>' +