Merge remote branch 'kamicane/master'

Conflicts: Source/Color.js
anutron · Mar 31, 2010 · 7c58a78 · 7c58a78
2 parents 10d8fb1 + c786acd
commit 7c58a78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Source/Color.js b/Source/Color.js
@@ -1,14 +1,15 @@
 /*
 ---
 name: Color
-description: Class to create and manipulate colors. Includes HSB «-» RGB «-» HEX conversions.
-provides: [Color]
+description: Class to create and manipulate colors. Includes HSB «-» RGB «-» HEX conversions. Supports alpha for each type.
+requires: [Core/Type, Core/Array]
+provides: Color
 ...
 */
 
 (function(){
 
-this.Color = function(color, type){
+var Color = this.Color = function(color, type){
 
 	if (color.isColor){
 
@@ -148,4 +149,6 @@ Color.rgb = function(r, g, b, a){
 
 if (this.rgb == null) this.rgb = Color.rgb;
 
+if (this.Type) new Type('Color', Color);
+
 })();
diff --git a/package.yml b/package.yml
@@ -14,7 +14,7 @@ author: kamicane
 
 category: Types
 
-tags: [color, niceness, colorful, happyness]
+tags: [color, parsers]
 
 sources:
-  - "Source/Color.js"
+  - "Source/Color.js"