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 "resourceloader: Remove getters for private constants in mw.loader.store"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
6298086
..
980bdc4
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',
@@
-1159,6
+1154,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',
@@
-1526,7
+1522,9
@@
return [
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.jqueryMsg",
'packageFiles' => [
'mediawiki.jqueryMsg.js',
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.jqueryMsg",
'packageFiles' => [
'mediawiki.jqueryMsg.js',
- [ 'name' => 'parserDefaults.json', 'callback' => function ( ResourceLoaderContext $context ) {
+ [ 'name' => 'parserDefaults.json', 'callback' => function (
+ ResourceLoaderContext $context, Config $config
+ ) {
$tagData = Sanitizer::getRecognizedTagData();
$allowedHtmlElements = array_merge(
array_keys( $tagData['htmlpairs'] ),
$tagData = Sanitizer::getRecognizedTagData();
$allowedHtmlElements = array_merge(
array_keys( $tagData['htmlpairs'] ),
@@
-1537,7
+1535,7
@@
return [
);
$magicWords = [
);
$magicWords = [
- 'SITENAME' => $con
text->getConfig()
->get( 'Sitename' ),
+ 'SITENAME' => $con
fig
->get( 'Sitename' ),
];
Hooks::run( 'ResourceLoaderJqueryMsgModuleMagicWords', [ $context, &$magicWords ] );
];
Hooks::run( 'ResourceLoaderJqueryMsgModuleMagicWords', [ $context, &$magicWords ] );
@@
-1738,6
+1736,7
@@
return [
/* MediaWiki Special pages */
'mediawiki.rcfilters.filters.base.styles' => [
/* MediaWiki Special pages */
'mediawiki.rcfilters.filters.base.styles' => [
+ 'targets' => [ 'desktop', 'mobile' ],
'skinStyles' => [
'default' => 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',
],
'skinStyles' => [
'default' => 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',
],
@@
-1751,6
+1750,7
@@
return [
],
],
'mediawiki.rcfilters.filters.dm' => [
],
],
'mediawiki.rcfilters.filters.dm' => [
+ 'targets' => [ 'desktop', 'mobile' ],
'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
'packageFiles' => [
'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
'packageFiles' => [
@@
-1781,6
+1781,7
@@
return [
],
],
'mediawiki.rcfilters.filters.ui' => [
],
],
'mediawiki.rcfilters.filters.ui' => [
+ 'targets' => [ 'desktop', 'mobile' ],
'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
'packageFiles' => [
'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
'packageFiles' => [
@@
-1851,6
+1852,7
@@
return [
'styles/mw.rcfilters.ui.RclToOrFromWidget.less',
'styles/mw.rcfilters.ui.RclTargetPageWidget.less',
'styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less',
'styles/mw.rcfilters.ui.RclToOrFromWidget.less',
'styles/mw.rcfilters.ui.RclTargetPageWidget.less',
'styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less',
+ 'styles/mw.rcfilters.ui.FilterTagMultiselectWidgetMobile.less'
],
'skinStyles' => [
'vector' => [
],
'skinStyles' => [
'vector' => [
@@
-1898,6
+1900,7
@@
return [
'rcfilters-clear-all-filters',
'rcfilters-show-new-changes',
'rcfilters-search-placeholder',
'rcfilters-clear-all-filters',
'rcfilters-show-new-changes',
'rcfilters-search-placeholder',
+ 'rcfilters-search-placeholder-mobile',
'rcfilters-invalid-filter',
'rcfilters-empty-filter',
'rcfilters-filterlist-title',
'rcfilters-invalid-filter',
'rcfilters-empty-filter',
'rcfilters-filterlist-title',
@@
-1959,6
+1962,7
@@
return [
'oojs-ui.styles.icons-interactions',
'oojs-ui.styles.icons-layout',
'oojs-ui.styles.icons-media',
'oojs-ui.styles.icons-interactions',
'oojs-ui.styles.icons-layout',
'oojs-ui.styles.icons-media',
+ 'oojs-ui-windows.icons'
],
],
'mediawiki.interface.helpers.styles' => [
],
],
'mediawiki.interface.helpers.styles' => [
@@
-1966,6
+1970,8
@@
return [
'lessMessages' => [
'parentheses-start',
'parentheses-end',
'lessMessages' => [
'parentheses-start',
'parentheses-end',
+ 'brackets-start',
+ 'brackets-end',
'pipe-separator'
],
'skinStyles' => [
'pipe-separator'
],
'skinStyles' => [