jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375068 )
Change subject: Hygiene: Reorganise the ResourceLoader modules
......................................................................
Hygiene: Reorganise the ResourceLoader modules
* Organise files by folder where folder name is
ResourceLoader module
* Introduce ext.collection.bookcreator.styles
When two modules share the same styles that's a sign
they are organised incorrectly. ext.collection.bookcreator
will load it as a dependency
* Load the new styles module on Special:Book - this removes
the flash of unstyled content when you load the special page.
Change-Id: I9fb23b6ca3f7bfab589f35019e8dad4c19babe65
---
M Collection.body.php
M Collection.hooks.php
M Collection.php
M Gruntfile.js
R resources/ext.collection.bookcreator.styles/bookcreator.css
R resources/ext.collection.bookcreator/bookcreator.js
R
resources/ext.collection.checkLoadFromLocalStorage/check_load_from_localstorage.js
R resources/ext.collection.suggest/suggest.js
R resources/ext.collection/collection.js
9 files changed, 15 insertions(+), 12 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Collection.body.php b/Collection.body.php
index 2a4a816..9de5df1 100644
--- a/Collection.body.php
+++ b/Collection.body.php
@@ -478,7 +478,7 @@
$this->setHeaders();
$out->setPageTitle( $this->msg( 'coll-manage_your_book'
)->text() );
$out->addModules( 'ext.collection' );
- $out->addModuleStyles( 'mediawiki.hlist' );
+ $out->addModuleStyles( [ 'mediawiki.hlist',
'ext.collection.bookcreator.styles' ] );
$template = new CollectionPageTemplate();
$template->set( 'context', $this->getContext() );
diff --git a/Collection.hooks.php b/Collection.hooks.php
index b1160b5..5809539 100644
--- a/Collection.hooks.php
+++ b/Collection.hooks.php
@@ -217,6 +217,7 @@
}
$wgOut->addModules( 'ext.collection.bookcreator' );
+ $wgOut->addModuleStyles( 'ext.collection.bookcreator.styles' );
$addRemoveState = $mode;
diff --git a/Collection.php b/Collection.php
index b504070..9f95178 100644
--- a/Collection.php
+++ b/Collection.php
@@ -213,29 +213,31 @@
$wgAvailableRights[] = 'collectionsaveascommunitypage';
$collResourceTemplate = [
- 'localBasePath' => __DIR__ . '/modules',
- 'remoteExtPath' => 'Collection/modules'
+ 'localBasePath' => __DIR__ . '/resources',
+ 'remoteExtPath' => 'Collection/resources'
];
$wgResourceModules += [
'ext.collection' => $collResourceTemplate + [
- 'scripts' => 'collection.js',
+ 'scripts' => 'ext.collection/collection.js',
'dependencies' => [
'ext.collection.bookcreator',
'jquery.ui.sortable',
'mediawiki.language',
],
],
+ 'ext.collection.bookcreator.styles' => $collResourceTemplate + [
+ 'styles' => 'ext.collection.bookcreator.styles/bookcreator.css',
+ ],
'ext.collection.bookcreator' => $collResourceTemplate + [
- 'scripts' => 'bookcreator.js',
- 'styles' => 'bookcreator.css',
- 'dependencies' => 'jquery.jStorage'
+ 'scripts' => 'ext.collection.bookcreator/bookcreator.js',
+ 'dependencies' => [ 'jquery.jStorage',
'ext.collection.bookcreator.styles' ],
],
'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + [
- 'scripts' => 'check_load_from_localstorage.js',
- 'styles' => 'bookcreator.css',
+ 'scripts' =>
'ext.collection.checkLoadFromLocalStorage/check_load_from_localstorage.js',
'dependencies' => [
'ext.collection',
+ 'ext.collection.bookcreator.styles',
'jquery.jStorage',
],
'messages' => [
@@ -243,7 +245,7 @@
]
],
'ext.collection.suggest' => $collResourceTemplate + [
- 'scripts' => 'suggest.js',
+ 'scripts' => 'ext.collection.suggest/suggest.js',
'dependencies' => 'ext.collection.bookcreator'
],
];
diff --git a/Gruntfile.js b/Gruntfile.js
index 4cd76d7..89af5f6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,12 +9,12 @@
eslint: {
all: [
'*.js',
- 'modules/**/*.js'
+ 'resources/**/*.js'
]
},
stylelint: {
all: [
- 'modules/**/*.css',
+ 'resources/**/*.css',
'!node_modules/**'
]
},
diff --git a/modules/bookcreator.css
b/resources/ext.collection.bookcreator.styles/bookcreator.css
similarity index 100%
rename from modules/bookcreator.css
rename to resources/ext.collection.bookcreator.styles/bookcreator.css
diff --git a/modules/bookcreator.js
b/resources/ext.collection.bookcreator/bookcreator.js
similarity index 100%
rename from modules/bookcreator.js
rename to resources/ext.collection.bookcreator/bookcreator.js
diff --git a/modules/check_load_from_localstorage.js
b/resources/ext.collection.checkLoadFromLocalStorage/check_load_from_localstorage.js
similarity index 100%
rename from modules/check_load_from_localstorage.js
rename to
resources/ext.collection.checkLoadFromLocalStorage/check_load_from_localstorage.js
diff --git a/modules/suggest.js b/resources/ext.collection.suggest/suggest.js
similarity index 100%
rename from modules/suggest.js
rename to resources/ext.collection.suggest/suggest.js
diff --git a/modules/collection.js b/resources/ext.collection/collection.js
similarity index 100%
rename from modules/collection.js
rename to resources/ext.collection/collection.js
--
To view, visit https://gerrit.wikimedia.org/r/375068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fb23b6ca3f7bfab589f35019e8dad4c19babe65
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[email protected]>
Gerrit-Reviewer: Pmiazga <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
