dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "build: Remove redundant 'vendor/bin' prefix from composer commands"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
92b4fd4
..
6298086
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-39,11
+39,6
@@
return [
'class' => ResourceLoaderWikiModule::class,
'styles' => [ 'MediaWiki:Filepage.css' ],
],
'class' => ResourceLoaderWikiModule::class,
'styles' => [ 'MediaWiki:Filepage.css' ],
],
- 'user.groups' => [
- // Merged into 'user' since MediaWiki 1.28 - kept for back-compat
- 'dependencies' => 'user',
- 'targets' => [ 'desktop', 'mobile' ],
- ],
// Scripts managed by the current user (stored in their user space)
'user' => [ 'class' => ResourceLoaderUserModule::class ],
// Scripts managed by the current user (stored in their user space)
'user' => [ 'class' => ResourceLoaderUserModule::class ],
@@
-1262,7
+1257,10
@@
return [
'remoteBasePath' => "$wgResourceBasePath/resources/src",
'packageFiles' => [
'mediawiki.util.js',
'remoteBasePath' => "$wgResourceBasePath/resources/src",
'packageFiles' => [
'mediawiki.util.js',
- [ 'name' => 'config.json', 'config' => [ 'FragmentMode' ] ],
+ [ 'name' => 'config.json', 'config' => [
+ 'FragmentMode',
+ 'LoadScript',
+ ] ],
],
'dependencies' => [
'jquery.accessKeyLabel',
],
'dependencies' => [
'jquery.accessKeyLabel',
@@
-1365,6
+1363,7
@@
return [
],
'mediawiki.action.edit.preview' => [
'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.preview.js',
],
'mediawiki.action.edit.preview' => [
'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.preview.js',
+ 'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.preview.css',
'dependencies' => [
'jquery.spinner',
'jquery.textSelection',
'dependencies' => [
'jquery.spinner',
'jquery.textSelection',
@@
-2816,14
+2815,7
@@
return [
],
],
],
],
- /**
- * html5shiv
- *
- * This library is intended to run on older browsers
- * that MediaWiki no longer supports as Grade A, and
- * is not loaded through the normal module loading
- * system.
- */
+ // @todo FIXME: Remove 7 days after Ib0020b6bd0156 is deployed to all wikis.
'html5shiv' => [
'scripts' => [
'resources/lib/html5shiv/html5shiv.js'
'html5shiv' => [
'scripts' => [
'resources/lib/html5shiv/html5shiv.js'