Merge "media: Add missing return to MediaTransformOutput::streamFile"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index e8466b7..0385d80 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -175,6 +175,7 @@ return [
        ],
        'jquery.async' => [
                'scripts' => 'resources/lib/jquery.async.js',
+               'deprecated' => true,
        ],
        'jquery.byteLength' => [
                'scripts' => 'resources/src/jquery/jquery.byteLength.js',
@@ -284,10 +285,6 @@ return [
                'dependencies' => 'mediawiki.String',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'jquery.localize' => [
-               'scripts' => 'resources/src/jquery/jquery.localize.js',
-               'deprecated' => 'Please use "jquery.i18n" instead.',
-       ],
        'jquery.makeCollapsible' => [
                'dependencies' => [ 'jquery.makeCollapsible.styles' ],
                'scripts' => 'resources/src/jquery/jquery.makeCollapsible.js',
@@ -1375,7 +1372,6 @@ return [
                'dependencies' => [
                        'jquery.accessKeyLabel',
                        'mediawiki.RegExp',
-                       'mediawiki.notify',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -1394,12 +1390,6 @@ return [
                'dependencies' => 'jquery.cookie',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.toolbar' => [
-               'class' => ResourceLoaderEditToolbarModule::class,
-               'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
-               'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
-               'dependencies' => 'jquery.textSelection',
-       ],
        'mediawiki.experiments' => [
                'scripts' => 'resources/src/mediawiki.experiments.js',
                'targets' => [ 'desktop', 'mobile' ],
@@ -2089,7 +2079,13 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.changeslist' => [
-               'styles' => 'resources/src/mediawiki.special.changeslist.css',
+               'class' => ResourceLoaderLessVarFileModule::class,
+               'lessMessages' => [
+                       'parentheses-start',
+                       'parentheses-end',
+                       'pipe-separator'
+               ],
+               'styles' => 'resources/src/mediawiki.special.changeslist.less',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.changeslist.enhanced' => [
@@ -2482,6 +2478,21 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       'mediawiki.widgets.AbandonEditDialog' => [
+               'scripts' => [
+                       'resources/src/mediawiki.widgets/mw.widgets.AbandonEditDialog.js',
+               ],
+               'messages' => [
+                       'mw-widgets-abandonedit',
+                       'mw-widgets-abandonedit-discard',
+                       'mw-widgets-abandonedit-keep',
+                       'mw-widgets-abandonedit-title',
+               ],
+               'dependencies' => [
+                       'oojs-ui-windows',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        'mediawiki.widgets.DateInputWidget' => [
                'scripts' => [
                        'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js',