jenkins-bot has submitted this change and it was merged.
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
Additional changes:
* Remove outdated code which attempts but fails to add an issues banner
to the editor preview. This is no longer shown and hasn't been for some time
so one can only assume is not necessary at current time.
Change-Id: I069bc7d71e4f11928d544efbcbc3c5b4c12491d7
---
M extension.json
R resources/skins.minerva.scripts/cleanuptemplates.js
M resources/skins.minerva.scripts/init.js
3 files changed, 11 insertions(+), 26 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 5a208ac..5523db1 100644
--- a/extension.json
+++ b/extension.json
@@ -1258,15 +1258,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": {
@@ -1639,6 +1631,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",
@@ -1654,7 +1651,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..2482251 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,8 @@
}
}
- return {
- init: initPageIssues,
- createBanner: createBanner,
- _extractMessage: extractMessage
- };
+ // Setup the issues banner on the page
+ initPageIssues();
}() );
-
- 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: merged
Gerrit-Change-Id: I069bc7d71e4f11928d544efbcbc3c5b4c12491d7
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
