[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Rename mobile.ajax module so its clear it is styles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333982 )
Change subject: Hygiene: Rename mobile.ajax module so its clear it is styles
..
Hygiene: Rename mobile.ajax module so its clear it is styles
It's a style module, not a script+style module
and should be consistently named with all our other
modules
Change-Id: I09749b8d4ff98f67e61ee802b65e8622e8c3e00a
---
M extension.json
M includes/MobileFrontend.hooks.php
R resources/mobile.ajax.styles/images/ajax-loader.gif
R resources/mobile.ajax.styles/images/refresh.png
R resources/mobile.ajax.styles/images/refresh.svg
R resources/mobile.ajax.styles/spinner.less
6 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 0ecdbb9..f2ceecd 100644
--- a/extension.json
+++ b/extension.json
@@ -392,13 +392,13 @@
"toc"
]
},
- "mobile.ajax": {
+ "mobile.ajax.styles": {
"targets": [
"mobile",
"desktop"
],
"styles": [
- "resources/mobile.ajax/spinner.less"
+ "resources/mobile.ajax.styles/spinner.less"
]
},
"mobile.backtotop": {
@@ -430,7 +430,7 @@
"mobile.pagesummary.styles",
"mediawiki.notify",
"mobile.overlay.images",
- "mobile.ajax",
+ "mobile.ajax.styles",
"mediawiki.language",
"mediawiki.jqueryMsg",
"mediawiki.user",
@@ -944,7 +944,7 @@
],
"dependencies": [
"mobile.startup",
- "mobile.ajax",
+ "mobile.ajax.styles",
"mobile.search.util"
],
"scripts": [
@@ -1011,7 +1011,7 @@
"desktop"
],
"dependencies": [
- "mobile.ajax",
+ "mobile.ajax.styles",
"mobile.special.nearby.styles",
"mediawiki.language",
"mobile.pagelist.scripts",
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 3b70a02..a91af0f 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -619,7 +619,7 @@
if ( $name === 'Search' ) {
$out->addModuleStyles(
'skins.minerva.special.search.styles' );
} elseif ( $name === 'Userlogin' || $name ===
'CreateAccount' ) {
- $out->addModuleStyles( [ 'mobile.ajax',
'skins.minerva.special.userlogin.styles' ] );
+ $out->addModuleStyles( [ 'mobile.ajax.styles',
'skins.minerva.special.userlogin.styles' ] );
$out->addModules(
'mobile.special.userlogin.scripts' );
}
}
diff --git a/resources/mobile.ajax/ajax-loader.gif
b/resources/mobile.ajax.styles/images/ajax-loader.gif
similarity index 100%
rename from resources/mobile.ajax/ajax-loader.gif
rename to resources/mobile.ajax.styles/images/ajax-loader.gif
Binary files differ
diff --git a/resources/mobile.ajax/refresh.png
b/resources/mobile.ajax.styles/images/refresh.png
similarity index 100%
rename from resources/mobile.ajax/refresh.png
rename to resources/mobile.ajax.styles/images/refresh.png
Binary files differ
diff --git a/resources/mobile.ajax/refresh.svg
b/resources/mobile.ajax.styles/images/refresh.svg
similarity index 100%
rename from resources/mobile.ajax/refresh.svg
rename to resources/mobile.ajax.styles/images/refresh.svg
diff --git a/resources/mobile.ajax/spinner.less
b/resources/mobile.ajax.styles/spinner.less
similarity index 86%
rename from resources/mobile.ajax/spinner.less
rename to resources/mobile.ajax.styles/spinner.less
index 6d50f2a..4766898 100644
--- a/resources/mobile.ajax/spinner.less
+++ b/resources/mobile.ajax.styles/spinner.less
@@ -5,13 +5,13 @@
// FIXME: Standardise on a loading class (update ConfirmEdit extension)
.fancycaptcha-reload-loading,
.mw-ui-icon-spinner {
- .m-background-image( 'ajax-loader.gif' );
+ .m-background-image( 'images/ajax-loader.gif' );
}
// FIXME: Standardise on a loading class (update ConfirmEdit
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Rename mobile.ajax module
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333982 )
Change subject: Hygiene: Rename mobile.ajax module
..
Hygiene: Rename mobile.ajax module
It's a style module, not a script+style module
and should be consistently named with all our other
modules
Change-Id: I09749b8d4ff98f67e61ee802b65e8622e8c3e00a
---
M extension.json
M includes/MobileFrontend.hooks.php
R resources/mobile.ajax.styles/ajax-loader.gif
R resources/mobile.ajax.styles/refresh.png
R resources/mobile.ajax.styles/refresh.svg
R resources/mobile.ajax.styles/spinner.less
6 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/82/333982/1
diff --git a/extension.json b/extension.json
index dced597..d57313e 100644
--- a/extension.json
+++ b/extension.json
@@ -403,13 +403,13 @@
"toc"
]
},
- "mobile.ajax": {
+ "mobile.ajax.styles": {
"targets": [
"mobile",
"desktop"
],
"styles": [
- "resources/mobile.ajax/spinner.less"
+ "resources/mobile.ajax.styles/spinner.less"
]
},
"mobile.backtotop": {
@@ -441,7 +441,7 @@
"mobile.pagesummary.styles",
"mediawiki.notify",
"mobile.overlay.images",
- "mobile.ajax",
+ "mobile.ajax.styles",
"mediawiki.language",
"mediawiki.jqueryMsg",
"mediawiki.user",
@@ -959,7 +959,7 @@
],
"dependencies": [
"mobile.startup",
- "mobile.ajax",
+ "mobile.ajax.styles",
"mobile.search.util"
],
"scripts": [
@@ -1026,7 +1026,7 @@
"desktop"
],
"dependencies": [
- "mobile.ajax",
+ "mobile.ajax.styles",
"mobile.special.nearby.styles",
"mediawiki.language",
"mobile.pagelist.scripts",
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index ad14bc1..236616c 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -620,7 +620,7 @@
if ( $name === 'Search' ) {
$out->addModuleStyles(
'skins.minerva.special.search.styles' );
} elseif ( $name === 'Userlogin' || $name ===
'CreateAccount' ) {
- $out->addModuleStyles( [ 'mobile.ajax',
'skins.minerva.special.userlogin.styles' ] );
+ $out->addModuleStyles( [ 'mobile.ajax.styles',
'skins.minerva.special.userlogin.styles' ] );
$out->addModules(
'mobile.special.userlogin.scripts' );
}
}
diff --git a/resources/mobile.ajax/ajax-loader.gif
b/resources/mobile.ajax.styles/ajax-loader.gif
similarity index 100%
rename from resources/mobile.ajax/ajax-loader.gif
rename to resources/mobile.ajax.styles/ajax-loader.gif
Binary files differ
diff --git a/resources/mobile.ajax/refresh.png
b/resources/mobile.ajax.styles/refresh.png
similarity index 100%
rename from resources/mobile.ajax/refresh.png
rename to resources/mobile.ajax.styles/refresh.png
Binary files differ
diff --git a/resources/mobile.ajax/refresh.svg
b/resources/mobile.ajax.styles/refresh.svg
similarity index 100%
rename from resources/mobile.ajax/refresh.svg
rename to resources/mobile.ajax.styles/refresh.svg
diff --git a/resources/mobile.ajax/spinner.less
b/resources/mobile.ajax.styles/spinner.less
similarity index 100%
rename from resources/mobile.ajax/spinner.less
rename to resources/mobile.ajax.styles/spinner.less
--
To view, visit https://gerrit.wikimedia.org/r/333982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09749b8d4ff98f67e61ee802b65e8622e8c3e00a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
