From 01dae6ff8af05142282e8fa4b6a59305cfb7fe6c Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 10 Sep 2019 04:03:44 +0100
Subject: [PATCH] jquery.color: Merge $.colorUtil back into this module

I split this out of it back in 2011 with 83a7822df7bd0c.

I don't remember why. I think it had something to do with
Special:JavaScriptTest where I wanted to do something with colors.
Having those functions is useful in theory, but that doesn't require
its own module.

Change-Id: I8815d32c7072da83ddb9fbf955534d1f954692ba
---
 RELEASE-NOTES-1.34                                       | 1 +
 jsduck.json                                              | 2 +-
 resources/Resources.php                                  | 9 ++++-----
 resources/src/{jquery => jquery.color}/jquery.color.js   | 0
 .../src/{jquery => jquery.color}/jquery.colorUtil.js     | 0
 tests/qunit/QUnitTestResources.php                       | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)
 rename resources/src/{jquery => jquery.color}/jquery.color.js (100%)
 rename resources/src/{jquery => jquery.color}/jquery.colorUtil.js (100%)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 09195e162c..07f52d0c1b 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -302,6 +302,7 @@ because of Phabricator reports.
   Use the mediawiki.String module instead.
 * mw.language.specialCharacters, deprecated in 1.33, has been removed.
   Use require( 'mediawiki.language.specialCharacters' ) instead.
+* The jquery.colorUtil module was removed. Use jquery.color instead.
 * EditPage::submit(), deprecated in 1.29, has been removed. Use $this->edit()
   directly.
 * HTMLForm::getErrors(), deprecated in 1.28, has been removed. Use
diff --git a/jsduck.json b/jsduck.json
index 6ba7796162..e675889a53 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -12,7 +12,7 @@
 	"--exclude": [
 		"resources/src/jquery.tablesorter",
 		"resources/src/jquery.tipsy",
-		"resources/src/jquery/jquery.color.js",
+		"resources/src/jquery.color/jquery.color.js",
 		"resources/src/jquery/jquery.highlightText.js",
 		"resources/src/jquery/jquery.mw-jump.js",
 		"resources/src/mediawiki.base/legacy.wikibits.js",
diff --git a/resources/Resources.php b/resources/Resources.php
index 1388128fc0..48b7feeed3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -175,11 +175,10 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.color' => [
-		'scripts' => 'resources/src/jquery/jquery.color.js',
-		'dependencies' => 'jquery.colorUtil',
-	],
-	'jquery.colorUtil' => [
-		'scripts' => 'resources/src/jquery/jquery.colorUtil.js',
+		'scripts' => [
+			'resources/src/jquery.color/jquery.colorUtil.js',
+			'resources/src/jquery.color/jquery.color.js',
+		],
 	],
 	'jquery.confirmable' => [
 		'scripts' => [
diff --git a/resources/src/jquery/jquery.color.js b/resources/src/jquery.color/jquery.color.js
similarity index 100%
rename from resources/src/jquery/jquery.color.js
rename to resources/src/jquery.color/jquery.color.js
diff --git a/resources/src/jquery/jquery.colorUtil.js b/resources/src/jquery.color/jquery.colorUtil.js
similarity index 100%
rename from resources/src/jquery/jquery.colorUtil.js
rename to resources/src/jquery.color/jquery.colorUtil.js
diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index cab6c3bf99..a3a165f0a2 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -102,7 +102,6 @@ return [
 		],
 		'dependencies' => [
 			'jquery.color',
-			'jquery.colorUtil',
 			'jquery.getAttrs',
 			'jquery.highlightText',
 			'jquery.lengthLimit',
-- 
2.20.1