1 files changed, 4 insertions, 13 deletions

diff --git a/frontend/gamma/js/MochiKit/Color.js b/frontend/gamma/js/MochiKit/Color.js
index 27dc2d0..f2a0f67 100644
--- a/frontend/gamma/js/MochiKit/Color.js
+++ b/frontend/gamma/js/MochiKit/Color.js
@@ -1,23 +1,23 @@
 /***
 
 MochiKit.Color 1.5
 
 See <http://mochikit.com/> for documentation, downloads, license, etc.
 
 (c) 2005 Bob Ippolito and others.  All rights Reserved.
 
 ***/
 
-MochiKit.Base._module('Color', '1.5', ['Base', 'DOM', 'Style']);
+MochiKit.Base.module(MochiKit, 'Color', '1.5', ['Base', 'DOM', 'Style']);
 
 /** @id MochiKit.Color.Color */
 MochiKit.Color.Color = function (red, green, blue, alpha) {
     if (typeof(alpha) == 'undefined' || alpha === null) {
         alpha = 1.0;
     }
     this.rgb = {
         r: red,
         g: green,
         b: blue,
         a: alpha
     };
@@ -103,25 +103,25 @@ MochiKit.Color.Color.prototype = {
     /** @id MochiKit.Color.Color.prototype.compareRGB */
     compareRGB: function (other) {
         var a = this.asRGB();
         var b = other.asRGB();
         return MochiKit.Base.compare(
             [a.r, a.g, a.b, a.a],
             [b.r, b.g, b.b, b.a]
         );
     },
 
     /** @id MochiKit.Color.Color.prototype.isLight */
     isLight: function () {
-        return this.asHSL().b > 0.5;
+        return this.asHSL().l > 0.5;
     },
 
     /** @id MochiKit.Color.Color.prototype.isDark */
     isDark: function () {
         return (!this.isLight());
     },
 
     /** @id MochiKit.Color.Color.prototype.toHSLString */
     toHSLString: function () {
         var c = this.asHSL();
         var ccc = MochiKit.Color.clampColorComponent;
         var rval = this._hslString;
@@ -632,37 +632,28 @@ MochiKit.Base.update(MochiKit.Color, {
             /** @id MochiKit.Color.purpleColor */
             purple: [0.5, 0, 0.5],
             /** @id MochiKit.Color.redColor */
             red: [1, 0, 0],
             /** @id MochiKit.Color.transparentColor */
             transparent: [0, 0, 0, 0],
             /** @id MochiKit.Color.whiteColor */
             white: [1, 1, 1],
             /** @id MochiKit.Color.yellowColor */
             yellow: [1, 1, 0]
         };
 
-        var makeColor = function (name, r, g, b, a) {
-            var rval = this.fromRGB(r, g, b, a);
-            this[name] = function () { return rval; };
-            return rval;
-        };
-
         for (var k in colors) {
             var name = k + "Color";
-            var bindArgs = m.concat(
-                [makeColor, this.Color, name],
-                colors[k]
-            );
-            this.Color[name] = m.bind.apply(null, bindArgs);
+            var value = this.Color.fromRGB.apply(this.Color, colors[k]);
+            this.Color[name] = m.partial(m.operator.identity, value);
         }
 
         var isColor = function () {
             for (var i = 0; i < arguments.length; i++) {
                 if (!(arguments[i] instanceof MochiKit.Color.Color)) {
                     return false;
                 }
             }
             return true;
         };
 
         var compareColor = function (a, b) {