jquery.color: Merge $.colorUtil back into this module

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

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

@@ -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

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",

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' => [

tests/qunit/QUnitTestResources.php

@@ -102,7 +102,6 @@ return [
 		],
 		'dependencies' => [
 			'jquery.color',
-			'jquery.colorUtil',
 			'jquery.getAttrs',
 			'jquery.highlightText',
 			'jquery.lengthLimit',