obf 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b251556cc8a9274711c1fa358cc952f2ce280a0
-  data.tar.gz: 6ba042655211c8f6b06ec0e8f00aafdbcf744900
+  metadata.gz: 3772ad4028a2e7e780d943bfe384dacf59c17c9d
+  data.tar.gz: 76fb2dc4d209f5ad9b1fbd94f22e2fe0c6937a16
 SHA512:
-  metadata.gz: 0776169545a98e29e6f0f8c470263b3142fa2fbd0aaa248fe966e128514253221222e31bf350e65634f563b6eb9fa1dc040525353646121b6030c872d5555a83
-  data.tar.gz: 87059a2a78e79ad6015ed7ebdf44fbd8cbf7a50804d0752655937b41f441d8f138b90d45b4a7b353ce56cc3c64cbe692a42573c7a0a20f3487238d9e42019521
+  metadata.gz: 68f6499271a9b143c8c6e9b45752d5b1729e281e4b2d7bd17ffc544f0a0848cd1248e12976592523ab00c72e31a7e76210add30abba2504a92498b9e0584a174
+  data.tar.gz: 672095044ab8a2ae7cf309393456135e9ae4de967caf16d11f66a268c5500708a3d9868b8657e72af82cd61b928f2831c0c67faa99208a4c02d56de1743b8072

data/lib/tinycolor_convert.js

@@ -1,8 +1,8 @@
-// TinyColor v0.9.16
+var tiny = null;
+// TinyColor v1.1.1
 // https://github.com/bgrins/TinyColor
-// 2013-08-10, Brian Grinstead, MIT License
+// Brian Grinstead, MIT License
 
-var tiny = null;
 (function() {
 
 var trimLeft = /^[\s,#]+/,
@@ -14,154 +14,239 @@ var trimLeft = /^[\s,#]+/,
     mathMax = math.max,
     mathRandom = math.random;
 
-function tinycolor (color, opts) {
+var tinycolor = function tinycolor (color, opts) {
 
     color = (color) ? color : '';
     opts = opts || { };
 
     // If input is already a tinycolor, return itself
-    if (typeof color == "object" && color.hasOwnProperty("_tc_id")) {
+    if (color instanceof tinycolor) {
        return color;
     }
+    // If we are called as a function, call using new instead
+    if (!(this instanceof tinycolor)) {
+        return new tinycolor(color, opts);
+    }
 
     var rgb = inputToRGB(color);
-    var r = rgb.r,
-        g = rgb.g,
-        b = rgb.b,
-        a = rgb.a,
-        roundA = mathRound(100*a) / 100,
-        format = opts.format || rgb.format;
+    this._originalInput = color,
+    this._r = rgb.r,
+    this._g = rgb.g,
+    this._b = rgb.b,
+    this._a = rgb.a,
+    this._roundA = mathRound(100*this._a) / 100,
+    this._format = opts.format || rgb.format;
+    this._gradientType = opts.gradientType;
 
     // Don't let the range of [0,255] come back in [0,1].
     // Potentially lose a little bit of precision here, but will fix issues where
     // .5 gets interpreted as half of the total, instead of half of 1
     // If it was supposed to be 128, this was already taken care of by `inputToRgb`
-    if (r < 1) { r = mathRound(r); }
-    if (g < 1) { g = mathRound(g); }
-    if (b < 1) { b = mathRound(b); }
-
-    return {
-        ok: rgb.ok,
-        format: format,
-        _tc_id: tinyCounter++,
-        alpha: a,
-        getAlpha: function() {
-            return a;
-        },
-        setAlpha: function(value) {
-            a = boundAlpha(value);
-            roundA = mathRound(100*a) / 100;
-        },
-        toHsv: function() {
-            var hsv = rgbToHsv(r, g, b);
-            return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: a };
-        },
-        toHsvString: function() {
-            var hsv = rgbToHsv(r, g, b);
-            var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100);
-            return (a == 1) ?
-              "hsv("  + h + ", " + s + "%, " + v + "%)" :
-              "hsva(" + h + ", " + s + "%, " + v + "%, "+ roundA + ")";
-        },
-        toHsl: function() {
-            var hsl = rgbToHsl(r, g, b);
-            return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: a };
-        },
-        toHslString: function() {
-            var hsl = rgbToHsl(r, g, b);
-            var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100);
-            return (a == 1) ?
-              "hsl("  + h + ", " + s + "%, " + l + "%)" :
-              "hsla(" + h + ", " + s + "%, " + l + "%, "+ roundA + ")";
-        },
-        toHex: function(allow3Char) {
-            return rgbToHex(r, g, b, allow3Char);
-        },
-        toHexString: function(allow3Char) {
-            return '#' + this.toHex(allow3Char);
-        },
-        toHex8: function() {
-            return rgbaToHex(r, g, b, a);
-        },
-        toHex8String: function() {
-            return '#' + this.toHex8();
-        },
-        toRgb: function() {
-            return { r: mathRound(r), g: mathRound(g), b: mathRound(b), a: a };
-        },
-        toRgbString: function() {
-            return (a == 1) ?
-              "rgb("  + mathRound(r) + ", " + mathRound(g) + ", " + mathRound(b) + ")" :
-              "rgba(" + mathRound(r) + ", " + mathRound(g) + ", " + mathRound(b) + ", " + roundA + ")";
-        },
-        toPercentageRgb: function() {
-            return { r: mathRound(bound01(r, 255) * 100) + "%", g: mathRound(bound01(g, 255) * 100) + "%", b: mathRound(bound01(b, 255) * 100) + "%", a: a };
-        },
-        toPercentageRgbString: function() {
-            return (a == 1) ?
-              "rgb("  + mathRound(bound01(r, 255) * 100) + "%, " + mathRound(bound01(g, 255) * 100) + "%, " + mathRound(bound01(b, 255) * 100) + "%)" :
-              "rgba(" + mathRound(bound01(r, 255) * 100) + "%, " + mathRound(bound01(g, 255) * 100) + "%, " + mathRound(bound01(b, 255) * 100) + "%, " + roundA + ")";
-        },
-        toName: function() {
-            if (a === 0) {
-                return "transparent";
-            }
+    if (this._r < 1) { this._r = mathRound(this._r); }
+    if (this._g < 1) { this._g = mathRound(this._g); }
+    if (this._b < 1) { this._b = mathRound(this._b); }
 
-            return hexNames[rgbToHex(r, g, b, true)] || false;
-        },
-        toFilter: function(secondColor) {
-            var hex8String = '#' + rgbaToHex(r, g, b, a);
-            var secondHex8String = hex8String;
-            var gradientType = opts && opts.gradientType ? "GradientType = 1, " : "";
+    this._ok = rgb.ok;
+    this._tc_id = tinyCounter++;
+};
 
-            if (secondColor) {
-                var s = tinycolor(secondColor);
-                secondHex8String = s.toHex8String();
-            }
+tinycolor.prototype = {
+    isDark: function() {
+        return this.getBrightness() < 128;
+    },
+    isLight: function() {
+        return !this.isDark();
+    },
+    isValid: function() {
+        return this._ok;
+    },
+    getOriginalInput: function() {
+      return this._originalInput;
+    },
+    getFormat: function() {
+        return this._format;
+    },
+    getAlpha: function() {
+        return this._a;
+    },
+    getBrightness: function() {
+        var rgb = this.toRgb();
+        return (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;
+    },
+    setAlpha: function(value) {
+        this._a = boundAlpha(value);
+        this._roundA = mathRound(100*this._a) / 100;
+        return this;
+    },
+    toHsv: function() {
+        var hsv = rgbToHsv(this._r, this._g, this._b);
+        return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: this._a };
+    },
+    toHsvString: function() {
+        var hsv = rgbToHsv(this._r, this._g, this._b);
+        var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100);
+        return (this._a == 1) ?
+          "hsv("  + h + ", " + s + "%, " + v + "%)" :
+          "hsva(" + h + ", " + s + "%, " + v + "%, "+ this._roundA + ")";
+    },
+    toHsl: function() {
+        var hsl = rgbToHsl(this._r, this._g, this._b);
+        return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: this._a };
+    },
+    toHslString: function() {
+        var hsl = rgbToHsl(this._r, this._g, this._b);
+        var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100);
+        return (this._a == 1) ?
+          "hsl("  + h + ", " + s + "%, " + l + "%)" :
+          "hsla(" + h + ", " + s + "%, " + l + "%, "+ this._roundA + ")";
+    },
+    toHex: function(allow3Char) {
+        return rgbToHex(this._r, this._g, this._b, allow3Char);
+    },
+    toHexString: function(allow3Char) {
+        return '#' + this.toHex(allow3Char);
+    },
+    toHex8: function() {
+        return rgbaToHex(this._r, this._g, this._b, this._a);
+    },
+    toHex8String: function() {
+        return '#' + this.toHex8();
+    },
+    toRgb: function() {
+        return { r: mathRound(this._r), g: mathRound(this._g), b: mathRound(this._b), a: this._a };
+    },
+    toRgbString: function() {
+        return (this._a == 1) ?
+          "rgb("  + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ")" :
+          "rgba(" + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ", " + this._roundA + ")";
+    },
+    toPercentageRgb: function() {
+        return { r: mathRound(bound01(this._r, 255) * 100) + "%", g: mathRound(bound01(this._g, 255) * 100) + "%", b: mathRound(bound01(this._b, 255) * 100) + "%", a: this._a };
+    },
+    toPercentageRgbString: function() {
+        return (this._a == 1) ?
+          "rgb("  + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%)" :
+          "rgba(" + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%, " + this._roundA + ")";
+    },
+    toName: function() {
+        if (this._a === 0) {
+            return "transparent";
+        }
 
-            return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr="+hex8String+",endColorstr="+secondHex8String+")";
-        },
-        toString: function(format) {
-            var formatSet = !!format;
-            format = format || this.format;
+        if (this._a < 1) {
+            return false;
+        }
 
-            var formattedString = false;
-            var hasAlphaAndFormatNotSet = !formatSet && a < 1 && a > 0;
-            var formatWithAlpha = hasAlphaAndFormatNotSet && (format === "hex" || format === "hex6" || format === "hex3" || format === "name");
+        return hexNames[rgbToHex(this._r, this._g, this._b, true)] || false;
+    },
+    toFilter: function(secondColor) {
+        var hex8String = '#' + rgbaToHex(this._r, this._g, this._b, this._a);
+        var secondHex8String = hex8String;
+        var gradientType = this._gradientType ? "GradientType = 1, " : "";
 
-            if (format === "rgb") {
-                formattedString = this.toRgbString();
-            }
-            if (format === "prgb") {
-                formattedString = this.toPercentageRgbString();
-            }
-            if (format === "hex" || format === "hex6") {
-                formattedString = this.toHexString();
-            }
-            if (format === "hex3") {
-                formattedString = this.toHexString(true);
-            }
-            if (format === "hex8") {
-                formattedString = this.toHex8String();
-            }
-            if (format === "name") {
-                formattedString = this.toName();
-            }
-            if (format === "hsl") {
-                formattedString = this.toHslString();
-            }
-            if (format === "hsv") {
-                formattedString = this.toHsvString();
-            }
+        if (secondColor) {
+            var s = tinycolor(secondColor);
+            secondHex8String = s.toHex8String();
+        }
 
-            if (formatWithAlpha) {
-                return this.toRgbString();
+        return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr="+hex8String+",endColorstr="+secondHex8String+")";
+    },
+    toString: function(format) {
+        var formatSet = !!format;
+        format = format || this._format;
+
+        var formattedString = false;
+        var hasAlpha = this._a < 1 && this._a >= 0;
+        var needsAlphaFormat = !formatSet && hasAlpha && (format === "hex" || format === "hex6" || format === "hex3" || format === "name");
+
+        if (needsAlphaFormat) {
+            // Special case for "transparent", all other non-alpha formats
+            // will return rgba when there is transparency.
+            if (format === "name" && this._a === 0) {
+                return this.toName();
             }
-
-            return formattedString || this.toHexString();
+            return this.toRgbString();
         }
-    };
-}
+        if (format === "rgb") {
+            formattedString = this.toRgbString();
+        }
+        if (format === "prgb") {
+            formattedString = this.toPercentageRgbString();
+        }
+        if (format === "hex" || format === "hex6") {
+            formattedString = this.toHexString();
+        }
+        if (format === "hex3") {
+            formattedString = this.toHexString(true);
+        }
+        if (format === "hex8") {
+            formattedString = this.toHex8String();
+        }
+        if (format === "name") {
+            formattedString = this.toName();
+        }
+        if (format === "hsl") {
+            formattedString = this.toHslString();
+        }
+        if (format === "hsv") {
+            formattedString = this.toHsvString();
+        }
+
+        return formattedString || this.toHexString();
+    },
+
+    _applyModification: function(fn, args) {
+        var color = fn.apply(null, [this].concat([].slice.call(args)));
+        this._r = color._r;
+        this._g = color._g;
+        this._b = color._b;
+        this.setAlpha(color._a);
+        return this;
+    },
+    lighten: function() {
+        return this._applyModification(lighten, arguments);
+    },
+    brighten: function() {
+        return this._applyModification(brighten, arguments);
+    },
+    darken: function() {
+        return this._applyModification(darken, arguments);
+    },
+    desaturate: function() {
+        return this._applyModification(desaturate, arguments);
+    },
+    saturate: function() {
+        return this._applyModification(saturate, arguments);
+    },
+    greyscale: function() {
+        return this._applyModification(greyscale, arguments);
+    },
+    spin: function() {
+        return this._applyModification(spin, arguments);
+    },
+
+    _applyCombination: function(fn, args) {
+        return fn.apply(null, [this].concat([].slice.call(args)));
+    },
+    analogous: function() {
+        return this._applyCombination(analogous, arguments);
+    },
+    complement: function() {
+        return this._applyCombination(complement, arguments);
+    },
+    monochromatic: function() {
+        return this._applyCombination(monochromatic, arguments);
+    },
+    splitcomplement: function() {
+        return this._applyCombination(splitcomplement, arguments);
+    },
+    triad: function() {
+        return this._applyCombination(triad, arguments);
+    },
+    tetrad: function() {
+        return this._applyCombination(tetrad, arguments);
+    }
+};
 
 // If input is an object, force 1 into "1.0" to handle ratios properly
 // String input requires "1.0" as input, so 1 will be treated as 1
@@ -441,50 +526,72 @@ tinycolor.random = function() {
 // Thanks to less.js for some of the basics here
 // <https://github.com/cloudhead/less.js/blob/master/lib/less/functions.js>
 
-tinycolor.desaturate = function (color, amount) {
+function desaturate(color, amount) {
     amount = (amount === 0) ? 0 : (amount || 10);
     var hsl = tinycolor(color).toHsl();
     hsl.s -= amount / 100;
     hsl.s = clamp01(hsl.s);
     return tinycolor(hsl);
-};
-tinycolor.saturate = function (color, amount) {
+}
+
+function saturate(color, amount) {
     amount = (amount === 0) ? 0 : (amount || 10);
     var hsl = tinycolor(color).toHsl();
     hsl.s += amount / 100;
     hsl.s = clamp01(hsl.s);
     return tinycolor(hsl);
-};
-tinycolor.greyscale = function(color) {
-    return tinycolor.desaturate(color, 100);
-};
-tinycolor.lighten = function(color, amount) {
+}
+
+function greyscale(color) {
+    return tinycolor(color).desaturate(100);
+}
+
+function lighten (color, amount) {
     amount = (amount === 0) ? 0 : (amount || 10);
     var hsl = tinycolor(color).toHsl();
     hsl.l += amount / 100;
     hsl.l = clamp01(hsl.l);
     return tinycolor(hsl);
-};
-tinycolor.darken = function (color, amount) {
+}
+
+function brighten(color, amount) {
+    amount = (amount === 0) ? 0 : (amount || 10);
+    var rgb = tinycolor(color).toRgb();
+    rgb.r = mathMax(0, mathMin(255, rgb.r - mathRound(255 * - (amount / 100))));
+    rgb.g = mathMax(0, mathMin(255, rgb.g - mathRound(255 * - (amount / 100))));
+    rgb.b = mathMax(0, mathMin(255, rgb.b - mathRound(255 * - (amount / 100))));
+    return tinycolor(rgb);
+}
+
+function darken (color, amount) {
     amount = (amount === 0) ? 0 : (amount || 10);
     var hsl = tinycolor(color).toHsl();
     hsl.l -= amount / 100;
     hsl.l = clamp01(hsl.l);
     return tinycolor(hsl);
-};
-tinycolor.complement = function(color) {
+}
+
+// Spin takes a positive or negative amount within [-360, 360] indicating the change of hue.
+// Values outside of this range will be wrapped into this range.
+function spin(color, amount) {
     var hsl = tinycolor(color).toHsl();
-    hsl.h = (hsl.h + 180) % 360;
+    var hue = (mathRound(hsl.h) + amount) % 360;
+    hsl.h = hue < 0 ? 360 + hue : hue;
     return tinycolor(hsl);
-};
-
+}
 
 // Combination Functions
 // ---------------------
 // Thanks to jQuery xColor for some of the ideas behind these
 // <https://github.com/infusion/jQuery-xcolor/blob/master/jquery.xcolor.js>
 
-tinycolor.triad = function(color) {
+function complement(color) {
+    var hsl = tinycolor(color).toHsl();
+    hsl.h = (hsl.h + 180) % 360;
+    return tinycolor(hsl);
+}
+
+function triad(color) {
     var hsl = tinycolor(color).toHsl();
     var h = hsl.h;
     return [
@@ -492,8 +599,9 @@ tinycolor.triad = function(color) {
         tinycolor({ h: (h + 120) % 360, s: hsl.s, l: hsl.l }),
         tinycolor({ h: (h + 240) % 360, s: hsl.s, l: hsl.l })
     ];
-};
-tinycolor.tetrad = function(color) {
+}
+
+function tetrad(color) {
     var hsl = tinycolor(color).toHsl();
     var h = hsl.h;
     return [
@@ -502,8 +610,9 @@ tinycolor.tetrad = function(color) {
         tinycolor({ h: (h + 180) % 360, s: hsl.s, l: hsl.l }),
         tinycolor({ h: (h + 270) % 360, s: hsl.s, l: hsl.l })
     ];
-};
-tinycolor.splitcomplement = function(color) {
+}
+
+function splitcomplement(color) {
     var hsl = tinycolor(color).toHsl();
     var h = hsl.h;
     return [
@@ -511,8 +620,9 @@ tinycolor.splitcomplement = function(color) {
         tinycolor({ h: (h + 72) % 360, s: hsl.s, l: hsl.l}),
         tinycolor({ h: (h + 216) % 360, s: hsl.s, l: hsl.l})
     ];
-};
-tinycolor.analogous = function(color, results, slices) {
+}
+
+function analogous(color, results, slices) {
     results = results || 6;
     slices = slices || 30;
 
@@ -525,8 +635,9 @@ tinycolor.analogous = function(color, results, slices) {
         ret.push(tinycolor(hsl));
     }
     return ret;
-};
-tinycolor.monochromatic = function(color, results) {
+}
+
+function monochromatic(color, results) {
     results = results || 6;
     var hsv = tinycolor(color).toHsv();
     var h = hsv.h, s = hsv.s, v = hsv.v;
@@ -539,6 +650,41 @@ tinycolor.monochromatic = function(color, results) {
     }
 
     return ret;
+}
+
+// Utility Functions
+// ---------------------
+
+tinycolor.mix = function(color1, color2, amount) {
+    amount = (amount === 0) ? 0 : (amount || 50);
+
+    var rgb1 = tinycolor(color1).toRgb();
+    var rgb2 = tinycolor(color2).toRgb();
+
+    var p = amount / 100;
+    var w = p * 2 - 1;
+    var a = rgb2.a - rgb1.a;
+
+    var w1;
+
+    if (w * a == -1) {
+        w1 = w;
+    } else {
+        w1 = (w + a) / (1 + w * a);
+    }
+
+    w1 = (w1 + 1) / 2;
+
+    var w2 = 1 - w1;
+
+    var rgba = {
+        r: rgb2.r * w1 + rgb1.r * w2,
+        g: rgb2.g * w1 + rgb1.g * w2,
+        b: rgb2.b * w1 + rgb1.b * w2,
+        a: rgb2.a * p  + rgb1.a * (1 - p)
+    };
+
+    return tinycolor(rgba);
 };
 
 
@@ -551,14 +697,16 @@ tinycolor.monochromatic = function(color, results) {
 //    `brightness`: difference in brightness between the two colors
 //    `color`: difference in color/hue between the two colors
 tinycolor.readability = function(color1, color2) {
-    var a = tinycolor(color1).toRgb();
-    var b = tinycolor(color2).toRgb();
-    var brightnessA = (a.r * 299 + a.g * 587 + a.b * 114) / 1000;
-    var brightnessB = (b.r * 299 + b.g * 587 + b.b * 114) / 1000;
+    var c1 = tinycolor(color1);
+    var c2 = tinycolor(color2);
+    var rgb1 = c1.toRgb();
+    var rgb2 = c2.toRgb();
+    var brightnessA = c1.getBrightness();
+    var brightnessB = c2.getBrightness();
     var colorDiff = (
-        Math.max(a.r, b.r) - Math.min(a.r, b.r) +
-        Math.max(a.g, b.g) - Math.min(a.g, b.g) +
-        Math.max(a.b, b.b) - Math.min(a.b, b.b)
+        Math.max(rgb1.r, rgb2.r) - Math.min(rgb1.r, rgb2.r) +
+        Math.max(rgb1.g, rgb2.g) - Math.min(rgb1.g, rgb2.g) +
+        Math.max(rgb1.b, rgb2.b) - Math.min(rgb1.b, rgb2.b)
     );
 
     return {
@@ -571,8 +719,8 @@ tinycolor.readability = function(color1, color2) {
 // http://www.w3.org/TR/AERT#color-contrast
 // Ensure that foreground and background color combinations provide sufficient contrast.
 // *Example*
-//    tinycolor.readable("#000", "#111") => false
-tinycolor.readable = function(color1, color2) {
+//    tinycolor.isReadable("#000", "#111") => false
+tinycolor.isReadable = function(color1, color2) {
     var readability = tinycolor.readability(color1, color2);
     return readability.brightness > 125 && readability.color > 500;
 };
@@ -731,6 +879,7 @@ var names = tinycolor.names = {
     plum: "dda0dd",
     powderblue: "b0e0e6",
     purple: "800080",
+    rebeccapurple: "663399",
     red: "f00",
     rosybrown: "bc8f8f",
     royalblue: "4169e1",
@@ -878,6 +1027,7 @@ var matchers = (function() {
         hsl: new RegExp("hsl" + PERMISSIVE_MATCH3),
         hsla: new RegExp("hsla" + PERMISSIVE_MATCH4),
         hsv: new RegExp("hsv" + PERMISSIVE_MATCH3),
+        hsva: new RegExp("hsva" + PERMISSIVE_MATCH4),
         hex3: /^([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
         hex6: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,
         hex8: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/
@@ -919,6 +1069,9 @@ function stringInputToObject(color) {
     if ((match = matchers.hsv.exec(color))) {
         return { h: match[1], s: match[2], v: match[3] };
     }
+    if ((match = matchers.hsva.exec(color))) {
+        return { h: match[1], s: match[2], v: match[3], a: match[4] };
+    }
     if ((match = matchers.hex8.exec(color))) {
         return {
             a: convertHexToDecimal(match[1]),
@@ -954,7 +1107,7 @@ if (typeof module !== "undefined" && module.exports) {
     tiny = tinycolor;
 }
 // AMD/requirejs: Define the module
-else if (typeof define !== "undefined") {
+else if (typeof define === 'function' && define.amd) {
     define(function () {return tinycolor;});
 }
 // Browser: Expose to window
@@ -964,10 +1117,13 @@ else {
 
 })();
 
-
 var color = tiny(process.argv[2]);
 if(process.argv[3] == 'rgb') {
   console.log(color.toRgbString());
 } else {
+  if(color.getAlpha() < 1.0) {
+    var brightness_factor = (255 - color.getBrightness()) / 255;
+    color = color.lighten(100 * brightness_factor * (1.0 - color.getAlpha()));
+  }
   console.log(color.toHex());
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Brian Whitmer