Robmoen has submitted this change and it was merged.
Change subject: Fix ResourceLoader paths
......................................................................
Fix ResourceLoader paths
CSS wasn't loading because the paths were resolving badly since we moved code
dependent on __DIR__ from Gather.php to includes/Resources.php
Change-Id: If0a5c3a23cb0669d6a9f35db00ee2fddfbe89764
---
M extension.json
M includes/Resources.php
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Robmoen: Verified; Looks good to me, approved
diff --git a/extension.json b/extension.json
index c15a00d..314d165 100644
--- a/extension.json
+++ b/extension.json
@@ -39,7 +39,7 @@
},
"ResourceModules": {
"ext.collections.icons": {
- "localBasePath": "includes",
+ "localBasePath": "resources",
"remoteExtPath": "Gather",
"targets": [
"mobile",
@@ -54,15 +54,15 @@
}
},
"ext.collections.styles": {
- "localBasePath": "includes",
+ "localBasePath": "resources",
"remoteExtPath": "Gather",
"targets": [
"mobile",
"desktop"
],
"styles": [
- "resources/ext.collections.styles/icons.less",
-
"resources/ext.collections.styles/collections.less"
+ "ext.collections.styles/icons.less",
+ "ext.collections.styles/collections.less"
],
"dependencies": [
"mediawiki.ui.anchor",
@@ -74,11 +74,11 @@
},
"config": {
"GatherResourceBoilerplate": {
- "localBasePath": "extensions/Gather/includes",
+ "localBasePath": "resources",
"remoteExtPath": "Gather"
},
"GatherResourceFileModuleBoilerplate": {
- "localBasePath": "extensions/Gather/includes",
+ "localBasePath": "resources",
"remoteExtPath": "Gather",
"targets": [
"mobile",
@@ -86,7 +86,7 @@
]
},
"GatherMobileSpecialPageResourceBoilerplate": {
- "localBasePath": "extensions/Gather/includes",
+ "localBasePath": "resources",
"remoteExtPath": "Gather",
"targets": "mobile",
"group": "other"
diff --git a/includes/Resources.php b/includes/Resources.php
index 3509268..d66aa60 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -29,7 +29,7 @@
* Agnostic to whether desktop or mobile specific.
*/
$wgGatherResourceBoilerplate = array(
- 'localBasePath' => __DIR__,
+ 'localBasePath' => __DIR__ . '/../resources',
'remoteExtPath' => 'Gather',
);
@@ -64,8 +64,8 @@
'ext.collections.styles' => $wgGatherResourceFileModuleBoilerplate +
array(
'styles' => array(
- 'resources/ext.collections.styles/icons.less',
- 'resources/ext.collections.styles/collections.less',
+ 'ext.collections.styles/icons.less',
+ 'ext.collections.styles/collections.less',
),
'dependencies' => array(
'mediawiki.ui.anchor',
--
To view, visit https://gerrit.wikimedia.org/r/189694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0a5c3a23cb0669d6a9f35db00ee2fddfbe89764
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
