Add appropriate OOjs UI icon pack dependencies for OOjs UI itself

Ridiculous? Why yes, yes it is. See T166948.

Bug: T166730
Bug: T166948
Change-Id: I6428ca0d44d8773486230445e466bd5de272e873

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index df948f0..24a506c 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3977,6 +3977,9 @@ class OutputPage extends ContextSource {
                        'oojs-ui.styles.indicators',
                        'oojs-ui.styles.textures',
                        'mediawiki.widgets.styles',
+                       'oojs-ui.styles.icons-content',
+                       'oojs-ui.styles.icons-alerts',
+                       'oojs-ui.styles.icons-interactions',
                ] );
        }
 

diff --git a/resources/Resources.php b/resources/Resources.php
index c4baab7..1b607ce 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2587,6 +2587,9 @@ return [
                        'oojs-ui.styles.indicators',
                        'oojs-ui.styles.textures',
                        'mediawiki.language',
+                       'oojs-ui.styles.icons-content',
+                       'oojs-ui.styles.icons-alerts',
+                       'oojs-ui.styles.icons-interactions',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -2602,7 +2605,14 @@ return [
                'class' => 'ResourceLoaderOOUIFileModule',
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js',
                'themeStyles' => 'widgets',
-               'dependencies' => 'oojs-ui-core',
+               'dependencies' => [
+                       'oojs-ui-core',
+                       'oojs-ui.styles.icons-interactions',
+                       'oojs-ui.styles.icons-content',
+                       'oojs-ui.styles.icons-editing-advanced',
+                       'oojs-ui.styles.icons-movement',
+                       'oojs-ui.styles.icons-moderation',
+               ],
                'messages' => [
                        'ooui-outline-control-move-down',
                        'ooui-outline-control-move-up',
@@ -2619,7 +2629,10 @@ return [
                'class' => 'ResourceLoaderOOUIFileModule',
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-toolbars.js',
                'themeStyles' => 'toolbars',
-               'dependencies' => 'oojs-ui-core',
+               'dependencies' => [
+                       'oojs-ui-core',
+                       'oojs-ui.styles.icons-movement',
+               ],
                'messages' => [
                        'ooui-toolbar-more',
                        'ooui-toolgroup-collapse',
@@ -2632,7 +2645,10 @@ return [
                'class' => 'ResourceLoaderOOUIFileModule',
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-windows.js',
                'themeStyles' => 'windows',
-               'dependencies' => 'oojs-ui-core',
+               'dependencies' => [
+                       'oojs-ui-core',
+                       'oojs-ui.styles.icons-movement',
+               ],
                'messages' => [
                        'ooui-dialog-message-accept',
                        'ooui-dialog-message-reject',