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 "API: Create a module bundle for 'apipretty' and 'apihelp'"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
da01122
..
133ba0f
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-266,11
+266,6
@@
return [
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
],
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
],
- 'jquery.qunit' => [
- 'scripts' => 'resources/lib/qunitjs/qunit.js',
- 'styles' => 'resources/lib/qunitjs/qunit.css',
- 'targets' => [ 'desktop', 'mobile' ],
- ],
'jquery.spinner' => [
'scripts' => 'resources/src/jquery.spinner/spinner.js',
'styles' => 'resources/src/jquery.spinner/spinner.less',
'jquery.spinner' => [
'scripts' => 'resources/src/jquery.spinner/spinner.js',
'styles' => 'resources/src/jquery.spinner/spinner.less',
@@
-768,10
+763,6
@@
return [
],
/* MediaWiki */
],
/* MediaWiki */
- 'mediawiki.apihelp' => [
- 'styles' => 'resources/src/mediawiki.apihelp.css',
- 'targets' => [ 'desktop' ],
- ],
'mediawiki.template' => [
'scripts' => 'resources/src/mediawiki.template.js',
'targets' => [ 'desktop', 'mobile' ],
'mediawiki.template' => [
'scripts' => 'resources/src/mediawiki.template.js',
'targets' => [ 'desktop', 'mobile' ],
@@
-790,7
+781,10
@@
return [
'dependencies' => 'mediawiki.template',
],
'mediawiki.apipretty' => [
'dependencies' => 'mediawiki.template',
],
'mediawiki.apipretty' => [
- 'styles' => 'resources/src/mediawiki.apipretty.css',
+ 'styles' => [
+ 'resources/src/mediawiki.apipretty/apipretty.css',
+ 'resources/src/mediawiki.apipretty/apihelp.css',
+ ],
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.api' => [
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.api' => [
@@
-1159,6
+1153,7
@@
return [
'upload-form-label-usage-filename',
'action-upload',
'apierror-mustbeloggedin',
'upload-form-label-usage-filename',
'action-upload',
'apierror-mustbeloggedin',
+ 'apierror-permissiondenied',
'badaccess-groups',
'apierror-timeout',
'apierror-offline',
'badaccess-groups',
'apierror-timeout',
'apierror-offline',