Merge branch 'cuttingedge'

plugins/colorwheel.js

+(function (Raphael) {
+    Raphael.colorwheel = function (x, y, size, initcolor, element) {
+        return new ColorWheel(x, y, size, initcolor, element);
+    };
+    var pi = Math.PI;
+    function angle(x, y) {
+        return (x < 0) * 180 + Math.atan(-y / -x) * 180 / pi;
+    }
+    var doc = document, win = window;
+    var addEvent = (function () {
+        if (doc.addEventListener) {
+            return function (obj, type, fn, element) {
+                var f = function (e) {
+                    return fn.call(element, e);
+                };
+                obj.addEventListener(type, f, false);
+                return function () {
+                    obj.removeEventListener(type, f, false);
+                    return true;
+                };
+            };
+        } else if (doc.attachEvent) {
+            return function (obj, type, fn, element) {
+                var f = function (e) {
+                    return fn.call(element, e || win.event);
+                };
+                obj.attachEvent("on" + type, f);
+                var detacher = function () {
+                    obj.detachEvent("on" + type, f);
+                    return true;
+                };
+                return detacher;
+            };
+        }
+    })();
+    var ColorWheel = function (x, y, size, initcolor, element) {
+        size = size || 200;
+        var w3 = 3 * size / 200,
+            w1 = size / 200,
+            fi = 1.6180339887,
+            segments = pi * size / 5,
+            size20 = size / 20,
+            size2 = size / 2,
+            padding = 2 * size / 200,
+            t = this;
+
+        var H = 1, S = 1, B = 1, s = size - (size20 * 4);
+        var r = element ? Raphael(element, size, size) : Raphael(x, y, size, size),
+            xy = s / 6 + size20 * 2 + padding,
+            wh = s * 2 / 3 - padding * 2;
+        w1 < 1 && (w1 = 1);
+        w3 < 1 && (w3 = 1);
+
+
+        // ring drawing
+        var a = pi / 2 - pi * 2 / segments * 1.3,
+            R = size2 - padding,
+            R2 = size2 - padding - size20 * 2,
+            path = ["M", size2, padding, "A", R, R, 0, 0, 1, R * Math.cos(a) + R + padding, R - R * Math.sin(a) + padding, "L", R2 * Math.cos(a) + R + padding, R - R2 * Math.sin(a) + padding, "A", R2, R2, 0, 0, 0, size2, padding + size20 * 2, "z"].join();
+        for (var i = 0; i < segments; i++) {
+            r.path(path).attr({
+                stroke: "none",
+                fill: "hsb(" + i * (255 / segments) + ", 255, 200)",
+                rotation: [(360 / segments) * i, size2, size2]
+            });
+        }
+        r.path(["M", size2, padding, "A", R, R, 0, 1, 1, size2 - 1, padding, "l1,0", "M", size2, padding + size20 * 2, "A", R2, R2, 0, 1, 1, size2 - 1, padding + size20 * 2, "l1,0"]).attr({
+            "stroke-width": w3,
+            stroke: "#fff"
+        });
+        t.cursorhsb = r.set();
+        var h = size20 * 2 + 2;
+        t.cursorhsb.push(r.rect(size2 - h / fi / 2, padding - 1, h / fi, h, 3 * size / 200).attr({
+            stroke: "#000",
+            opacity: .5,
+            "stroke-width": w3
+        }));
+        t.cursorhsb.push(t.cursorhsb[0].clone().attr({
+            stroke: "#fff",
+            opacity: 1,
+            "stroke-width": w1
+        }));
+        t.ring = r.path(["M", size2, padding, "A", R, R, 0, 1, 1, size2 - 1, padding, "l1,0M", size2, padding + size20 * 2, "A", R2, R2, 0, 1, 1, size2 - 1, padding + size20 * 2, "l1,0"]).attr({
+            fill: "#000",
+            opacity: 0,
+            stroke: "none"
+        });
+
+        // rect drawing
+        t.main = r.rect(xy, xy, wh, wh).attr({
+            stroke: "none",
+            fill: "#f00",
+            opacity: 1
+        });
+        t.main.clone().attr({
+            stroke: "none",
+            fill: "0-#fff-#fff",
+            opacity: 0
+        });
+        t.square = r.rect(xy - 1, xy - 1, wh + 2, wh + 2).attr({
+            r: 2,
+            stroke: "#fff",
+            "stroke-width": w3,
+            fill: "90-#000-#000",
+            opacity: 0,
+            cursor: "crosshair"
+        });
+        t.cursor = r.set();
+        t.cursor.push(r.circle(size2, size2, size20 / 2).attr({
+            stroke: "#000",
+            opacity: .5,
+            "stroke-width": w3
+        }));
+        t.cursor.push(t.cursor[0].clone().attr({
+            stroke: "#fff",
+            opacity: 1,
+            "stroke-width": w1
+        }));
+        t.H = t.S = t.B = 1;
+        t.raphael = r;
+        t.size2 = size2;
+        t.wh = wh;
+        t.x = x;
+        t.xy = xy;
+        t.y = y;
+
+        // events
+        t.hsbon = addEvent(t.ring.node, "mousedown", function (e) {
+            this.hsbOnTheMove = true;
+            this.setH(e.clientX - this.x - this.size2, e.clientY - this.y - this.size2);
+            this.docmove = addEvent(doc, "mousemove", this.docOnMove, this);
+            this.docup = addEvent(doc, "mouseup", this.docOnUp, this);
+        }, t);
+        t.clron = addEvent(t.square.node, "mousedown", function (e) {
+            this.clrOnTheMove = true;
+            this.setSB(e.clientX - this.x, e.clientY - this.y);
+            this.docmove = addEvent(doc, "mousemove", this.docOnMove, this);
+            this.docup = addEvent(doc, "mouseup", this.docOnUp, this);
+        }, t);
+        t.winunload = addEvent(win, "unload", function () {
+            this.hsbon();
+            this.clron();
+            this.docmove && this.docmove();
+            this.docup && this.docup();
+            this.winunload();
+        }, t);
+        
+        t.color(initcolor || "#f00");
+        this.onchanged && this.onchanged(this.color());
+    };
+    ColorWheel.prototype.setH = function (x, y) {
+        var d = angle(x, y),
+            rd = d * pi / 180;
+        this.cursorhsb.rotate(d + 90, this.size2, this.size2);
+        this.H = (d + 90) / 360;
+        this.main.attr({fill: "hsb(" + this.H + ",1,1)"});
+        this.onchange && this.onchange(this.color());
+    };
+    ColorWheel.prototype.setSB = function (x, y) {
+        x < this.size2 - this.wh / 2 && (x = this.size2 - this.wh / 2);
+        x > this.size2 + this.wh / 2 && (x = this.size2 + this.wh / 2);
+        y < this.size2 - this.wh / 2 && (y = this.size2 - this.wh / 2);
+        y > this.size2 + this.wh / 2 && (y = this.size2 + this.wh / 2);
+        this.cursor.attr({cx: x, cy: y});
+        this.B = 1 - (y - this.xy) / this.wh;
+        this.S = (x - this.xy) / this.wh;
+        this.onchange && this.onchange(this.color());
+    };
+    ColorWheel.prototype.docOnMove = function (e) {
+        if (this.hsbOnTheMove) {
+            this.setH(e.clientX - this.x - this.size2, e.clientY - this.y - this.size2);
+        }
+        if (this.clrOnTheMove) {
+            this.setSB(e.clientX - this.x, e.clientY - this.y);
+        }
+        e.preventDefault && e.preventDefault();
+        e.returnValue = false;
+        return false;
+    };
+    ColorWheel.prototype.docOnUp = function (e) {
+        this.hsbOnTheMove = this.clrOnTheMove = false;
+        this.docmove();
+        delete this.docmove;
+        this.docup();
+        delete this.docup;
+        this.onchanged && this.onchanged(this.color());
+    };
+    ColorWheel.prototype.remove = function () {
+        this.raphael.remove();
+        this.color = function () {
+            return false;
+        };
+    };
+    ColorWheel.prototype.color = function (color) {
+        if (color) {
+            color = Raphael.getRGB(color);
+            color = Raphael.rgb2hsb(color.r, color.g, color.b);
+            var d = color.h * 360;
+            this.H = color.h;
+            this.S = color.s;
+            this.B = color.b;
+            this.cursorhsb.rotate(d, this.size2, this.size2);
+            this.main.attr({fill: "hsb(" + this.H + ",1,1)"});
+            var x = this.S * this.wh + this.xy,
+                y = (1 - this.B) * this.wh + this.xy;
+            this.cursor.attr({cx: x, cy: y});
+            return this;
+        } else {
+            return Raphael.hsb2rgb(this.H, this.S, this.B).hex;
+        }
+    };
+})(window.Raphael);

plugins/jquery.colorpicker.js

+/*!
+ * Color Picker 0.1.0 - Raphael plugin
+ *
+ * Copyright (c) 2010 Dmitry Baranovskiy (http://raphaeljs.com)
+ * Based on Color Wheel (http://jweir.github.com/colorwheel) by John Weir (http://famedriver.com)
+ * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+ */
+(function ($, R) {
+    $.fn.colorpicker = function (size, initcolor) {
+        if (R) {
+            var offset = this.offset();
+            return R.colorpicker(offset.left, offset.top, size, initcolor, this[0]);
+        }
+        return null;
+    };
+})(window.jQuery, window.Raphael);
\ No newline at end of file

plugins/jquery.colorwheel.js

+(function ($, R) {
+    $.fn.colorwheel = function (size, initcolor) {
+        if (R) {
+            var offset = this.offset();
+            return R.colorwheel(offset.left, offset.top, size, initcolor, this[0]);
+        }
+        return null;
+    };
+})(window.jQuery, window.Raphael);
\ No newline at end of file

plugins/raphael.shadow.js

 /*!
- * Raphael Shadow Plugin 0.2
+ * Raphael Shadow plugin 0.3
  *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://raphaeljs.com)
+ * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
  * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
  */
-
 Raphael.shadow = function (x, y, w, h, options) {
     // options format: {
     //     size: 0..1, shadow size
     //     color: "#000", placeholder colour
     //     stroke: "#000", placeholder stroke colour
     //     shadow: "#000", shadow colour
+    //     target: "someID" | htmlElement
     //     r: 5, radius of placeholder rounded corners
     // }
     options = options || {};
@@ -19,25 +19,34 @@ Raphael.shadow = function (x, y, w, h, options) {
         color = options.color || "#fff",
         stroke = options.stroke || color,
         shadowColor = options.shadow || "#000",
-        R = options.r || 3,
+        target = options.target || null,
+        R = options.r == null ? 3 : options.r,
         s = size,
         b = size * 2,
         r = b + s,
         rg = this.format("r{0}-{0}", shadowColor),
         rect = "rect",
-        circ = "circle",
-        none = "none";
-    var res = this([
-        x - s, y - t, w + (x = s) * 2, h + (y = t) + b,
-        {type: rect, x: x - s, y: y - t, width: b + s, height: h + y + b, stroke: none, fill: this.format("180-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x - s + 1, y - t + r, b, h + y + b - r * 2 + .9]},
-        {type: rect, x: x + w - b, y: y - t, width: b + s, height: h + y + b, stroke: none, fill: this.format("0-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x + w - s + 1, y - t + r, b, h + y + b - r * 2]},
-        {type: rect, x: x + b - 1, y: y + h - s, width: w + b, height: b + s, stroke: none, fill: this.format("270-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x + b, y + h - s, w + b - r * 2, b + s]},
-        {type: rect, x: x + s - 1, y: y - t, width: w + b, height: b + s, stroke: none, fill: this.format("90-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x + b, y - t, w + b - r * 2, s + t + 1]},
-        {type: circ, cx: x + b, cy: y + h - s, r: r, stroke: none, fill: rg, opacity: 0, "clip-rect": [x - s, y + h - s + .999, r, r]},
-        {type: circ, cx: x + w - b, cy: y + h - s, r: r, stroke: none, fill: rg, opacity: 0, "clip-rect": [x + w - b, y + h - s, r, r]},
-        {type: circ, cx: x + b, cy: y - t + r, r: r, stroke: none, fill: rg, opacity: 0, "clip-rect": [x - s, y - t, r, r]},
-        {type: circ, cx: x + w - b, cy: y - t + r, r: r , stroke: none, fill: rg, opacity: 0, "clip-rect": [x + w - b, y - t, r, r]},
-        {type: rect, x: x, y: y, width: w, height: h, r: R, fill: color, stroke: stroke}
-        ]);
-    return res[0].paper;
-};
\ No newline at end of file
+        none = "none",
+        res,
+        set;
+
+        if (target) {
+            res = this(target, w + (x = s) * 2, h + (y = t) + b);
+        } else {
+            res = this(x - s, y - t, w + (x = s) * 2, h + (y = t) + b);
+        }
+
+        set = res.set(
+            res.rect(x - s, y - t, b + s, h + y + b).attr({stroke: none, fill: this.format("180-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x - s + 1, y - t + r, b, h + y + b - r * 2 + .9]}),
+            res.rect(x + w - b, y - t, b + s, h + y + b).attr({stroke: none, fill: this.format("0-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x + w - s + 1, y - t + r, b, h + y + b - r * 2]}),
+            res.rect(x + b - 1, y + h - s, w + b, b + s).attr({stroke: none, fill: this.format("270-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x + b, y + h - s, w + b - r * 2, b + s]}),
+            res.rect(x + s - 1, y - t, w + b, b + s).attr({stroke: none, fill: this.format("90-{0}-{0}", shadowColor), opacity: 0, "clip-rect": [x + b, y - t, w + b - r * 2, s + t + 1]}),
+            res.circle(x + b, y + h - s, r).attr({stroke: none, fill: rg, opacity: 0, "clip-rect": [x - s, y + h - s + .999, r, r]}),
+            res.circle(x + w - b, y + h - s, r).attr({stroke: none, fill: rg, opacity: 0, "clip-rect": [x + w - b, y + h - s, r, r]}),
+            res.circle(x + b, y - t + r, r).attr({stroke: none, fill: rg, opacity: 0, "clip-rect": [x - s, y - t, r, r]}),
+            res.circle(x + w - b, y - t + r, r).attr({stroke: none, fill: rg, opacity: 0, "clip-rect": [x + w - b, y - t, r, r]}),
+            res.rect(x, y, w, h, R).attr({fill: color, stroke: stroke})
+        );
+
+    return set[0].paper;
+};