From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sat, 3 Jun 2017 12:15:04 +0000 (+0200)
Subject: Add appropriate OOjs UI icon pack dependencies for OOjs UI itself
X-Git-Tag: 1.31.0-rc.0~3041^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=70471939f99abe606f2a14df21fb966a79ca53c0;p=lhc%2Fweb%2Fwiklou.git

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 df948f0cba..24a506c7aa 100644
--- 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 c4baab7b06..1b607ce631 100644
--- 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',