Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288003
Change subject: Hygiene: Move page issues initialisation code to
skins.minerva.scripts
......................................................................
Hygiene: Move page issues initialisation code to skins.minerva.scripts
The loading of mobile.issues should not have side effects and should
be reusable. There is no longer any reason for this code to be outside
skins.minerva.scripts
Change-Id: I069bc7d71e4f11928d544efbcbc3c5b4c12491d7
---
M extension.json
R resources/skins.minerva.scripts/cleanuptemplates.js
M resources/skins.minerva.scripts/init.js
3 files changed, 15 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/03/288003/1
diff --git a/extension.json b/extension.json
index 59a9bdc..b5ba64b 100644
--- a/extension.json
+++ b/extension.json
@@ -1253,15 +1253,7 @@
"resources/mobile.issues/issues.less"
],
"scripts": [
- "resources/mobile.issues/CleanupOverlay.js",
- "resources/mobile.issues/cleanuptemplates.js"
- ],
- "messages": [
- "mobile-frontend-meta-data-issues",
- "mobile-frontend-meta-data-issues-talk",
- "mobile-frontend-meta-data-issues-header",
- "mobile-frontend-meta-data-issues-header-talk",
- "mobile-frontend-meta-data-issues-categories"
+ "resources/mobile.issues/CleanupOverlay.js"
]
},
"mobile.nearby": {
@@ -1634,6 +1626,11 @@
"mobile.context"
],
"messages": [
+ "mobile-frontend-meta-data-issues",
+ "mobile-frontend-meta-data-issues-talk",
+ "mobile-frontend-meta-data-issues-categories",
+ "mobile-frontend-meta-data-issues-header",
+ "mobile-frontend-meta-data-issues-header-talk",
"mobile-frontend-last-modified-with-user-seconds",
"mobile-frontend-last-modified-with-user-minutes",
"mobile-frontend-last-modified-with-user-hours",
@@ -1649,7 +1646,8 @@
"resources/skins.minerva.scripts/initLogging.js",
"resources/skins.minerva.scripts/mobileRedirect.js",
"resources/skins.minerva.scripts/references.js",
- "resources/skins.minerva.scripts/search.js"
+ "resources/skins.minerva.scripts/search.js",
+
"resources/skins.minerva.scripts/cleanuptemplates.js"
]
},
"skins.minerva.scripts.top": {
diff --git a/resources/mobile.issues/cleanuptemplates.js
b/resources/skins.minerva.scripts/cleanuptemplates.js
similarity index 94%
rename from resources/mobile.issues/cleanuptemplates.js
rename to resources/skins.minerva.scripts/cleanuptemplates.js
index b3213f5..09ffb17 100644
--- a/resources/mobile.issues/cleanuptemplates.js
+++ b/resources/skins.minerva.scripts/cleanuptemplates.js
@@ -1,6 +1,6 @@
( function ( M, $ ) {
- var module = ( function () {
+ ( function () {
var overlayManager = M.require( 'mobile.startup/overlayManager'
),
CleanupOverlay = M.require(
'mobile.issues/CleanupOverlay' );
@@ -114,13 +114,12 @@
}
}
- return {
- init: initPageIssues,
- createBanner: createBanner,
- _extractMessage: extractMessage
- };
+ // Setup the issues banner on the page
+ initPageIssues();
+ // Show it in edit preview.
+ M.on( 'edit-preview', function ( overlay ) {
+ initPageIssues( overlay.$el );
+ } );
}() );
-
- M.define( 'mobile.issues/cleanuptemplates', module );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/skins.minerva.scripts/init.js
b/resources/skins.minerva.scripts/init.js
index 54520a4..a62364b 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -7,7 +7,6 @@
loader = M.require( 'mobile.overlays/moduleLoader' ),
router = M.require( 'mobile.startup/router' ),
context = M.require( 'mobile.context/context' ),
- cleanuptemplates = M.require( 'mobile.issues/cleanuptemplates'
),
useNewMediaViewer = context.isBetaGroupMember(),
overlayManager = M.require( 'mobile.startup/overlayManager' ),
page = M.getCurrentPage(),
@@ -230,13 +229,6 @@
.appendTo(
M.getCurrentPage().getLeadSectionElement() );
}
}
-
- // Setup the issues banner on the page
- cleanuptemplates.init();
- // Show it in edit preview.
- M.on( 'edit-preview', function ( overlay ) {
- cleanuptemplates.init( overlay.$el );
- } );
// let the interested parties know whether the panel is shown
mw.track( 'minerva.betaoptin', {
--
To view, visit https://gerrit.wikimedia.org/r/288003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I069bc7d71e4f11928d544efbcbc3c5b4c12491d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
