OutputPage: Do not try to load non-existent 'oojs-ui.styles.icons' module

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

diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php
index b31fe82..c9b5d89 100644 (file)
--- a/resources/ResourcesOOUI.php
+++ b/resources/ResourcesOOUI.php
@@ -30,7 +30,7 @@ return call_user_func( function () {
        $themes = ExtensionRegistry::getInstance()->getAttribute( 'SkinOOUIThemes' );
        // We only use the theme names for file names, and they are lowercase
        $themes = array_map( 'strtolower', $themes );
-       $themes['default'] = 'mediawiki';
+       $themes['default'] = 'wikimediaui';
 
        // Helper function to generate paths to files used in 'skinStyles' and 'skinScripts'.
        $getSkinSpecific = function ( $module, $ext = 'css' ) use ( $themes ) {
@@ -65,9 +65,10 @@ return call_user_func( function () {
                ],
                'skinScripts' => $getSkinSpecific( null, 'js' ),
                'dependencies' => [
-                       'es5-shim',
                        'oojs',
                        'oojs-ui-core.styles',
+                       'oojs-ui.styles.indicators',
+                       'oojs-ui.styles.textures',
                        'mediawiki.language',
                ],
                'targets' => [ 'desktop', 'mobile' ],
@@ -78,14 +79,6 @@ return call_user_func( function () {
                'styles' => 'resources/src/oojs-ui-local.css', // HACK, see inside the file
                'skinStyles' => $getSkinSpecific( 'core' ),
                'targets' => [ 'desktop', 'mobile' ],
-               // ResourceLoaderImageModule doesn't support 'skipFunction', so instead we set this up so that
-               // this module is skipped together with its dependencies. Nothing else depends on these modules.
-               'dependencies' => [
-                       'oojs-ui.styles.icons',
-                       'oojs-ui.styles.indicators',
-                       'oojs-ui.styles.textures',
-               ],
-               'skipFunction' => 'resources/src/oojs-ui-styles-skip.js',
        ];
 
        // Additional widgets and layouts module.