Revert "Temporarily trim leading/trailing whitespace from parser test clauses"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 2d45a8d..86bca6c 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -905,25 +905,12 @@ return [
                ],
        ],
        'mediawiki.diff.styles' => [
-               // FIXME: Remove class and lessMessages
-               // when I6aad563e48f41c783df8b176a4f437e60a1255cc has
-               // been in production for 1 week.
-               'class' => ResourceLoaderLessVarFileModule::class,
                'styles' => [
-                       // 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'
                        ],
                ],
-               'lessMessages' => [
-                       'parentheses-start',
-                       'parentheses-end',
-                       'pipe-separator'
-               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.feedback' => [
@@ -1354,7 +1341,17 @@ return [
                'styles' => 'resources/src/mediawiki.checkboxtoggle.styles.css',
        ],
        'mediawiki.cookie' => [
-               'scripts' => 'resources/src/mediawiki.cookie.js',
+               'localBasePath' => "$IP/resources/src/mediawiki.cookie",
+               'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.cookie",
+               'packageFiles' => [
+                       'index.js',
+                       [ 'name' => 'config.json', 'config' => [
+                               'prefix' => 'CookiePrefix',
+                               'domain' => 'CookieDomain',
+                               'path' => 'CookiePath',
+                               'expires' => 'CookieExpiration'
+                       ] ],
+               ],
                'dependencies' => 'jquery.cookie',
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -2137,19 +2134,7 @@ return [
                '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'
-               ],
                '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' ],
@@ -2344,6 +2329,7 @@ return [
                        'createacct-emailrequired',
                        'noname',
                        'userexists',
+                       'createacct-normalization',
                ],
                'dependencies' => [
                        'mediawiki.api',
@@ -2790,6 +2776,7 @@ return [
        'mediawiki.widgets.NamespacesMultiselectWidget' => [
                'scripts' => [
                        'resources/src/mediawiki.widgets/mw.widgets.NamespacesMultiselectWidget.js',
+                       'resources/src/mediawiki.widgets/mw.widgets.NamespacesMenuOptionWidget.js',
                ],
                'dependencies' => [
                        'oojs-ui-widgets',