jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333149 )
Change subject: Hygiene: mobile.drawers merged into mobile.startup
......................................................................
Hygiene: mobile.drawers merged into mobile.startup
Change-Id: Icc1660d41a10df5258704cd95dbd69bab0ec3a25
---
M extension.json
R resources/mobile.startup/CtaDrawer.hogan
R resources/mobile.startup/CtaDrawer.js
R resources/mobile.startup/Drawer.js
R resources/mobile.startup/drawer.less
5 files changed, 17 insertions(+), 37 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index d7ac897..a999635 100644
--- a/extension.json
+++ b/extension.json
@@ -469,6 +469,7 @@
"jquery.throttle-debounce"
],
"templates": {
+ "Cta.hogan":
"resources/mobile.startup/CtaDrawer.hogan",
"header.hogan":
"resources/mobile.startup/OverlayHeader.hogan",
"Overlay.hogan":
"resources/mobile.startup/Overlay.hogan",
"LoadingOverlay.hogan":
"resources/mobile.startup/LoadingOverlay.hogan",
@@ -478,6 +479,8 @@
"button.hogan":
"resources/mobile.startup/button.hogan"
},
"messages": [
+ "mobile-frontend-watchlist-cta-button-signup",
+ "mobile-frontend-watchlist-cta-button-login",
"mobile-frontend-editor-save",
"mobile-frontend-overlay-close",
"mobile-frontend-overlay-continue",
@@ -495,7 +498,8 @@
],
"styles": [
"resources/mobile.startup/panel.less",
- "resources/mobile.startup/Overlay.less"
+ "resources/mobile.startup/Overlay.less",
+ "resources/mobile.startup/drawer.less"
],
"scripts": [
"resources/mobile.startup/modules.js",
@@ -521,7 +525,9 @@
"resources/mobile.startup/OverlayManager.js",
"resources/mobile.startup/Overlay.js",
"resources/mobile.startup/LoadingOverlay.js",
- "resources/mobile.startup/rlModuleLoader.js"
+ "resources/mobile.startup/rlModuleLoader.js",
+ "resources/mobile.startup/Drawer.js",
+ "resources/mobile.startup/CtaDrawer.js"
],
"position": "bottom"
},
@@ -578,7 +584,6 @@
"oojs-ui",
"mobile.editor.api",
"mobile.startup",
- "mobile.drawers",
"mobile.toast",
"mobile.messageBox",
"mediawiki.util",
@@ -876,37 +881,13 @@
"mobile-frontend-categories-hidden"
]
},
- "mobile.drawers": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "dependencies": [
- "mediawiki.util",
- "mobile.startup"
- ],
- "templates": {
- "Cta.hogan":
"resources/mobile.drawers/CtaDrawer.hogan"
- },
- "styles": [
- "resources/mobile.drawers/drawer.less"
- ],
- "scripts": [
- "resources/mobile.drawers/Drawer.js",
- "resources/mobile.drawers/CtaDrawer.js"
- ],
- "messages": [
- "mobile-frontend-watchlist-cta-button-signup",
- "mobile-frontend-watchlist-cta-button-login"
- ]
- },
"mobile.toast": {
"targets": [
"mobile",
"desktop"
],
"dependencies": [
- "mobile.drawers",
+ "mobile.startup",
"mediawiki.notify"
],
"scripts": [
@@ -923,7 +904,7 @@
],
"dependencies": [
"mobile.references.gateway",
- "mobile.drawers",
+ "mobile.startup",
"mobile.editor.api",
"mobile.references.images"
],
@@ -1000,7 +981,6 @@
],
"dependencies": [
"mobile.startup",
- "mobile.drawers",
"mobile.ajax",
"mobile.toast",
"mobile.search.util"
@@ -1156,8 +1136,7 @@
"desktop"
],
"dependencies": [
- "mobile.startup",
- "mobile.drawers"
+ "mobile.startup"
],
"scripts": [
"resources/mobile.fontchanger/FontChanger.js"
@@ -1496,7 +1475,6 @@
"mediawiki.router",
"skins.minerva.icons.images.scripts",
"skins.minerva.scripts",
- "mobile.drawers",
"mediawiki.ui.input",
"mobile.startup",
"mobile.toast",
diff --git a/resources/mobile.drawers/CtaDrawer.hogan
b/resources/mobile.startup/CtaDrawer.hogan
similarity index 100%
rename from resources/mobile.drawers/CtaDrawer.hogan
rename to resources/mobile.startup/CtaDrawer.hogan
diff --git a/resources/mobile.drawers/CtaDrawer.js
b/resources/mobile.startup/CtaDrawer.js
similarity index 91%
rename from resources/mobile.drawers/CtaDrawer.js
rename to resources/mobile.startup/CtaDrawer.js
index b57f80c..bfe04bf 100644
--- a/resources/mobile.drawers/CtaDrawer.js
+++ b/resources/mobile.startup/CtaDrawer.js
@@ -1,5 +1,5 @@
( function ( M, $ ) {
- var Drawer = M.require( 'mobile.drawers/Drawer' ),
+ var Drawer = M.require( 'mobile.startup/Drawer' ),
Icon = M.require( 'mobile.startup/Icon' ),
Button = M.require( 'mobile.startup/Button' ),
Anchor = M.require( 'mobile.startup/Anchor' );
@@ -44,7 +44,7 @@
button: Button.prototype.template,
anchor: Anchor.prototype.template
} ),
- template: mw.template.get( 'mobile.drawers', 'Cta.hogan' ),
+ template: mw.template.get( 'mobile.startup', 'Cta.hogan' ),
/**
* @inheritdoc
*/
@@ -72,6 +72,7 @@
}
} );
- M.define( 'mobile.drawers/CtaDrawer', CtaDrawer );
+ M.define( 'mobile.startup/CtaDrawer', CtaDrawer )
+ .deprecate( 'mobile.drawers/CtaDrawer' );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.drawers/Drawer.js
b/resources/mobile.startup/Drawer.js
similarity index 96%
rename from resources/mobile.drawers/Drawer.js
rename to resources/mobile.startup/Drawer.js
index 2049133..295abc0 100644
--- a/resources/mobile.drawers/Drawer.js
+++ b/resources/mobile.startup/Drawer.js
@@ -86,6 +86,7 @@
}
} );
- M.define( 'mobile.drawers/Drawer', Drawer );
+ M.define( 'mobile.startup/Drawer', Drawer )
+ .deprecate( 'mobile.drawers/Drawer' );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.drawers/drawer.less
b/resources/mobile.startup/drawer.less
similarity index 100%
rename from resources/mobile.drawers/drawer.less
rename to resources/mobile.startup/drawer.less
--
To view, visit https://gerrit.wikimedia.org/r/333149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc1660d41a10df5258704cd95dbd69bab0ec3a25
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
