jenkins-bot has submitted this change and it was merged.
Change subject: Use consistent naming style in RL modules and resource files
......................................................................
Use consistent naming style in RL modules and resource files
Use ext.<extensionName>.moduleName style.
Change-Id: I9351e7154784b352e28af58334e8d046b1246400
---
M extension.json
M includes/specials/SpecialNewsletterManage.php
M includes/specials/SpecialNewsletters.php
R modules/ext.newsletter.manage.js
R modules/ext.newsletter.newsletters.js
R modules/ext.newsletter.newsletters.styles.css
6 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index a3fdae1..420e09e 100644
--- a/extension.json
+++ b/extension.json
@@ -68,8 +68,8 @@
"echo-subscriptions-email-newsletter": true
},
"ResourceModules": {
- "ext.newsletter": {
- "scripts": "ext.newsletter.js",
+ "ext.newsletter.newsletters": {
+ "scripts": "ext.newsletter.newsletters.js",
"position": "bottom",
"dependencies": [
"mediawiki.api"
@@ -98,12 +98,12 @@
"newsletter-delete-confirm-delete"
]
},
- "ext.newsletter.styles": {
+ "ext.newsletter.newsletters.styles": {
"position": "top",
- "styles": "ext.newsletter.css"
+ "styles": "ext.newsletter.newsletters.styles.css"
},
- "ext.newslettermanage": {
- "scripts": "ext.newslettermanage.js",
+ "ext.newsletter.manage": {
+ "scripts": "ext.newsletter.manage.js",
"dependencies": [
"mediawiki.api"
]
diff --git a/includes/specials/SpecialNewsletterManage.php
b/includes/specials/SpecialNewsletterManage.php
index 13bf8ee..9af4d4f 100644
--- a/includes/specials/SpecialNewsletterManage.php
+++ b/includes/specials/SpecialNewsletterManage.php
@@ -20,7 +20,7 @@
public function execute( $par ) {
$this->setHeaders();
$output = $this->getOutput();
- $output->addModules( 'ext.newslettermanage' );
+ $output->addModules( 'ext.newsletter.manage' );
$output->setSubtitle(
NewsletterLinksGenerator::getSubtitleLinks( $this->getContext() ) );
$this->requireLogin();
diff --git a/includes/specials/SpecialNewsletters.php
b/includes/specials/SpecialNewsletters.php
index 7425140..81b3d0b 100644
--- a/includes/specials/SpecialNewsletters.php
+++ b/includes/specials/SpecialNewsletters.php
@@ -24,8 +24,8 @@
$out = $this->getOutput();
if ( $this->getUser()->isLoggedIn() ) {
// IPs cannot subscribe and these modules are only used
for subscription functionality.
- $out->addModuleStyles( 'ext.newsletter.styles' );
- $out->addModules( 'ext.newsletter' );
+ $out->addModuleStyles(
'ext.newsletter.newsletters.styles' );
+ $out->addModules( 'ext.newsletter.newsletters' );
}
$out->setSubtitle( NewsletterLinksGenerator::getSubtitleLinks(
$this->getContext() ) );
diff --git a/modules/ext.newslettermanage.js b/modules/ext.newsletter.manage.js
similarity index 100%
rename from modules/ext.newslettermanage.js
rename to modules/ext.newsletter.manage.js
diff --git a/modules/ext.newsletter.js b/modules/ext.newsletter.newsletters.js
similarity index 100%
rename from modules/ext.newsletter.js
rename to modules/ext.newsletter.newsletters.js
diff --git a/modules/ext.newsletter.css
b/modules/ext.newsletter.newsletters.styles.css
similarity index 100%
rename from modules/ext.newsletter.css
rename to modules/ext.newsletter.newsletters.styles.css
--
To view, visit https://gerrit.wikimedia.org/r/267445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9351e7154784b352e28af58334e8d046b1246400
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <glaisher.w...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
