Commit 1bf5b16d by Dmitry Baranovskiy

A fix. Wrong files were commited last time

parent d79aba6b
/*!
* Color Wheel 0.1.0 - Raphael plugin
*
* Copyright (c) 2010 John Weir (http://famedriver.com) & Dmitry Baranovskiy (http://raphaeljs.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
*/
(function (Raphael) { (function (Raphael) {
Raphael.colorpicker = function (x, y, size, initcolor, element) { Raphael.colorwheel = function (x, y, size, initcolor, element) {
return new ColorPicker(x, y, size, initcolor, element); return new ColorWheel(x, y, size, initcolor, element);
}; };
var pi = Math.PI; var pi = Math.PI;
function angle(x, y) { function angle(x, y) {
return (x < 0) * 180 + Math.atan(-y / -x) * 180 / pi; return (x < 0) * 180 + Math.atan(-y / -x) * 180 / pi;
} }
var doc = document, win = window, var doc = document, win = window;
addEvent = (function () { var addEvent = (function () {
if (doc.addEventListener) { if (doc.addEventListener) {
return function (obj, type, fn, element) { return function (obj, type, fn, element) {
var f = function (e) { var f = function (e) {
...@@ -38,20 +32,20 @@ ...@@ -38,20 +32,20 @@
return detacher; return detacher;
}; };
} }
})(), })();
ColorPicker = function (x, y, size, initcolor, element) { var ColorWheel = function (x, y, size, initcolor, element) {
size = size || 200; size = size || 200;
var w3 = 3 * size / 200, var w3 = 3 * size / 200,
w1 = size / 200, w1 = size / 200,
fi = 1.6180339887, fi = 1.6180339887,
segments = pi * size / 4, segments = pi * size / 5,
size20 = size / 20, size20 = size / 20,
size2 = size / 2, size2 = size / 2,
padding = 2 * size / 200, padding = 2 * size / 200,
height = size + size20 * 2 + padding * 3, t = this;
t = this,
H = 1, S = 1, B = 1, s = size - (size20 * 4), var H = 1, S = 1, B = 1, s = size - (size20 * 4);
r = element ? Raphael(element, size, height) : Raphael(x, y, size, height), var r = element ? Raphael(element, size, size) : Raphael(x, y, size, size),
xy = s / 6 + size20 * 2 + padding, xy = s / 6 + size20 * 2 + padding,
wh = s * 2 / 3 - padding * 2; wh = s * 2 / 3 - padding * 2;
w1 < 1 && (w1 = 1); w1 < 1 && (w1 = 1);
...@@ -62,177 +56,153 @@ ...@@ -62,177 +56,153 @@
var a = pi / 2 - pi * 2 / segments * 1.3, var a = pi / 2 - pi * 2 / segments * 1.3,
R = size2 - padding, R = size2 - padding,
R2 = size2 - padding - size20 * 2, 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", size2, size2, "z"].join(); 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++) { for (var i = 0; i < segments; i++) {
r.path(path).attr({ r.path(path).attr({
stroke: "none", stroke: "none",
fill: "hsb(" + (segments - i) * (255 / segments) + ", 255, 200)", fill: "hsb(" + i * (255 / segments) + ", 255, 200)",
rotation: [90 + (360 / segments) * i, size2, size2] rotation: [(360 / segments) * i, size2, size2]
}); });
} }
r.circle(size2, size2, R).attr({ 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({
fill: "r#fff-#fff", "stroke-width": w3,
"fill-opacity": 0,
"stroke-width": 3,
stroke: "#fff" stroke: "#fff"
}); });
t.cursorhsb = r.set();
t.cursor = r.set(); var h = size20 * 2 + 2;
t.cursor.push(r.circle(size2, size2, size20 / 2).attr({ t.cursorhsb.push(r.rect(size2 - h / fi / 2, padding - 1, h / fi, h, 3 * size / 200).attr({
stroke: "#000", stroke: "#000",
opacity: .5, opacity: .5,
"stroke-width": w3 "stroke-width": w3
})); }));
t.cursor.push(t.cursor[0].clone().attr({ t.cursorhsb.push(t.cursorhsb[0].clone().attr({
stroke: "#fff", stroke: "#fff",
opacity: 1, opacity: 1,
"stroke-width": w1 "stroke-width": w1
})); }));
t.disc = r.circle(size2, size2, R).attr({ 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", fill: "#000",
"fill-opacity": 0, opacity: 0,
stroke: "none", stroke: "none"
cursor: "crosshair"
}); });
var style = t.disc.node.style;
style.unselectable = "on";
style.MozUserSelect = "none";
style.WebkitUserSelect= "none";
// brightness drawing // rect drawing
var h = size20 * 2 + 2; t.main = r.rect(xy, xy, wh, wh).attr({
t.brect = r.rect(padding + h / fi / 2, size + padding * 2, size - padding * 2 - h / fi, h - padding * 2).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: "#fff",
fill: "180-#fff-#000" "stroke-width": w3,
fill: "90-#000-#000",
opacity: 0,
cursor: "crosshair"
}); });
t.cursorb = r.set(); t.cursor = r.set();
t.cursorb.push(r.rect(size - padding - h / fi, size + padding, ~~(h / fi), h, 3 * size / 200).attr({ t.cursor.push(r.circle(size2, size2, size20 / 2).attr({
stroke: "#000", stroke: "#000",
opacity: .5, opacity: .5,
"stroke-width": w3 "stroke-width": w3
})); }));
t.cursorb.push(t.cursorb[0].clone().attr({ t.cursor.push(t.cursor[0].clone().attr({
stroke: "#fff", stroke: "#fff",
opacity: 1, opacity: 1,
"stroke-width": w1 "stroke-width": w1
})); }));
t.btop = t.brect.clone().attr({
stroke: "#000",
fill: "#000",
opacity: 0
});
style = t.btop.node.style;
style.unselectable = "on";
style.MozUserSelect = "none";
style.WebkitUserSelect= "none";
t.minx = padding;
t.maxx = size - h / fi - padding;
t.H = t.S = t.B = 1; t.H = t.S = t.B = 1;
t.padding = padding;
t.raphael = r; t.raphael = r;
t.size2 = size2; t.size2 = size2;
t.size20 = size20; t.wh = wh;
t.x = x; t.x = x;
t.xy = xy;
t.y = y; t.y = y;
// events // events
t.hson = addEvent(t.disc.node, "mousedown", function (e) { t.hsbon = addEvent(t.ring.node, "mousedown", function (e) {
var scrollY = doc.documentElement.scrollTop || doc.body.scrollTop, this.hsbOnTheMove = true;
scrollX = doc.documentElement.scrollLeft || doc.body.scrollLeft; this.setH(e.clientX - this.x - this.size2, e.clientY - this.y - this.size2);
this.hsOnTheMove = true;
this.setHS(e.clientX + scrollX - this.x, e.clientY + scrollY - this.y);
this.docmove = addEvent(doc, "mousemove", this.docOnMove, this); this.docmove = addEvent(doc, "mousemove", this.docOnMove, this);
this.docup = addEvent(doc, "mouseup", this.docOnUp, this); this.docup = addEvent(doc, "mouseup", this.docOnUp, this);
}, t); }, t);
t.bon = addEvent(t.btop.node, "mousedown", function (e) { t.clron = addEvent(t.square.node, "mousedown", function (e) {
var scrollX = doc.documentElement.scrollLeft || doc.body.scrollLeft; this.clrOnTheMove = true;
this.bOnTheMove = true; this.setSB(e.clientX - this.x, e.clientY - this.y);
this.setB(e.clientX + scrollX - this.x);
this.docmove = addEvent(doc, "mousemove", this.docOnMove, this); this.docmove = addEvent(doc, "mousemove", this.docOnMove, this);
this.docup = addEvent(doc, "mouseup", this.docOnUp, this); this.docup = addEvent(doc, "mouseup", this.docOnUp, this);
}, t); }, t);
t.winunload = addEvent(win, "unload", function () { t.winunload = addEvent(win, "unload", function () {
this.hson(); this.hsbon();
this.bon(); this.clron();
this.docmove && this.docmove(); this.docmove && this.docmove();
this.docup && this.docup(); this.docup && this.docup();
this.winunload(); this.winunload();
}, t); }, t);
t.color(initcolor || "#fff"); t.color(initcolor || "#f00");
this.onchanged && this.onchanged(this.color()); this.onchanged && this.onchanged(this.color());
}; };
ColorPicker.prototype.setB = function (x) { ColorWheel.prototype.setH = function (x, y) {
x < this.minx && (x = this.minx); var d = angle(x, y),
x > this.maxx && (x = this.maxx); rd = d * pi / 180;
this.cursorb.attr({x: x}); this.cursorhsb.rotate(d + 90, this.size2, this.size2);
this.B = (x - this.minx) / (this.maxx - this.minx); this.H = (d + 90) / 360;
this.main.attr({fill: "hsb(" + this.H + ",1,1)"});
this.onchange && this.onchange(this.color()); this.onchange && this.onchange(this.color());
}; };
ColorPicker.prototype.setHS = function (x, y) { ColorWheel.prototype.setSB = function (x, y) {
var X = x - this.size2, x < this.size2 - this.wh / 2 && (x = this.size2 - this.wh / 2);
Y = y - this.size2, x > this.size2 + this.wh / 2 && (x = this.size2 + this.wh / 2);
R = this.size2 - this.size20 / 2 - this.padding, y < this.size2 - this.wh / 2 && (y = this.size2 - this.wh / 2);
d = angle(X, Y), y > this.size2 + this.wh / 2 && (y = this.size2 + this.wh / 2);
rd = d * pi / 180;
isNaN(d) && (d = 0);
if (X * X + Y * Y > R * R) {
x = R * Math.cos(rd) + this.size2;
y = R * Math.sin(rd) + this.size2;
}
this.cursor.attr({cx: x, cy: y}); this.cursor.attr({cx: x, cy: y});
this.H = (1 - d / 360) % 1; this.B = 1 - (y - this.xy) / this.wh;
this.S = Math.min((X * X + Y * Y) / R / R, 1); this.S = (x - this.xy) / this.wh;
this.brect.attr({fill: "180-hsb(" + [this.H, this.S] + ",1)-#000"});
this.onchange && this.onchange(this.color()); this.onchange && this.onchange(this.color());
}; };
ColorPicker.prototype.docOnMove = function (e) { ColorWheel.prototype.docOnMove = function (e) {
var scrollY = doc.documentElement.scrollTop || doc.body.scrollTop, if (this.hsbOnTheMove) {
scrollX = doc.documentElement.scrollLeft || doc.body.scrollLeft; this.setH(e.clientX - this.x - this.size2, e.clientY - this.y - this.size2);
if (this.hsOnTheMove) {
this.setHS(e.clientX + scrollX - this.x, e.clientY + scrollY - this.y);
} }
if (this.bOnTheMove) { if (this.clrOnTheMove) {
this.setB(e.clientX + scrollX - this.x); this.setSB(e.clientX - this.x, e.clientY - this.y);
} }
e.preventDefault && e.preventDefault(); e.preventDefault && e.preventDefault();
e.returnValue = false; e.returnValue = false;
return false; return false;
}; };
ColorPicker.prototype.docOnUp = function (e) { ColorWheel.prototype.docOnUp = function (e) {
this.hsOnTheMove = this.bOnTheMove = false; this.hsbOnTheMove = this.clrOnTheMove = false;
this.docmove(); this.docmove();
delete this.docmove; delete this.docmove;
this.docup(); this.docup();
delete this.docup; delete this.docup;
this.onchanged && this.onchanged(this.color()); this.onchanged && this.onchanged(this.color());
}; };
ColorPicker.prototype.remove = function () { ColorWheel.prototype.remove = function () {
this.raphael.remove(); this.raphael.remove();
this.color = function () { this.color = function () {
return false; return false;
}; };
}; };
ColorPicker.prototype.color = function (color) { ColorWheel.prototype.color = function (color) {
if (color) { if (color) {
color = Raphael.getRGB(color); color = Raphael.getRGB(color);
var hex = color.hex;
color = Raphael.rgb2hsb(color.r, color.g, color.b); color = Raphael.rgb2hsb(color.r, color.g, color.b);
d = color.h * 360; var d = color.h * 360;
this.H = color.h; this.H = color.h;
this.S = color.s; this.S = color.s;
this.B = color.b; this.B = color.b;
this.cursorhsb.rotate(d, this.size2, this.size2);
this.cursorb.attr({x: this.B * (this.maxx - this.minx) + this.minx}); this.main.attr({fill: "hsb(" + this.H + ",1,1)"});
this.brect.attr({fill: "180-hsb(" + [this.H, this.S] + ",1)-#000"}); var x = this.S * this.wh + this.xy,
y = (1 - this.B) * this.wh + this.xy;
var d = (1 - this.H) * 360,
rd = d * pi / 180,
R = (this.size2 - this.size20 / 2 - this.padding) * this.S,
x = Math.cos(rd) * R + this.size2,
y = Math.sin(rd) * R + this.size2;
this.cursor.attr({cx: x, cy: y}); this.cursor.attr({cx: x, cy: y});
return this; return this;
} else { } else {
......
/*!
* Color Wheel 0.1.0 - Raphael plugin
*
* Copyright (c) 2010 John Weir (http://famedriver.com) & Dmitry Baranovskiy (http://raphaeljs.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
*/
(function ($, R) { (function ($, R) {
$.fn.colorwheel = function (size, initcolor) { $.fn.colorwheel = function (size, initcolor) {
if (R) { if (R) {
var offset = this.offset(); var offset = this.offset();
return R.colorpicker(offset.left, offset.top, size, initcolor, this[0]); return R.colorwheel(offset.left, offset.top, size, initcolor, this[0]);
} }
return null; return null;
}; };
......
/*!
* Raphael Blur Plugin 0.1
*
* Copyright (c) 2009 Dmitry Baranovskiy (http://raphaeljs.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
*/
if (Raphael.vml) {
Raphael.el.blur = function (size) {
var s = this.node.style,
f = s.filter;
f = f.replace(/ progid:\S+Blur\([^\)]+\)/g, "");
if (size != "none") {
s.filter = f + " progid:DXImageTransform.Microsoft.Blur(pixelradius=" + (+size || 1.5) + ")";
s.margin = Raphael.format("-{0}px 0 0 -{0}px", Math.round(+size || 1.5));
} else {
s.filter = f;
s.margin = 0;
}
};
} else {
Raphael.el.blur = function (size) {
// Experimental. No WebKit support.
if (size != "none") {
var fltr = $("filter"),
blur = $("feGaussianBlur");
fltr.id = "r" + (Raphael.idGenerator++).toString(36);
$(blur, {stdDeviation: +size || 1.5});
fltr.appendChild(blur);
this.paper.defs.appendChild(fltr);
this._blur = fltr;
$(this.node, {filter: "url(#" + fltr.id + ")"});
} else {
if (this._blur) {
this._blur.parentNode.removeChild(this._blur);
delete this._blur;
}
this.node.removeAttribute("filter");
}
};
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment