Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364654 )
Change subject: Final fixups prior to Minerva/MobileFrontend separation ...................................................................... Final fixups prior to Minerva/MobileFrontend separation * Correct dependency tree - a MobileFrontend module should not depend on a Minerva module - move "skins.minerva.icons.images.variants" dependency to Minerva entry point * Update jsduck config so that MainMenu is a global (MainMenu will become an abstract concept and the code defined in Minerva) * Messages are defined twice inside mobile.startup and skins.minerva.scripts since the latter depends on the former, remove the messages from it * Mark module definitions with resource-modules-disable-line that will be unused by MobileFrontend after the separation. In future we will consider whether these modules should be ported to the Minerva skin. Change-Id: I598e9230fc27aae46d8d55c63fb18d5e4aedf939 --- M extension.json M jsduck.json M resources/mobile.backtotop/BackToTopOverlay.js M resources/mobile.betaoptin/BetaOptinPanel.js M resources/mobile.categories.overlays/CategoryAddOverlay.js M resources/mobile.categories.overlays/CategoryOverlay.js M resources/mobile.issues/CleanupOverlay.js M resources/mobile.languages.structured/LanguageOverlay.js M resources/mobile.mediaViewer/ImageOverlay.js M resources/mobile.references.gateway/ReferencesMobileViewGateway.js M resources/mobile.references/ReferencesDrawer.js M resources/mobile.search/MobileWebSearchLogger.js M resources/mobile.search/SearchOverlay.js M resources/mobile.startup/OverlayManager.js M resources/mobile.startup/Skin.js M resources/mobile.startup/rlModuleLoader.js M resources/mobile.talk.overlays/TalkOverlay.js M resources/mobile.talk.overlays/TalkSectionAddOverlay.js M resources/mobile.talk.overlays/TalkSectionOverlay.js M resources/mobile.toc/TableOfContents.js M resources/mobile.toggle/toggle.js M resources/mobile.watchlist/WatchList.js 22 files changed, 31 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/54/364654/1 diff --git a/extension.json b/extension.json index 95c150e..d571650 100644 --- a/extension.json +++ b/extension.json @@ -504,11 +504,17 @@ "mobile-frontend-overlay-continue", "mobile-frontend-last-modified-with-user-seconds", "mobile-frontend-last-modified-with-user-minutes", - "mobile-frontend-last-modified-with-user-hours", "mobile-frontend-last-modified-with-user-days", "mobile-frontend-last-modified-with-user-months", "mobile-frontend-last-modified-with-user-years", "mobile-frontend-last-modified-with-user-just-now", + "mobile-frontend-joined-just-now", + "mobile-frontend-joined-seconds", + "mobile-frontend-joined-minutes", + "mobile-frontend-joined-hours", + "mobile-frontend-joined-days", + "mobile-frontend-joined-months", + "mobile-frontend-joined-years", "mobile-frontend-loading-message", "mobile-frontend-editor-licensing", "mobile-frontend-editor-licensing-with-terms", @@ -908,7 +914,6 @@ "desktop" ], "dependencies": [ - "skins.minerva.icons.images.variants", "mobile.startup" ], "styles": [ @@ -1358,20 +1363,6 @@ "mobile-frontend-meta-data-issues-header", "mobile-frontend-meta-data-issues-header-talk", "mobile-frontend-languages-not-available", - "mobile-frontend-last-modified-with-user-seconds", - "mobile-frontend-last-modified-with-user-minutes", - "mobile-frontend-last-modified-with-user-hours", - "mobile-frontend-last-modified-with-user-days", - "mobile-frontend-last-modified-with-user-months", - "mobile-frontend-last-modified-with-user-years", - "mobile-frontend-last-modified-with-user-just-now", - "mobile-frontend-joined-just-now", - "mobile-frontend-joined-seconds", - "mobile-frontend-joined-minutes", - "mobile-frontend-joined-hours", - "mobile-frontend-joined-days", - "mobile-frontend-joined-months", - "mobile-frontend-joined-years", "mobile-frontend-cookies-required", "mobile-frontend-console-recruit", "mobile-frontend-redirected-from" @@ -1526,6 +1517,7 @@ "class": "MFResourceLoaderParsedMessageModule", "dependencies": [ "mobile.toggle", + "skins.minerva.icons.images.variants", "skins.minerva.scripts" ], "scripts": [ diff --git a/jsduck.json b/jsduck.json index aa84a93..8e7de6c 100644 --- a/jsduck.json +++ b/jsduck.json @@ -15,6 +15,7 @@ "jqXHR", "File", "Router", + "MainMenu", "mw.user", "mw.Api", "mw.ForeignApi", diff --git a/resources/mobile.backtotop/BackToTopOverlay.js b/resources/mobile.backtotop/BackToTopOverlay.js index c64ba94..452aed1 100644 --- a/resources/mobile.backtotop/BackToTopOverlay.js +++ b/resources/mobile.backtotop/BackToTopOverlay.js @@ -50,6 +50,6 @@ } } ); - M.define( 'mobile.backtotop/BackToTopOverlay', BackToTopOverlay ); + M.define( 'mobile.backtotop/BackToTopOverlay', BackToTopOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.betaoptin/BetaOptinPanel.js b/resources/mobile.betaoptin/BetaOptinPanel.js index 4b0fcb2..a1d506c 100644 --- a/resources/mobile.betaoptin/BetaOptinPanel.js +++ b/resources/mobile.betaoptin/BetaOptinPanel.js @@ -45,6 +45,6 @@ } } ); - M.define( 'mobile.betaoptin/BetaOptinPanel', BetaOptinPanel ); + M.define( 'mobile.betaoptin/BetaOptinPanel', BetaOptinPanel ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.categories.overlays/CategoryAddOverlay.js b/resources/mobile.categories.overlays/CategoryAddOverlay.js index ff8db0a..79cf1f7 100644 --- a/resources/mobile.categories.overlays/CategoryAddOverlay.js +++ b/resources/mobile.categories.overlays/CategoryAddOverlay.js @@ -133,6 +133,6 @@ } } ); - M.define( 'mobile.categories.overlays/CategoryAddOverlay', CategoryAddOverlay ); + M.define( 'mobile.categories.overlays/CategoryAddOverlay', CategoryAddOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.categories.overlays/CategoryOverlay.js b/resources/mobile.categories.overlays/CategoryOverlay.js index 2c3e2ae..a80ac23 100644 --- a/resources/mobile.categories.overlays/CategoryOverlay.js +++ b/resources/mobile.categories.overlays/CategoryOverlay.js @@ -149,6 +149,6 @@ } } ); - M.define( 'mobile.categories.overlays/CategoryOverlay', CategoryOverlay ); + M.define( 'mobile.categories.overlays/CategoryOverlay', CategoryOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.issues/CleanupOverlay.js b/resources/mobile.issues/CleanupOverlay.js index b116733..6d29a69 100644 --- a/resources/mobile.issues/CleanupOverlay.js +++ b/resources/mobile.issues/CleanupOverlay.js @@ -34,5 +34,5 @@ className: icon.getClassName() } ) } ); - M.define( 'mobile.issues/CleanupOverlay', CleanupOverlay ); + M.define( 'mobile.issues/CleanupOverlay', CleanupOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.languages.structured/LanguageOverlay.js b/resources/mobile.languages.structured/LanguageOverlay.js index 142511a..4f1a5cd 100644 --- a/resources/mobile.languages.structured/LanguageOverlay.js +++ b/resources/mobile.languages.structured/LanguageOverlay.js @@ -138,6 +138,6 @@ } } ); - M.define( 'mobile.languages.structured/LanguageOverlay', LanguageOverlay ); + M.define( 'mobile.languages.structured/LanguageOverlay', LanguageOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.mediaViewer/ImageOverlay.js b/resources/mobile.mediaViewer/ImageOverlay.js index 6f8e264..e43ea7d 100644 --- a/resources/mobile.mediaViewer/ImageOverlay.js +++ b/resources/mobile.mediaViewer/ImageOverlay.js @@ -257,6 +257,6 @@ } } } ); - M.define( 'mobile.mediaViewer/ImageOverlay', ImageOverlay ); + M.define( 'mobile.mediaViewer/ImageOverlay', ImageOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.references.gateway/ReferencesMobileViewGateway.js b/resources/mobile.references.gateway/ReferencesMobileViewGateway.js index c4f7972..c4200e8 100644 --- a/resources/mobile.references.gateway/ReferencesMobileViewGateway.js +++ b/resources/mobile.references.gateway/ReferencesMobileViewGateway.js @@ -1,5 +1,6 @@ ( function ( M, $ ) { - var ReferencesHtmlScraperGateway = + var moduleName = 'mobile.references.gateway/ReferencesMobileViewGateway', + ReferencesHtmlScraperGateway = M.require( 'mobile.references.gateway/ReferencesHtmlScraperGateway' ), cache = M.require( 'mobile.startup/cache' ), ReferencesGateway = M.require( 'mobile.references.gateway/ReferencesGateway' ), @@ -120,9 +121,6 @@ return referencesMobileViewGateway; }; - M.define( - 'mobile.references.gateway/ReferencesMobileViewGateway', - ReferencesMobileViewGateway - ); + M.define( moduleName, ReferencesMobileViewGateway ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.references/ReferencesDrawer.js b/resources/mobile.references/ReferencesDrawer.js index 1629d2c..6732139 100644 --- a/resources/mobile.references/ReferencesDrawer.js +++ b/resources/mobile.references/ReferencesDrawer.js @@ -126,5 +126,5 @@ } } ); - M.define( 'mobile.references/ReferencesDrawer', ReferencesDrawer ); + M.define( 'mobile.references/ReferencesDrawer', ReferencesDrawer ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.search/MobileWebSearchLogger.js b/resources/mobile.search/MobileWebSearchLogger.js index ea8e533..f73ff6f 100644 --- a/resources/mobile.search/MobileWebSearchLogger.js +++ b/resources/mobile.search/MobileWebSearchLogger.js @@ -110,6 +110,6 @@ searchOverlay.on( 'search-result-click', logger.onSearchResultClick.bind( logger ) ); }; - M.define( 'mobile.search/MobileWebSearchLogger', MobileWebSearchLogger ); + M.define( 'mobile.search/MobileWebSearchLogger', MobileWebSearchLogger ); // resource-modules-disable-line }( mw.mobileFrontend, mw ) ); diff --git a/resources/mobile.search/SearchOverlay.js b/resources/mobile.search/SearchOverlay.js index 0246ed0..3f0b034 100644 --- a/resources/mobile.search/SearchOverlay.js +++ b/resources/mobile.search/SearchOverlay.js @@ -399,6 +399,6 @@ } } ); - M.define( 'mobile.search/SearchOverlay', SearchOverlay ); + M.define( 'mobile.search/SearchOverlay', SearchOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.startup/OverlayManager.js b/resources/mobile.startup/OverlayManager.js index 893c79b..8689cff 100644 --- a/resources/mobile.startup/OverlayManager.js +++ b/resources/mobile.startup/OverlayManager.js @@ -239,6 +239,6 @@ } } ); - M.define( 'mobile.startup/OverlayManager', OverlayManager ); + M.define( 'mobile.startup/OverlayManager', OverlayManager ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js index 52f6a5c..ee5cb87 100644 --- a/resources/mobile.startup/Skin.js +++ b/resources/mobile.startup/Skin.js @@ -370,6 +370,6 @@ } ); Skin.getSectionId = getSectionId; - M.define( 'mobile.startup/Skin', Skin ); + M.define( 'mobile.startup/Skin', Skin ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.startup/rlModuleLoader.js b/resources/mobile.startup/rlModuleLoader.js index cb94db5..572f81a 100644 --- a/resources/mobile.startup/rlModuleLoader.js +++ b/resources/mobile.startup/rlModuleLoader.js @@ -33,7 +33,7 @@ } ); } }; - M.define( 'mobile.startup/rlModuleLoader', loader ) + M.define( 'mobile.startup/rlModuleLoader', loader ) // resource-modules-disable-line .deprecate( 'mobile.overlays/moduleLoader' ); }( mw.mobileFrontend ) ); diff --git a/resources/mobile.talk.overlays/TalkOverlay.js b/resources/mobile.talk.overlays/TalkOverlay.js index f6844ca..f0c4cdb 100644 --- a/resources/mobile.talk.overlays/TalkOverlay.js +++ b/resources/mobile.talk.overlays/TalkOverlay.js @@ -153,6 +153,6 @@ } } ); - M.define( 'mobile.talk.overlays/TalkOverlay', TalkOverlay ); + M.define( 'mobile.talk.overlays/TalkOverlay', TalkOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.talk.overlays/TalkSectionAddOverlay.js b/resources/mobile.talk.overlays/TalkSectionAddOverlay.js index ba02658..6ac3b74 100644 --- a/resources/mobile.talk.overlays/TalkSectionAddOverlay.js +++ b/resources/mobile.talk.overlays/TalkSectionAddOverlay.js @@ -176,6 +176,6 @@ } } ); - M.define( 'mobile.talk.overlays/TalkSectionAddOverlay', TalkSectionAddOverlay ); + M.define( 'mobile.talk.overlays/TalkSectionAddOverlay', TalkSectionAddOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.talk.overlays/TalkSectionOverlay.js b/resources/mobile.talk.overlays/TalkSectionOverlay.js index 167e0f9..d1c4f49 100644 --- a/resources/mobile.talk.overlays/TalkSectionOverlay.js +++ b/resources/mobile.talk.overlays/TalkSectionOverlay.js @@ -152,5 +152,5 @@ } } ); - M.define( 'mobile.talk.overlays/TalkSectionOverlay', TalkSectionOverlay ); + M.define( 'mobile.talk.overlays/TalkSectionOverlay', TalkSectionOverlay ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.toc/TableOfContents.js b/resources/mobile.toc/TableOfContents.js index 6a5e2b19..0e83a91 100644 --- a/resources/mobile.toc/TableOfContents.js +++ b/resources/mobile.toc/TableOfContents.js @@ -33,5 +33,5 @@ template: mw.template.get( 'mobile.toc', 'toc.hogan' ) } ); - M.define( 'mobile.toc/TableOfContents', TableOfContents ); + M.define( 'mobile.toc/TableOfContents', TableOfContents ); // resource-modules-disable-line }( mw.mobileFrontend ) ); diff --git a/resources/mobile.toggle/toggle.js b/resources/mobile.toggle/toggle.js index 842cb82..d4c8e34 100644 --- a/resources/mobile.toggle/toggle.js +++ b/resources/mobile.toggle/toggle.js @@ -358,6 +358,6 @@ Toggler._expandStoredSections = expandStoredSections; Toggler._cleanObsoleteStoredSections = cleanObsoleteStoredSections; - M.define( 'mobile.toggle/Toggler', Toggler ); + M.define( 'mobile.toggle/Toggler', Toggler ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.watchlist/WatchList.js b/resources/mobile.watchlist/WatchList.js index 4ef1623..5834ca4 100644 --- a/resources/mobile.watchlist/WatchList.js +++ b/resources/mobile.watchlist/WatchList.js @@ -85,6 +85,6 @@ } ); - M.define( 'mobile.watchlist/WatchList', WatchList ); + M.define( 'mobile.watchlist/WatchList', WatchList ); // resource-modules-disable-line }( mw.mobileFrontend, jQuery ) ); -- To view, visit https://gerrit.wikimedia.org/r/364654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I598e9230fc27aae46d8d55c63fb18d5e4aedf939 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits