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 "Remove unused method Title::validateFileMoveOperation()"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
380865c
..
6fcf370
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-288,9
+288,6
@@
return [
'messages' => [ 'collapsible-expand', 'collapsible-collapse' ],
'targets' => [ 'desktop', 'mobile' ],
],
'messages' => [ 'collapsible-expand', 'collapsible-collapse' ],
'targets' => [ 'desktop', 'mobile' ],
],
- 'jquery.mockjax' => [
- 'scripts' => 'resources/lib/jquery.mockjax.js',
- ],
'jquery.mw-jump' => [
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
'jquery.mw-jump' => [
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
@@
-343,9
+340,6
@@
return [
'scripts' => 'resources/lib/jquery.ba-throttle-debounce.js',
'targets' => [ 'desktop', 'mobile' ],
],
'scripts' => 'resources/lib/jquery.ba-throttle-debounce.js',
'targets' => [ 'desktop', 'mobile' ],
],
- 'jquery.xmldom' => [
- 'scripts' => 'resources/lib/jquery.xmldom.js',
- ],
/* jQuery Tipsy */
/* jQuery Tipsy */
@@
-643,7
+637,7
@@
return [
'group' => 'jquery.ui',
'targets' => [ 'desktop', 'mobile' ],
],
'group' => 'jquery.ui',
'targets' => [ 'desktop', 'mobile' ],
],
- // Effects
+
'jquery.effects.core' => [
'deprecated' => true,
'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect.js',
'jquery.effects.core' => [
'deprecated' => true,
'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect.js',
@@
-840,6
+834,7
@@
return [
],
'dependencies' => [
'mediawiki.language',
],
'dependencies' => [
'mediawiki.language',
+ 'mediawiki.RegExp',
],
'targets' => [ 'desktop', 'mobile' ],
],
],
'targets' => [ 'desktop', 'mobile' ],
],
@@
-914,9
+909,15
@@
return [
],
],
'mediawiki.diff.styles' => [
],
],
'mediawiki.diff.styles' => [
+ // FIXME: Remove class and lessMessages
+ // when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+ // been in production for 1 week.
'class' => ResourceLoaderLessVarFileModule::class,
'styles' => [
'class' => ResourceLoaderLessVarFileModule::class,
'styles' => [
- 'resources/src/mediawiki.diff.styles/header.less',
+ // Remove resources/src/mediawiki.interface.helpers.styles.less
+ // when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+ // been in production for 1 week.
+ 'resources/src/mediawiki.interface.helpers.styles.less',
'resources/src/mediawiki.diff.styles/diff.css',
'resources/src/mediawiki.diff.styles/print.css' => [
'media' => 'print'
'resources/src/mediawiki.diff.styles/diff.css',
'resources/src/mediawiki.diff.styles/print.css' => [
'media' => 'print'
@@
-925,6
+926,7
@@
return [
'lessMessages' => [
'parentheses-start',
'parentheses-end',
'lessMessages' => [
'parentheses-start',
'parentheses-end',
+ 'pipe-separator'
],
'targets' => [ 'desktop', 'mobile' ],
],
],
'targets' => [ 'desktop', 'mobile' ],
],
@@
-1184,7
+1186,7
@@
return [
'remoteBasePath' => "$wgResourceBasePath/resources/src",
'packageFiles' => [
'mediawiki.ForeignStructuredUpload.js',
'remoteBasePath' => "$wgResourceBasePath/resources/src",
'packageFiles' => [
'mediawiki.ForeignStructuredUpload.js',
-
'config.json' => [
'config' => [ 'UploadDialog' ] ],
+
[ 'name' => 'config.json',
'config' => [ 'UploadDialog' ] ],
],
'dependencies' => [
'mediawiki.ForeignUpload',
],
'dependencies' => [
'mediawiki.ForeignUpload',
@@
-1317,6
+1319,9
@@
return [
'dependencies' => [
'mediawiki.api',
'mediawiki.storage',
'dependencies' => [
'mediawiki.api',
'mediawiki.storage',
+ // The two user.* modules are not used by mediawiki.user itself,
+ // but kept as explicit dependencies because they provide part
+ // of the mw.user API that consumers of this module expect.
'user.options',
'user.tokens',
],
'user.options',
'user.tokens',
],
@@
-1334,7
+1339,7
@@
return [
'remoteBasePath' => "$wgResourceBasePath/resources/src",
'packageFiles' => [
'mediawiki.util.js',
'remoteBasePath' => "$wgResourceBasePath/resources/src",
'packageFiles' => [
'mediawiki.util.js',
-
'config.json' => [
'config' => [ 'FragmentMode' ] ],
+
[ 'name' => 'config.json',
'config' => [ 'FragmentMode' ] ],
],
'dependencies' => [
'jquery.accessKeyLabel',
],
'dependencies' => [
'jquery.accessKeyLabel',
@@
-1581,7
+1586,7
@@
return [
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.jqueryMsg",
'packageFiles' => [
'mediawiki.jqueryMsg.js',
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.jqueryMsg",
'packageFiles' => [
'mediawiki.jqueryMsg.js',
-
'parserDefaults.json' => [
'callback' => function ( ResourceLoaderContext $context ) {
+
[ 'name' => 'parserDefaults.json',
'callback' => function ( ResourceLoaderContext $context ) {
$tagData = Sanitizer::getRecognizedTagData();
$allowedHtmlElements = array_merge(
array_keys( $tagData['htmlpairs'] ),
$tagData = Sanitizer::getRecognizedTagData();
$allowedHtmlElements = array_merge(
array_keys( $tagData['htmlpairs'] ),
@@
-1626,7
+1631,7
@@
return [
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.language",
'packageFiles' => [
'mediawiki.language.names.js',
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.language",
'packageFiles' => [
'mediawiki.language.names.js',
-
'names.json' => [
'callback' => function ( ResourceLoaderContext $context ) {
+
[ 'name' => 'names.json',
'callback' => function ( ResourceLoaderContext $context ) {
return Language::fetchLanguageNames( $context->getLanguage(), 'all' );
} ],
],
return Language::fetchLanguageNames( $context->getLanguage(), 'all' );
} ],
],
@@
-1813,6
+1818,7
@@
return [
'dm/ItemModel.js',
'dm/SavedQueriesModel.js',
'dm/SavedQueryItemModel.js',
'dm/ItemModel.js',
'dm/SavedQueriesModel.js',
'dm/SavedQueryItemModel.js',
+ [ 'name' => 'config.json', 'config' => [ 'StructuredChangeFiltersLiveUpdatePollingRate' ] ],
],
'dependencies' => [
'mediawiki.String',
],
'dependencies' => [
'mediawiki.String',
@@
-1866,6
+1872,7
@@
return [
'ui/RclTargetPageWidget.js',
'ui/RclToOrFromWidget.js',
'ui/WatchlistTopSectionWidget.js',
'ui/RclTargetPageWidget.js',
'ui/RclToOrFromWidget.js',
'ui/WatchlistTopSectionWidget.js',
+ [ 'name' => 'config.json', 'callback' => 'ChangesListSpecialPage::getRcFiltersConfigVars' ],
],
'styles' => [
'styles/mw.rcfilters.mixins.less',
],
'styles' => [
'styles/mw.rcfilters.mixins.less',
@@
-2005,6
+2012,20
@@
return [
'oojs-ui.styles.icons-media',
],
],
'oojs-ui.styles.icons-media',
],
],
+ 'mediawiki.interface.helpers.styles' => [
+ 'class' => ResourceLoaderLessVarFileModule::class,
+ 'lessMessages' => [
+ 'parentheses-start',
+ 'parentheses-end',
+ 'pipe-separator'
+ ],
+ 'styles' => [
+ 'resources/src/mediawiki.interface.helpers.styles.less',
+ ],
+ 'targets' => [
+ 'desktop', 'mobile'
+ ],
+ ],
'mediawiki.special' => [
'styles' => [
'resources/src/mediawiki.special/special.less',
'mediawiki.special' => [
'styles' => [
'resources/src/mediawiki.special/special.less',
@@
-2120,13
+2141,21
@@
return [
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.special.changeslist' => [
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.special.changeslist' => [
+ // FIXME: Remove class and lessMessages
+ // when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+ // been in production for 1 week.
'class' => ResourceLoaderLessVarFileModule::class,
'lessMessages' => [
'parentheses-start',
'parentheses-end',
'pipe-separator'
],
'class' => ResourceLoaderLessVarFileModule::class,
'lessMessages' => [
'parentheses-start',
'parentheses-end',
'pipe-separator'
],
- 'styles' => 'resources/src/mediawiki.special.changeslist.less',
+ 'styles' => [
+ // FIXME: Remove this line when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+ // been in production for 1 week.
+ 'resources/src/mediawiki.interface.helpers.styles.less',
+ 'resources/src/mediawiki.special.changeslist.less',
+ ],
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.special.changeslist.enhanced' => [
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.special.changeslist.enhanced' => [
@@
-2357,6
+2386,7
@@
return [
'dependencies' => [
'mediawiki.api',
'mediawiki.jqueryMsg',
'dependencies' => [
'mediawiki.api',
'mediawiki.jqueryMsg',
+ 'mediawiki.notify',
'mediawiki.Title',
'mediawiki.util',
'oojs-ui-core',
'mediawiki.Title',
'mediawiki.util',
'oojs-ui-core',
@@
-2388,7
+2418,7
@@
return [
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.legacy",
'packageFiles' => [
'protect.js',
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.legacy",
'packageFiles' => [
'protect.js',
-
'config.json' => [
'config' => [ 'CascadingRestrictionLevels' ] ],
+
[ 'name' => 'config.json',
'config' => [ 'CascadingRestrictionLevels' ] ],
],
'dependencies' => 'jquery.lengthLimit',
'messages' => [ 'protect-unchain-permissions' ]
],
'dependencies' => 'jquery.lengthLimit',
'messages' => [ 'protect-unchain-permissions' ]
@@
-2637,6
+2667,7
@@
return [
'period-pm',
],
'dependencies' => [
'period-pm',
],
'dependencies' => [
+ 'mediawiki.RegExp',
'oojs-ui-core',
'oojs-ui.styles.icons-moderation',
'oojs-ui.styles.icons-movement',
'oojs-ui-core',
'oojs-ui.styles.icons-moderation',
'oojs-ui.styles.icons-movement',