/*
- * Raphael 1.0 - JavaScript Vector Library
+ * Raphael 1.0 RC1.4 - JavaScript Vector Library
*
* Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
return create.apply(R, arguments);
},
paper = {},
- availableAttrs = {cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '10px "Arial"', "font-family": '"Arial"', "font-size": "10", "font-style": "normal", "font-weight": 400, gradient: 0, height: 0, href: "http://raphaeljs.com/", opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", src: "", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, target: "_blank", "text-anchor": "middle", title: "Raphael", translation: "0 0", width: 0, x: 0, y: 0},
- availableAnimAttrs = {cx: "number", cy: "number", fill: "colour", "fill-opacity": "number", "font-size": "number", height: "number", opacity: "number", path: "path", r: "number", rotation: "csv", rx: "number", ry: "number", scale: "csv", stroke: "colour", "stroke-opacity": "number", "stroke-width": "number", translation: "csv", width: "number", x: "number", y: "number"},
+ availableAttrs = {"clip-rect": "0 0 10e9 10e9", cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '10px "Arial"', "font-family": '"Arial"', "font-size": "10", "font-style": "normal", "font-weight": 400, gradient: 0, height: 0, href: "http://raphaeljs.com/", opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", src: "", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, target: "_blank", "text-anchor": "middle", title: "Raphael", translation: "0 0", width: 0, x: 0, y: 0},
+ availableAnimAttrs = {"clip-rect": "csv", cx: "number", cy: "number", fill: "colour", "fill-opacity": "number", "font-size": "number", height: "number", opacity: "number", path: "path", r: "number", rotation: "csv", rx: "number", ry: "number", scale: "csv", stroke: "colour", "stroke-opacity": "number", "stroke-width": "number", translation: "csv", width: "number", x: "number", y: "number"},
events = ["click", "dblclick", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup"];
- R.version = "1.0";
+ R.version = "1.0 RC1.4";
R.type = (window.SVGAngle || document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
R.svg = !(R.vml = R.type == "VML");
R.idGenerator = 0;
R.fn = {};
- R.isArray = function (arr) {
- return Object.prototype.toString.call(arr) == "[object Array]";
+ R.is = function (o, type) {
+ type = (type + "").toLowerCase();
+ if (type == "undefined" && typeof o == "undefined") {
+ return true;
+ }
+ if (o == null && type == "null") {
+ return true;
+ }
+ return Object.prototype.toString.call(o).replace(/^\[object\s+|\]$/gi, "").toLowerCase() == type;
};
R.setWindow = function (newwin) {
win = newwin;
doc = win.document;
};
// colour utilities
- R.hsb2rgb = function (hue, saturation, brightness) {
- if (typeof hue == "object" && "h" in hue && "s" in hue && "b" in hue) {
+ R.hsb2rgb = cacher(function (hue, saturation, brightness) {
+ if (R.is(hue, "object") && "h" in hue && "s" in hue && "b" in hue) {
brightness = hue.b;
saturation = hue.s;
hue = hue.h;
}
rgb.hex = "#" + r + g + b;
return rgb;
- };
- R.rgb2hsb = function (red, green, blue) {
- if (typeof red == "object" && "r" in red && "g" in red && "b" in red) {
+ }, R);
+ R.rgb2hsb = cacher(function (red, green, blue) {
+ if (R.is(red, "object") && "r" in red && "g" in red && "b" in red) {
blue = red.b;
green = red.g;
red = red.r;
}
- if (typeof red == "string") {
+ if (R.is(red, "string")) {
var clr = R.getRGB(red);
red = clr.r;
green = clr.g;
}
}
return {h: hue, s: saturation, b: brightness};
+ }, R);
+ R._path2string = function () {
+ var res = "",
+ item;
+ for (var i = 0, ii = this.length; i < ii; i++) {
+ for (var j = 0, jj = this[i].length; j < jj; j++) {
+ res += this[i][j];
+ j && j != jj - 1 && (res += ",");
+ }
+ i != ii - 1 && (res += "\n");
+ }
+ return res.replace(/,(?=-)/g, "");
};
- var getRGBcache = {},
- getRGBcount = [];
- R.getRGB = function (colour) {
- if (colour in getRGBcache) {
- return getRGBcache[colour];
+ function cacher(f, scope, postprocessor) {
+ function newf() {
+ var arg = Array.prototype.splice.call(arguments, 0, arguments.length),
+ args = arg.join("\u25ba");
+ newf.cache = newf.cache || {};
+ newf.count = newf.count || [];
+ if (args in newf.cache) {
+ return postprocessor ? postprocessor(newf.cache[args]) : newf.cache[args];
+ }
+ if (newf.count.length > 1000) {
+ delete newf.cache[newf.count.unshift()];
+ }
+ newf.count.push(args);
+ newf.cache[args] = f.apply(scope, arg);
+ return postprocessor ? postprocessor(newf.cache[args]) : newf.cache[args];
}
+ return newf;
+ }
+
+ R.getRGB = cacher(function (colour) {
var htmlcolors = {aliceblue: "#f0f8ff", amethyst: "#96c", antiquewhite: "#faebd7", aqua: "#0ff", aquamarine: "#7fffd4", azure: "#f0ffff", beige: "#f5f5dc", bisque: "#ffe4c4", black: "#000", blanchedalmond: "#ffebcd", blue: "#00f", blueviolet: "#8a2be2", brown: "#a52a2a", burlywood: "#deb887", cadetblue: "#5f9ea0", chartreuse: "#7fff00", chocolate: "#d2691e", coral: "#ff7f50", cornflowerblue: "#6495ed", cornsilk: "#fff8dc", crimson: "#dc143c", cyan: "#0ff", darkblue: "#00008b", darkcyan: "#008b8b", darkgoldenrod: "#b8860b", darkgray: "#a9a9a9", darkgreen: "#006400", darkkhaki: "#bdb76b", darkmagenta: "#8b008b", darkolivegreen: "#556b2f", darkorange: "#ff8c00", darkorchid: "#9932cc", darkred: "#8b0000", darksalmon: "#e9967a", darkseagreen: "#8fbc8f", darkslateblue: "#483d8b", darkslategray: "#2f4f4f", darkturquoise: "#00ced1", darkviolet: "#9400d3", deeppink: "#ff1493", deepskyblue: "#00bfff", dimgray: "#696969", dodgerblue: "#1e90ff", firebrick: "#b22222", floralwhite: "#fffaf0", forestgreen: "#228b22", fuchsia: "#f0f", gainsboro: "#dcdcdc", ghostwhite: "#f8f8ff", gold: "#ffd700", goldenrod: "#daa520", gray: "#808080", green: "#008000", greenyellow: "#adff2f", honeydew: "#f0fff0", hotpink: "#ff69b4", indianred: "#cd5c5c", indigo: "#4b0082", ivory: "#fffff0", khaki: "#f0e68c", lavender: "#e6e6fa", lavenderblush: "#fff0f5", lawngreen: "#7cfc00", lemonchiffon: "#fffacd", lightblue: "#add8e6", lightcoral: "#f08080", lightcyan: "#e0ffff", lightgoldenrodyellow: "#fafad2", lightgreen: "#90ee90", lightgrey: "#d3d3d3", lightpink: "#ffb6c1", lightsalmon: "#ffa07a", lightsalmon: "#ffa07a", lightseagreen: "#20b2aa", lightskyblue: "#87cefa", lightslategray: "#789", lightsteelblue: "#b0c4de", lightyellow: "#ffffe0", lime: "#0f0", limegreen: "#32cd32", linen: "#faf0e6", magenta: "#f0f", maroon: "#800000", mediumaquamarine: "#66cdaa", mediumblue: "#0000cd", mediumorchid: "#ba55d3", mediumpurple: "#9370db", mediumseagreen: "#3cb371", mediumslateblue: "#7b68ee", mediumslateblue: "#7b68ee", mediumspringgreen: "#00fa9a", mediumturquoise: "#48d1cc", mediumvioletred: "#c71585", midnightblue: "#191970", mintcream: "#f5fffa", mistyrose: "#ffe4e1", moccasin: "#ffe4b5", navajowhite: "#ffdead", navy: "#000080", oldlace: "#fdf5e6", olive: "#808000", olivedrab: "#6b8e23", orange: "#ffa500", orangered: "#ff4500", orchid: "#da70d6", palegoldenrod: "#eee8aa", palegreen: "#98fb98", paleturquoise: "#afeeee", palevioletred: "#db7093", papayawhip: "#ffefd5", peachpuff: "#ffdab9", peru: "#cd853f", pink: "#ffc0cb", plum: "#dda0dd", powderblue: "#b0e0e6", purple: "#800080", red: "#f00", rosybrown: "#bc8f8f", royalblue: "#4169e1", saddlebrown: "#8b4513", salmon: "#fa8072", sandybrown: "#f4a460", seagreen: "#2e8b57", seashell: "#fff5ee", sienna: "#a0522d", silver: "#c0c0c0", skyblue: "#87ceeb", slateblue: "#6a5acd", slategray: "#708090", snow: "#fffafa", springgreen: "#00ff7f", steelblue: "#4682b4", tan: "#d2b48c", teal: "#008080", thistle: "#d8bfd8", tomato: "#ff6347", turquoise: "#40e0d0", violet: "#ee82ee", wheat: "#f5deb3", white: "#fff", whitesmoke: "#f5f5f5", yellow: "#ff0", yellowgreen: "#9acd32"},
res;
if ((colour + "").toLowerCase() in htmlcolors) {
var red,
green,
blue,
- rgb = (colour + "").match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hsb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hsb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i);
+ rgb = (colour + "").match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hs[bl]\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hs[bl]\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i);
if (rgb) {
if (rgb[2]) {
blue = parseInt(rgb[2].substring(5), 16);
blue = parseFloat(rgb[2]) * 2.55;
return R.hsb2rgb(red, green, blue);
}
- var rgb = {r: red, g: green, b: blue},
- r = Math.round(red).toString(16),
+ rgb = {r: red, g: green, b: blue};
+ var r = Math.round(red).toString(16),
g = Math.round(green).toString(16),
b = Math.round(blue).toString(16);
(r.length == 1) && (r = "0" + r);
} else {
res = {r: -1, g: -1, b: -1, hex: "none"};
}
- if (getRGBcount.length > 20) {
- delete getRGBcache[getRGBcount.unshift()];
- }
- getRGBcount.push(colour);
- getRGBcache[colour] = res;
return res;
- };
+ }, R);
R.getColor = function (value) {
var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75},
rgb = this.hsb2rgb(start.h, start.s, start.b);
delete this.start;
};
// path utilities
- var pathMethods = {
- absolutely: function () {
- this.isAbsolute = true;
- return this;
- },
- relatively: function () {
- this.isAbsolute = false;
- return this;
- },
- moveTo: function (x, y) {
- var d = this.isAbsolute ? "M" : "m";
- d += +parseFloat(x).toFixed(3) + " " + (+parseFloat(y).toFixed(3)) + " ";
- this.attr({path: this.attrs.path + d});
- return this;
- },
- lineTo: function (x, y) {
- var d = this.isAbsolute ? "L" : "l";
- d += +parseFloat(x).toFixed(3) + " " + (+parseFloat(y).toFixed(3)) + " ";
- this.attr({path: this.attrs.path + d});
- return this;
- },
- arcTo: function (rx, ry, large_arc_flag, sweep_flag, x, y) {
- var d = this.isAbsolute ? "A" : "a";
- d += [+parseFloat(rx).toFixed(3), +parseFloat(ry).toFixed(3), 0, large_arc_flag, sweep_flag, +parseFloat(x).toFixed(3), +parseFloat(y).toFixed(3)].join(" ");
- this.attr({path: this.attrs.path + d});
- return this;
- },
- curveTo: function () {
- var args = Array.prototype.splice.call(arguments, 0, arguments.length),
- d = [0, 0, 0, 0, "s", 0, "c"][args.length] || "";
- if (this.isAbsolute) {
- d = d.toUpperCase();
- }
- this.attr({path: this.attrs.path + d + args});
- return this;
- },
- qcurveTo: function () {
- var d = [0, 1, "t", 3, "q"][arguments.length],
- args = Array.prototype.splice.call(arguments, 0, arguments.length);
- if (this.isAbsolute) {
- d = d.toUpperCase();
- }
- this.attr({path: this.attrs.path + d + args});
- return this;
- },
- addRoundedCorner: function (r, dir) {
- var rollback = this.isAbsolute,
- o = this;
- if (rollback) {
- this.relatively();
- rollback = function () {
- o.absolutely();
- };
- } else {
- rollback = function () {};
- }
- this.arcTo(r, r, 0, {"lu": 1, "rd": 1, "ur": 1, "dl": 1}[dir] || 0, r * (!!(dir.indexOf("r") + 1) * 2 - 1), r * (!!(dir.indexOf("d") + 1) * 2 - 1));
- rollback();
- return this;
- },
- andClose: function () {
- this.attr({path: this.attrs.path + "z"});
- return this;
- },
- getPathArray: function () {
- return R.parsePathString(this.attrs.path);
- }
- };
- var pathcache = {},
- path2string = function () {
- var res = "";
- for (var i = 0, ii = this.length; i < ii; i++) {
- res += this[i][0] + this[i].join(",").substring(2);
- }
- return res.replace(/,(?=-)/g, "");
- },
- pathcount = [];
- R.parsePathString = function (pathString) {
- if (pathString in pathcache) {
- return pathcache[pathString];
+ R.parsePathString = cacher(function (pathString) {
+ if (!pathString) {
+ return null;
}
var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, q: 4, s: 4, t: 2, v: 1, z: 0},
data = [];
- if (pathString.toString == path2string) {
- data = pathString;
+ if (R.is(pathString, "array") && R.is(pathString[0], "array")) { // rough assumption
+ data = pathClone(pathString);
}
if (!data.length) {
(pathString + "").replace(/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig, function (a, b, c) {
};
}
});
- data.toString = path2string;
}
- if (pathcount.length > 20) {
- delete pathcache[pathcount.unshift()];
- }
- pathcount.push(pathString);
- pathcache[pathString] = data;
+ data.toString = R._path2string;
return data;
- };
- var pathDimensions = function (path) {
- var pathArray = path;
- pathArray = pathToAbsolute(pathArray);
- var x = [],
- y = [],
- length = 0;
- for (var i = 0, ii = pathArray.length; i < ii; i++) {
- var pa = pathArray[i];
- switch (pa[0]) {
- case "Z":
- break;
- case "A":
- x.push(pa[pa.length - 2]);
- y.push(pa[pa.length - 1]);
- break;
- default:
- for (var j = 1, jj = pa.length; j < jj; j++) {
- (j % 2 ? x : y).push(pa[j]);
- }
- }
+ });
+ var pathDimensions = cacher(function (path) {
+ if (!path) {
+ return {x: 0, y: 0, width: 0, height: 0};
}
- var minx = Math.min.apply(Math, x),
- miny = Math.min.apply(Math, y);
- if (!x.length) {
- return {
- x: 0,
- y: 0,
- width: 0,
- height: 0,
- X: 0,
- Y: 0
- };
- } else {
- return {
- x: minx,
- y: miny,
- width: Math.max.apply(Math, x) - minx,
- height: Math.max.apply(Math, y) - miny,
- X: x,
- Y: y
- };
+ path = path2curve(path);
+ var x = 0,
+ y = 0,
+ X = [],
+ Y = [];
+ for (var i = 0, ii = path.length; i < ii; i++) {
+ if (path[i][0] == "M") {
+ x = path[i][1];
+ y = path[i][2];
+ X.push(x);
+ Y.push(y);
+ } else {
+ var dim = curveDim(x, y, path[i][1], path[i][2], path[i][3], path[i][4], path[i][5], path[i][6]);
+ X = X.concat(dim.min.x, dim.max.x);
+ Y = Y.concat(dim.min.y, dim.max.y);
+ }
}
- },
- pathToRelative = function (pathArray) {
+ var xmin = Math.min.apply(0, X),
+ ymin = Math.min.apply(0, Y);
+ return {
+ x: xmin,
+ y: ymin,
+ width: Math.max.apply(0, X) - xmin,
+ height: Math.max.apply(0, Y) - ymin
+ };
+ }),
+ pathClone = function (pathArray) {
+ var res = [];
+ if (!R.is(pathArray, "array") || !R.is(pathArray && pathArray[0], "array")) { // rough assumption
+ pathArray = R.parsePathString(pathArray);
+ }
+ for (var i = 0, ii = pathArray.length; i < ii; i++) {
+ res[i] = [];
+ for (var j = 0, jj = pathArray[i].length; j < jj; j++) {
+ res[i][j] = pathArray[i][j];
+ }
+ }
+ res.toString = R._path2string;
+ return res;
+ },
+ pathToRelative = cacher(function (pathArray) {
+ if (!R.is(pathArray, "array") || !R.is(pathArray && pathArray[0], "array")) { // rough assumption
+ pathArray = R.parsePathString(pathArray);
+ }
var res = [],
x = 0,
y = 0,
+ mx = 0,
+ my = 0,
start = 0;
- if (typeof pathArray == "string") {
- pathArray = R.parsePathString(pathArray);
- }
if (pathArray[0][0] == "M") {
x = pathArray[0][1];
y = pathArray[0][2];
+ mx = x;
+ my = y;
start++;
res.push(["M", x, y]);
}
case "v":
r[1] = +(pa[1] - y).toFixed(3);
break;
+ case "m":
+ mx = pa[1];
+ my = pa[2];
default:
for (var j = 1, jj = pa.length; j < jj; j++) {
r[j] = +(pa[j] - ((j % 2) ? x : y)).toFixed(3);
}
} else {
r = res[i] = [];
+ if (pa[0] == "m") {
+ mx = pa[1] + x;
+ my = pa[2] + y;
+ }
for (var k = 0, kk = pa.length; k < kk; k++) {
res[i][k] = pa[k];
}
var len = res[i].length;
switch (res[i][0]) {
case "z":
+ x = mx;
+ y = my;
break;
case "h":
x += +res[i][len - 1];
y += +res[i][len - 1];
}
}
- res.toString = pathArray.toString;
+ res.toString = R._path2string;
return res;
- },
- pathToAbsolute = function (pathArray) {
+ }, 0, pathClone),
+ pathToAbsolute = cacher(function (pathArray) {
+ if (!R.is(pathArray, "array") || !R.is(pathArray && pathArray[0], "array")) { // rough assumption
+ pathArray = R.parsePathString(pathArray);
+ }
var res = [],
x = 0,
y = 0,
+ mx = 0,
+ my = 0,
start = 0;
- if (typeof pathArray == "string") {
- pathArray = R.parsePathString(pathArray);
- }
if (pathArray[0][0] == "M") {
x = +pathArray[0][1];
y = +pathArray[0][2];
+ mx = x;
+ my = y;
start++;
res[0] = ["M", x, y];
}
case "A":
r[1] = pa[1];
r[2] = pa[2];
- r[3] = 0;
+ r[3] = pa[3];
r[4] = pa[4];
r[5] = pa[5];
- r[6] = +(pa[6] + x).toFixed(3);
- r[7] = +(pa[7] + y).toFixed(3);
+ r[6] = +(pa[6] + x);
+ r[7] = +(pa[7] + y);
break;
case "V":
r[1] = +pa[1] + y;
case "H":
r[1] = +pa[1] + x;
break;
+ case "M":
+ mx = +pa[1] + x;
+ my = +pa[2] + y;
default:
for (var j = 1, jj = pa.length; j < jj; j++) {
r[j] = +pa[j] + ((j % 2) ? x : y);
}
}
} else {
- r = res[i] = [];
for (var k = 0, kk = pa.length; k < kk; k++) {
res[i][k] = pa[k];
}
}
switch (r[0]) {
case "Z":
+ x = mx;
+ y = my;
break;
case "H":
x = r[1];
y = res[i][res[i].length - 1];
}
}
- res.toString = pathArray.toString;
+ res.toString = R._path2string;
return res;
- },
+ }, null, pathClone),
l2c = function (x1, y1, x2, y2) {
return [x1, y1, x2, y2, x2, y2];
},
// for more information of where this math came from visit:
// http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
var _120 = Math.PI * 120 / 180,
- res = [];
+ rad = Math.PI / 180 * (+angle || 0),
+ res = [],
+ xy,
+ rotate = cacher(function (x, y, rad) {
+ var X = x * Math.cos(rad) - y * Math.sin(rad),
+ Y = x * Math.sin(rad) + y * Math.cos(rad);
+ return {x: X, y: Y};
+ });
if (!recursive) {
- var x = (x1 - x2) / 2,
- y = (y1 - y2) / 2,
- rx2 = rx * rx,
+ xy = rotate(x1, y1, -rad);
+ x1 = xy.x;
+ y1 = xy.y;
+ xy = rotate(x2, y2, -rad);
+ x2 = xy.x;
+ y2 = xy.y;
+ var cos = Math.cos(Math.PI / 180 * angle),
+ sin = Math.sin(Math.PI / 180 * angle),
+ x = (x1 - x2) / 2,
+ y = (y1 - y2) / 2;
+ rx = Math.max(rx, Math.abs(x));
+ ry = Math.max(ry, Math.abs(y));
+ var rx2 = rx * rx,
ry2 = ry * ry,
k = (large_arc_flag == sweep_flag ? -1 : 1) *
- Math.sqrt(Math.abs(rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x)),
+ Math.sqrt(Math.abs((rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x))),
cx = k * rx * y / ry + (x1 + x2) / 2,
cy = k * -ry * x / rx + (y1 + y2) / 2,
f1 = Math.asin((y1 - cy) / ry),
f2 = f1 + _120 * (sweep_flag && f2 > f1 ? 1 : -1);
x2 = cx + rx * Math.cos(f2);
y2 = cy + ry * Math.sin(f2);
- res = arguments.callee(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
+ res = a2c(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
}
+ df = f2 - f1;
var c1 = Math.cos(f1),
s1 = Math.sin(f1),
c2 = Math.cos(f2),
s2 = Math.sin(f2),
- df = f2 - f1,
t = Math.tan(df / 4),
hx = 4 / 3 * rx * t,
hy = 4 / 3 * ry * t,
return [m2, m3, m4].concat(res);
} else {
res = [m2, m3, m4].concat(res).join(",").split(",");
- for (var i = res.length; i--;) {
- res[i] = +res[i];
+ var newres = [];
+ for (var i = 0, ii = res.length; i < ii; i++) {
+ newres[i] = i % 2 ? rotate(res[i - 1], res[i], rad).y : rotate(res[i], res[i + 1], rad).x;
}
- return res;
+ return newres;
}
},
- findDotAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
+ findDotAtSegment = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
var x = Math.pow(1 - t, 3) * p1x + Math.pow(1 - t, 2) * 3 * t * c1x + (1 - t) * 3 * t * t * c2x + Math.pow(t, 3) * p2x,
y = Math.pow(1 - t, 3) * p1y + Math.pow(1 - t, 2) * 3 * t * c1y + (1 - t) * 3 * t * t * c2y + Math.pow(t, 3) * p2y,
mx = p1x + 2 * t * (c1x - p1x) + t * t * (c2x - 2 * c1x + p1x),
cx = (1 - t) * c2x + t * p2x,
cy = (1 - t) * c2y + t * p2y;
return {x: x, y: y, m: {x: mx, y: my}, n: {x: nx, y: ny}, start: {x: ax, y: ay}, end: {x: cx, y: cy}};
- },
- path2curve = function (path, path2) {
- path2curve.cache = path2curve.cache || {};
- path2curve.count = path2curve.count || [];
- if (path in path2curve.cache) {
- return path2curve.cache[path + "&" + path2];
- }
+ }),
+ curveDim = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
+ var a = (c2x - 2 * c1x + p1x) - (p2x - 2 * c2x + c1x),
+ b = 2 * (c1x - p1x) - 2 * (c2x - c1x),
+ c = p1x - c1x,
+ t1 = (-b + Math.sqrt(b * b - 4 * a * c)) / 2 / a,
+ t2 = (-b - Math.sqrt(b * b - 4 * a * c)) / 2 / a,
+ y = [p1y, p2y],
+ x = [p1x, p2x],
+ dot1 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1 > 0 && t1 < 1 ? t1 : 0),
+ dot2 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2 > 0 && t2 < 1 ? t2 : 0);
+ x = x.concat(dot1.x, dot2.x);
+ y = y.concat(dot1.y, dot2.y);
+ a = (c2y - 2 * c1y + p1y) - (p2y - 2 * c2y + c1y);
+ b = 2 * (c1y - p1y) - 2 * (c2y - c1y);
+ c = p1y - c1y;
+ t1 = (-b + Math.sqrt(b * b - 4 * a * c)) / 2 / a;
+ t2 = (-b - Math.sqrt(b * b - 4 * a * c)) / 2 / a;
+ dot1 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1 > 0 && t1 < 1 ? t1 : 0);
+ dot2 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2 > 0 && t2 < 1 ? t2 : 0);
+ x = x.concat(dot1.x, dot2.x);
+ y = y.concat(dot1.y, dot2.y);
+ return {
+ min: {x: Math.min.apply(Math, x), y: Math.min.apply(Math, y)},
+ max: {x: Math.max.apply(Math, x), y: Math.max.apply(Math, y)}
+ };
+ }),
+ path2curve = cacher(function (path, path2) {
var p = pathToAbsolute(path),
p2 = path2 && pathToAbsolute(path2),
attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0},
attrs2 = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0},
processPath = function (path, d) {
+ var nx, ny;
if (!path) {
return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
}
d.Y = path[2];
break;
case "A":
- path = ["C"].concat(a2c(d.x, d.y, path[1], path[2], path[3], path[4], path[5], path[6], path[7]));
+ path = ["C"].concat(a2c.apply(0, [d.x, d.y].concat(path.slice(1))));
break;
case "S":
- var nx = d.x + (d.x - (d.bx || d.x)),
- ny = d.y + (d.y - (d.by || d.y));
- path = ["C", nx, ny, path[1], path[2], path[3], path[4]];
+ nx = d.x + (d.x - (d.bx || d.x));
+ ny = d.y + (d.y - (d.by || d.y));
+ path = ["C", nx, ny].concat(path.slice(1));
break;
case "T":
- var nx = d.x + (d.x - (d.bx || d.x)),
- ny = d.y + (d.y - (d.by || d.y));
+ nx = d.x + (d.x - (d.bx || d.x));
+ ny = d.y + (d.y - (d.by || d.y));
path = ["C"].concat(q2c(d.x, d.y, nx, ny, path[1], path[2]));
break;
case "Q":
attrs2.x = p2 && seg2[seg2len - 2];
attrs2.y = p2 && seg2[seg2len - 1];
}
- if (path2curve.count.length > 100) {
- delete path2curve.cache[path2curve.count.unshift()];
- }
- path2curve.count.push(path + "&" + path2);
- return (path2curve.cache[path + "&" + path2] = p2 ? [p, p2] : p);
- },
- toGradient = function (gradient) {
- if (typeof gradient == "string") {
+ return p2 ? [p, p2] : p;
+ }, null, pathClone),
+ toGradient = cacher(function (gradient) {
+ if (R.is(gradient, "string")) {
gradient = gradient.split(/\s*\-\s*/);
var angle = gradient.shift();
if (angle.toLowerCase() == "v") {
grobj.vector[1] = -grobj.vector[3];
grobj.vector[3] = 0;
}
- grobj.vector[0] = grobj.vector[0].toFixed(3);
- grobj.vector[1] = grobj.vector[1].toFixed(3);
- grobj.vector[2] = grobj.vector[2].toFixed(3);
- grobj.vector[3] = grobj.vector[3].toFixed(3);
+ grobj.vector[0] = grobj.vector[0];
+ grobj.vector[1] = grobj.vector[1];
+ grobj.vector[2] = grobj.vector[2];
+ grobj.vector[3] = grobj.vector[3];
for (var i = 0, ii = gradient.length; i < ii; i++) {
var dot = {},
par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
} else {
return gradient;
}
- },
+ }),
getContainer = function () {
var container,
x,
y,
width,
height;
- if (typeof arguments[0] == "string" || typeof arguments[0] == "object") {
- if (typeof arguments[0] == "string") {
+ if (R.is(arguments[0], "string") || R.is(arguments[0], "object")) {
+ if (R.is(arguments[0], "string")) {
container = doc.getElementById(arguments[0]);
} else {
container = arguments[0];
return {container: container, width: arguments[1], height: arguments[2]};
}
}
- } else if (typeof arguments[0] == "number" && arguments.length > 3) {
+ } else if (R.is(arguments[0], "number") && arguments.length > 3) {
return {container: 1, x: arguments[0], y: arguments[1], width: arguments[2], height: arguments[3]};
}
},
// SVG
if (R.svg) {
+ paper.svgns = "http://www.w3.org/2000/svg";
+ paper.xlink = "http://www.w3.org/1999/xlink";
+ var round = function (num) {
+ return +num + (Math.floor(num) == num) * .5;
+ };
+ var roundPath = function (path) {
+ for (var i = 0, ii = path.length; i < ii; i++) {
+ if (path[i][0].toLowerCase() != "a") {
+ for (var j = 1, jj = path[i].length; j < jj; j++) {
+ path[i][j] = round(path[i][j]);
+ }
+ } else {
+ path[i][6] = round(path[i][6]);
+ path[i][7] = round(path[i][7]);
+ }
+ }
+ return path;
+ };
+ var $ = function (el, attr) {
+ if (attr) {
+ for (var key in attr) if (attr.hasOwnProperty(key)) {
+ el.setAttribute(key, attr[key]);
+ }
+ } else {
+ return doc.createElementNS(paper.svgns, el);
+ }
+ };
R.toString = function () {
return "Your browser supports SVG.\nYou are running Rapha\u00ebl " + this.version;
};
- var thePath = function (params, pathString, SVG) {
- var el = doc.createElementNS(SVG.svgns, "path");
- if (SVG.canvas) {
- SVG.canvas.appendChild(el);
- }
+ var thePath = function (pathString, SVG) {
+ var el = $("path");
+ SVG.canvas && SVG.canvas.appendChild(el);
var p = new Element(el, SVG);
- p.isAbsolute = true;
- for (var method in pathMethods) {
- p[method] = pathMethods[method];
- }
p.type = "path";
- p.attrs.path = "" + (pathString || "");
- pathString && p.node.setAttribute("d", R.parsePathString(pathString));
- if (params) {
- !params.gradient && (params.fill = params.fill || "none");
- params.stroke = params.stroke || "#000";
- } else {
- params = {fill: "none", stroke: "#000"};
- }
- setFillAndStroke(p, params);
+ setFillAndStroke(p, {fill: "none", stroke: "#000", path: pathString});
return p;
};
var addGradientFill = function (o, gradient, SVG) {
gradient = toGradient(gradient);
- var el = doc.createElementNS(SVG.svgns, (gradient.type || "linear") + "Gradient");
- el.id = "raphael-gradient-" + R.idGenerator++;
+ var el = $((gradient.type || "linear") + "Gradient");
+ el.id = "r" + (R.idGenerator++).toString(36);
if (gradient.vector && gradient.vector.length) {
- el.setAttribute("x1", gradient.vector[0]);
- el.setAttribute("y1", gradient.vector[1]);
- el.setAttribute("x2", gradient.vector[2]);
- el.setAttribute("y2", gradient.vector[3]);
+ $(el, {
+ x1: gradient.vector[0],
+ y1: gradient.vector[1],
+ x2: gradient.vector[2],
+ y2: gradient.vector[3]
+ });
}
SVG.defs.appendChild(el);
var isopacity = true;
for (var i = 0, ii = gradient.dots.length; i < ii; i++) {
- var stop = doc.createElementNS(SVG.svgns, "stop");
+ var stop = $("stop");
if (gradient.dots[i].offset) {
isopacity = false;
}
- stop.setAttribute("offset", gradient.dots[i].offset ? gradient.dots[i].offset : (i == 0) ? "0%" : "100%");
- stop.setAttribute("stop-color", R.getRGB(gradient.dots[i].color).hex || "#fff");
+ $(stop, {
+ offset: gradient.dots[i].offset ? gradient.dots[i].offset : (i == 0) ? "0%" : "100%",
+ "stop-color": R.getRGB(gradient.dots[i].color).hex || "#fff"
+ });
// ignoring opacity for internal points, because VML doesn't support it
el.appendChild(stop);
};
- if (isopacity && typeof gradient.dots[ii - 1].opacity != "undefined") {
- stop.setAttribute("stop-opacity", gradient.dots[ii - 1].opacity);
+ if (isopacity && gradient.dots[ii - 1].opacity != null) {
+ $(stop, {"stop-opacity": gradient.dots[ii - 1].opacity});
}
- o.setAttribute("fill", "url(#" + el.id + ")");
+ $(o, {
+ fill: "url(#" + el.id + ")",
+ opacity: 1,
+ "fill-opacity": 1
+ });
o.style.fill = "";
o.style.opacity = 1;
o.style.fillOpacity = 1;
- o.setAttribute("opacity", 1);
- o.setAttribute("fill-opacity", 1);
};
var updatePosition = function (o) {
- if (o.pattern) {
- var bbox = o.getBBox();
- o.pattern.setAttribute("patternTransform", "translate(".concat(bbox.x, ",", bbox.y, ")"));
- }
+ var bbox = o.getBBox();
+ $(o.pattern, {patternTransform: R.format("translate({0},{1})", bbox.x, bbox.y)});
};
var setFillAndStroke = function (o, params) {
var dasharray = {
},
node = o.node,
attrs = o.attrs,
- rot = attrs.rotation,
+ rot = o.attr("rotation"),
addDashes = function (o, value) {
value = dasharray[(value + "").toLowerCase()];
if (value) {
var width = o.attrs["stroke-width"] || "1",
butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
dashes = [];
- for (var i = 0, ii = value.length; i < ii; i++) {
- dashes.push(value[i] * width + ((i % 2) ? 1 : -1) * butt);
+ var i = value.length;
+ while (i--) {
+ dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
}
- value = dashes.join(",");
- node.setAttribute("stroke-dasharray", value);
+ $(node, {"stroke-dasharray": dashes.join(",")});
}
};
- o.rotate(0, true);
- for (var att in params) {
+ parseFloat(rot) && o.rotate(0, true);
+ for (var att in params) if (params.hasOwnProperty(att)) {
if (!(att in availableAttrs)) {
continue;
}
case "target":
var pn = node.parentNode;
if (pn.tagName.toLowerCase() != "a") {
- var hl = doc.createElementNS(o.paper.svgns, "a");
+ var hl = $("a");
pn.insertBefore(hl, node);
hl.appendChild(node);
pn = hl;
}
pn.setAttributeNS(o.paper.xlink, att, value);
break;
+ case "clip-rect":
+ var rect = (value + "").split(separator);
+ if (rect.length == 4) {
+ o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
+ var el = $("clipPath"),
+ rc = $("rect");
+ el.id = "r" + (R.idGenerator++).toString(36);
+ $(rc, {
+ x: rect[0],
+ y: rect[1],
+ width: rect[2],
+ height: rect[3]
+ });
+ el.appendChild(rc);
+ o.paper.defs.appendChild(el);
+ $(node, {"clip-path": "url(#" + el.id + ")"});
+ o.clip = rc;
+ }
+ if (!value) {
+ var clip = doc.getElementById(node.getAttribute("clip-path").replace(/(^url\(#|\)$)/g, ""));
+ clip && clip.parentNode.removeChild(clip);
+ $(node, {"clip-path": ""});
+ delete o.clip;
+ }
+ break;
case "path":
- if (o.type == "path") {
- node.setAttribute("d", R.parsePathString(value));
+ if (value && o.type == "path") {
+ attrs.path = roundPath(pathToAbsolute(value));
+ $(node, {d: attrs.path});
}
case "width":
node.setAttribute(att, value);
value = -attrs.x - (attrs.width || 0);
}
case "rx":
+ if (o.type == "rect") {
+ break;
+ }
case "cx":
node.setAttribute(att, value);
- updatePosition(o);
+ o.pattern && updatePosition(o);
break;
case "height":
node.setAttribute(att, value);
value = -attrs.y - (attrs.height || 0);
}
case "ry":
+ if (o.type == "rect") {
+ break;
+ }
case "cy":
node.setAttribute(att, value);
- updatePosition(o);
+ o.pattern && updatePosition(o);
break;
case "r":
if (o.type == "rect") {
- node.setAttribute("rx", value);
- node.setAttribute("ry", value);
+ $(node, {rx: value, ry: value});
} else {
node.setAttribute(att, value);
}
addDashes(o, value);
break;
case "rotation":
+ rot = value;
o.rotate(value, true);
break;
case "translation":
o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, +xy[2] || null, +xy[3] || null);
break;
case "fill":
- var isURL = (value + "").match(/^url\(([^\)]+)\)$/i);
+ var isURL = (value + "").match(/^url\(['"]?([^\)]+)['"]?\)$/i);
if (isURL) {
- var el = doc.createElementNS(o.paper.svgns, "pattern"),
- ig = doc.createElementNS(o.paper.svgns, "image");
- el.id = "raphael-pattern-" + R.idGenerator++;
- el.setAttribute("x", 0);
- el.setAttribute("y", 0);
- el.setAttribute("patternUnits", "userSpaceOnUse");
- ig.setAttribute("x", 0);
- ig.setAttribute("y", 0);
+ var el = $("pattern"),
+ ig = $("image");
+ el.id = "r" + (R.idGenerator++).toString(36);
+ $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse"});
+ $(ig, {x: 0, y:0});
ig.setAttributeNS(o.paper.xlink, "href", isURL[1]);
el.appendChild(ig);
img.style.top = "-9999em";
img.style.left = "-9999em";
img.onload = function () {
- el.setAttribute("width", this.offsetWidth);
- el.setAttribute("height", this.offsetHeight);
- ig.setAttribute("width", this.offsetWidth);
- ig.setAttribute("height", this.offsetHeight);
+ $(el, {width: this.offsetWidth, height: this.offsetHeight});
+ $(ig, {width: this.offsetWidth, height: this.offsetHeight});
doc.body.removeChild(this);
paper.safari();
};
img.src = isURL[1];
o.paper.defs.appendChild(el);
node.style.fill = "url(#" + el.id + ")";
- node.setAttribute("fill", "url(#" + el.id + ")");
+ $(node, {fill: "url(#" + el.id + ")"});
o.pattern = el;
- updatePosition(o);
+ o.pattern && updatePosition(o);
break;
}
delete params.gradient;
delete attrs.gradient;
- if (typeof attrs.opacity != "undefined" && typeof params.opacity == "undefined" ) {
+ if (!R.is(attrs.opacity, "undefined") && R.is(params.opacity, "undefined") ) {
node.style.opacity = attrs.opacity;
// Need following line for Firefox
- node.setAttribute("opacity", attrs.opacity);
+ $(node, {opacity: attrs.opacity});
}
- if (typeof attrs["fill-opacity"] != "undefined" && typeof params["fill-opacity"] == "undefined" ) {
- node.style.fillOpacity = o.attrs["fill-opacity"];
+ if (!R.is(attrs["fill-opacity"], "undefined") && R.is(params["fill-opacity"], "undefined") ) {
+ node.style.fillOpacity = attrs["fill-opacity"];
// Need following line for Firefox
- node.setAttribute("fill-opacity", attrs["fill-opacity"]);
+ $(node, {"fill-opacity": attrs["fill-opacity"]});
}
case "stroke":
node.style[att] = R.getRGB(value).hex;
}
break;
}
- default :
+ default:
+ att == "font-size" && (value = parseInt(value, 10) + "px");
var cssrule = att.replace(/(\-.)/g, function (w) {
return w.substring(1).toUpperCase();
});
}
tuneText(o, params);
- o.rotate(attrs.rotation, true);
+ parseInt(rot, 10) && o.rotate(rot, true);
};
var leading = 1.2;
var tuneText = function (el, params) {
}
var texts = (params.text + "").split("\n");
for (var i = 0, ii = texts.length; i < ii; i++) {
- var tspan = doc.createElementNS(el.paper.svgns, "tspan");
- i && tspan.setAttribute("dy", fontSize * leading);
- i && tspan.setAttribute("x", a.x);
+ var tspan = $("tspan");
+ i && $(tspan, {dy: fontSize * leading, x: a.x});
tspan.appendChild(doc.createTextNode(texts[i]));
node.appendChild(tspan);
}
} else {
var texts = node.getElementsByTagName("tspan");
for (var i = 0, ii = texts.length; i < ii; i++) {
- i && texts[i].setAttribute("dy", fontSize * leading);
- i && texts[i].setAttribute("x", a.x);
+ i && $(texts[i], {dy: fontSize * leading, x: a.x});
}
}
- node.setAttribute("y", a.y);
+ $(node, {y: a.y});
var bb = el.getBBox(),
dif = a.y - (bb.y + bb.height / 2);
- dif && node.setAttribute("y", a.y + dif);
+ dif && $(node, {y: a.y + dif});
};
var Element = function (node, svg) {
var X = 0,
this._ = {
tx: 0,
ty: 0,
- rt: {deg: 0, x: 0, y: 0},
+ rt: {deg: 0, cx: 0, cy: 0},
sx: 1,
sy: 1
};
cx = cx == null ? bbox.x + bbox.width / 2 : cx;
cy = cy == null ? bbox.y + bbox.height / 2 : cy;
if (this._.rt.deg) {
- this.transformations[0] = ("rotate(" + this._.rt.deg + " " + cx + " " + cy + ")");
+ this.transformations[0] = R.format("rotate({0} {1} {2})", this._.rt.deg, cx, cy);
+ this.clip && $(this.clip, {transform: R.format("rotate({0} {1} {2})", -this._.rt.deg, cx, cy)});
} else {
this.transformations[0] = "";
+ this.clip && $(this.clip, {transform: ""});
}
- this.node.setAttribute("transform", this.transformations.join(" "));
+ $(this.node, {transform: this.transformations.join(" ")});
return this;
};
Element.prototype.hide = function () {
this.node.parentNode.removeChild(this.node);
};
Element.prototype.getBBox = function () {
+ if (this.type == "path") {
+ return pathDimensions(this.attrs.path);
+ }
if (this.node.style.display == "none") {
this.show();
var hide = true;
return bbox;
};
Element.prototype.attr = function () {
- if (arguments.length == 1 && typeof arguments[0] == "string") {
+ if (arguments.length == 1 && R.is(arguments[0], "string")) {
if (arguments[0] == "translation") {
return this.translate();
}
}
return this.attrs[arguments[0]];
}
- if (arguments.length == 1 && R.isArray(arguments[0])) {
+ if (arguments.length == 1 && R.is(arguments[0], "array")) {
var values = {};
- for (var j in arguments[0]) {
+ for (var j in arguments[0]) if (arguments[0].hasOwnProperty(j)) {
values[arguments[0][j]] = this.attrs[arguments[0][j]];
}
return values;
var params = {};
params[arguments[0]] = arguments[1];
setFillAndStroke(this, params);
- } else if (arguments.length == 1 && typeof arguments[0] == "object") {
+ } else if (arguments.length == 1 && R.is(arguments[0], "object")) {
setFillAndStroke(this, arguments[0]);
}
return this;
node.parentNode.insertBefore(this.node, node);
return this;
};
- var theCircle = function (svg, x, y, r) {
- var el = doc.createElementNS(svg.svgns, "circle");
- el.setAttribute("cx", x);
- el.setAttribute("cy", y);
- el.setAttribute("r", r);
- el.setAttribute("fill", "none");
- el.setAttribute("stroke", "#000");
- if (svg.canvas) {
- svg.canvas.appendChild(el);
+ Element.prototype.blur = function (size) {
+ // Experimental. No WebKit support.
+ if (size != "none") {
+ var fltr = $("filter"),
+ blur = $("feGaussianBlur");
+ fltr.id = "r" + (R.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");
}
+ };
+
+ var theCircle = function (svg, x, y, r) {
+ x = round(x);
+ y = round(y);
+ var el = $("circle");
+ svg.canvas && svg.canvas.appendChild(el);
var res = new Element(el, svg);
- res.attrs = res.attrs || {};
- res.attrs.cx = x;
- res.attrs.cy = y;
- res.attrs.r = r;
- res.attrs.stroke = "#000";
+ res.attrs = {cx: x, cy: y, r: r, fill: "none", stroke: "#000"};
res.type = "circle";
+ $(el, res.attrs);
return res;
};
var theRect = function (svg, x, y, w, h, r) {
- var el = doc.createElementNS(svg.svgns, "rect");
- el.setAttribute("x", x);
- el.setAttribute("y", y);
- el.setAttribute("width", w);
- el.setAttribute("height", h);
- if (r) {
- el.setAttribute("rx", r);
- el.setAttribute("ry", r);
- }
- el.setAttribute("fill", "none");
- el.setAttribute("stroke", "#000");
- if (svg.canvas) {
- svg.canvas.appendChild(el);
- }
+ x = round(x);
+ y = round(y);
+ var el = $("rect");
+ svg.canvas && svg.canvas.appendChild(el);
var res = new Element(el, svg);
- res.attrs = res.attrs || {};
- res.attrs.x = x;
- res.attrs.y = y;
- res.attrs.width = w;
- res.attrs.height = h;
- res.attrs.stroke = "#000";
- if (r) {
- res.attrs.rx = res.attrs.ry = r;
- }
+ res.attrs = {x: x, y: y, width: w, height: h, r: r || 0, rx: r || 0, ry: r || 0, fill: "none", stroke: "#000"};
res.type = "rect";
+ $(el, res.attrs);
return res;
};
var theEllipse = function (svg, x, y, rx, ry) {
- var el = doc.createElementNS(svg.svgns, "ellipse");
- el.setAttribute("cx", x);
- el.setAttribute("cy", y);
- el.setAttribute("rx", rx);
- el.setAttribute("ry", ry);
- el.setAttribute("fill", "none");
- el.setAttribute("stroke", "#000");
- if (svg.canvas) {
- svg.canvas.appendChild(el);
- }
+ x = round(x);
+ y = round(y);
+ var el = $("ellipse");
+ svg.canvas && svg.canvas.appendChild(el);
var res = new Element(el, svg);
- res.attrs = res.attrs || {};
- res.attrs.cx = x;
- res.attrs.cy = y;
- res.attrs.rx = rx;
- res.attrs.ry = ry;
- res.attrs.stroke = "#000";
+ res.attrs = {cx: x, cy: y, rx: rx, ry: ry, fill: "none", stroke: "#000"};
res.type = "ellipse";
+ $(el, res.attrs);
return res;
};
var theImage = function (svg, src, x, y, w, h) {
- var el = doc.createElementNS(svg.svgns, "image");
- el.setAttribute("x", x);
- el.setAttribute("y", y);
- el.setAttribute("width", w);
- el.setAttribute("height", h);
- el.setAttribute("preserveAspectRatio", "none");
+ var el = $("image");
+ $(el, {x: x, y: y, width: w, height: h, preserveAspectRatio: "none"});
el.setAttributeNS(svg.xlink, "href", src);
- if (svg.canvas) {
- svg.canvas.appendChild(el);
- }
+ svg.canvas && svg.canvas.appendChild(el);
var res = new Element(el, svg);
- res.attrs = res.attrs || {};
- res.attrs.src = src;
- res.attrs.x = x;
- res.attrs.y = y;
- res.attrs.width = w;
- res.attrs.height = h;
+ res.attrs = {x: x, y: y, width: w, height: h, src: src};
res.type = "image";
return res;
};
var theText = function (svg, x, y, text) {
- var el = doc.createElementNS(svg.svgns, "text");
- el.setAttribute("x", x);
- el.setAttribute("y", y);
- el.setAttribute("text-anchor", "middle");
- if (svg.canvas) {
- svg.canvas.appendChild(el);
- }
+ var el = $("text");
+ $(el, {x: x, y: y, "text-anchor": "middle"});
+ svg.canvas && svg.canvas.appendChild(el);
var res = new Element(el, svg);
- res.attrs = res.attrs || {};
- res.attrs.text = text;
- res.attrs.x = x;
- res.attrs.y = y;
+ res.attrs = {x: x, y: y, "text-anchor": "middle", text: text, font: availableAttrs.font, stroke: "none", fill: "#000"};
res.type = "text";
- setFillAndStroke(res, {font: availableAttrs.font, stroke: "none", fill: "#000", text: text});
+ setFillAndStroke(res, res.attrs);
return res;
};
var setSize = function (width, height) {
if (!container) {
throw new Error("SVG container not found.");
}
- paper.canvas = doc.createElementNS(paper.svgns, "svg");
- paper.canvas.setAttribute("width", width || 512);
+ paper.canvas = $("svg");
+ var cnvs = paper.canvas,
+ stl = cnvs.style;
+ cnvs.setAttribute("width", width || 512);
paper.width = width || 512;
- paper.canvas.setAttribute("height", height || 342);
+ cnvs.setAttribute("height", height || 342);
paper.height = height || 342;
if (container == 1) {
- doc.body.appendChild(paper.canvas);
- paper.canvas.style.position = "absolute";
- paper.canvas.style.left = x + "px";
- paper.canvas.style.top = y + "px";
+ doc.body.appendChild(cnvs);
+ stl.position = "absolute";
+ stl.left = x + "px";
+ stl.top = y + "px";
} else {
if (container.firstChild) {
- container.insertBefore(paper.canvas, container.firstChild);
+ container.insertBefore(cnvs, container.firstChild);
} else {
- container.appendChild(paper.canvas);
+ container.appendChild(cnvs);
}
}
container = {
- canvas: paper.canvas,
+ canvas: cnvs,
clear: function () {
while (this.canvas.firstChild) {
this.canvas.removeChild(this.canvas.firstChild);
}
- this.defs = doc.createElementNS(paper.svgns, "defs");
+ this.desc = $("desc");
+ this.defs = $("defs");
+ this.desc.appendChild(doc.createTextNode("Created with Rapha\u00ebl"));
+ this.canvas.appendChild(this.desc);
this.canvas.appendChild(this.defs);
}
};
- for (var prop in paper) {
+ for (var prop in paper) if (paper.hasOwnProperty(prop)) {
if (prop != "create") {
container[prop] = paper[prop];
}
paper.remove = function () {
this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
};
- paper.svgns = "http://www.w3.org/2000/svg";
- paper.xlink = "http://www.w3.org/1999/xlink";
- paper.safari = function () {
- if ({"Apple Computer, Inc.": 1, "Google Inc.": 1}[navigator.vendor]) {
- var rect = this.rect(-this.width, -this.height, this.width * 3, this.height * 3).attr({stroke: "none"});
+ if ({"Apple Computer, Inc.": 1, "Google Inc.": 1}[navigator.vendor]) { // Safari or Chrome (WebKit)
+ paper.safari = function () {
+ var rect = this.rect(-99, -99, this.width + 99, this.height + 99);
setTimeout(function () {rect.remove();});
- }
- };
+ };
+ } else {
+ paper.safari = function () {};
+ }
}
// VML
var path2vml = function (path) {
var pa = path2curve(path);
for (var i = 0, ii = pa.length; i < ii; i++) {
- for (var j = 0, jj = pa[i].length; j < jj; j++) {
- pa[i][j] = isNaN(pa[i][j]) ? pa[i][j] : Math.round(pa[i][j]);
+ pa[i][0] = (pa[i][0] + "").toLowerCase();
+ pa[i][0] == "z" && (pa[i][0] = "x");
+ for (var j = 1, jj = pa[i].length; j < jj; j++) {
+ pa[i][j] = Math.round(pa[i][j]);
}
}
- return (pa + "").toLowerCase().replace(/z/g, "x");
+ return (pa + "");
};
R.toString = function () {
return "Your browser doesn\u2019t support SVG. Assuming it is Internet Explorer and falling down to VML.\nYou are running Rapha\u00ebl " + this.version;
};
- var thePath = function (params, pathString, VML) {
+ var thePath = function (pathString, VML) {
var g = createNode("group"), gl = g.style;
gl.position = "absolute";
gl.left = 0;
ol.width = VML.width + "px";
ol.height = VML.height + "px";
el.path = "";
- if (params["class"]) {
- el.className = "rvml " + params["class"];
- }
el.coordsize = this.coordsize;
el.coordorigin = this.coordorigin;
g.appendChild(el);
p.isAbsolute = true;
p.type = "path";
p.path = [];
- p.last = {x: 0, y: 0, bx: 0, by: 0, isAbsolute: true};
+ // p.last = {x: 0, y: 0, bx: 0, by: 0, isAbsolute: true};
p.Path = "";
- for (var method in pathMethods) {
- p[method] = pathMethods[method];
- }
-
- if (params) {
- params.fill = params.fill || "none";
- params.stroke = params.stroke || "#000";
- } else {
- params = {fill: "none", stroke: "#000"};
- }
if (pathString) {
- p.node.path = path2vml(pathString);
- p.attrs.path = pathString;
- }
- setFillAndStroke(p, params);
- if (params.gradient) {
- addGradientFill(p, params.gradient);
+ p.attrs.path = R.parsePathString(pathString);
+ p.node.path = path2vml(p.attrs.path);
}
+ setFillAndStroke(p, {fill: "none", stroke: "#000"});
p.setBox();
VML.canvas.appendChild(g);
return p;
};
var setFillAndStroke = function (o, params) {
+ o.attrs = o.attrs || {};
var node = o.node,
+ a = o.attrs,
s = node.style,
xy,
res = o;
- o.attrs = o.attrs || {};
- for (var par in params) {
- o.attrs[par] = params[par];
+ for (var par in params) if (params.hasOwnProperty(par)) {
+ a[par] = params[par];
}
params.href && (node.href = params.href);
params.title && (node.title = params.title);
params.target && (node.target = params.target);
if (params.path && o.type == "path") {
- o.node.path = path2vml(params.path);
+ a.path = R.parsePathString(params.path);
+ node.path = path2vml(a.path);
}
if (params.rotation != null) {
o.rotate(params.rotation, true);
xy = (params.scale + "").split(separator);
o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, +xy[2] || null, +xy[3] || null);
}
+ if ("clip-rect" in params) {
+ var rect = (params["clip-rect"] + "").split(separator);
+ if (rect.length == 4) {
+ rect[2] = +rect[2] + (+rect[0]);
+ rect[3] = +rect[3] + (+rect[1]);
+ var div = node.clipRect || doc.createElement("div"),
+ dstyle = div.style,
+ group = node.parentNode;
+ dstyle.clip = R.format("rect({0}px {2}px {3}px {1}px)", rect);
+ if (!node.clipRect) {
+ dstyle.position = "absolute";
+ dstyle.top = 0;
+ dstyle.left = 0;
+ dstyle.width = o.paper.width + "px";
+ dstyle.height = o.paper.height + "px";
+ group.parentNode.insertBefore(div, group);
+ div.appendChild(group);
+ node.clipRect = div;
+ }
+ }
+ if (!params["clip-rect"]) {
+ node.clipRect && (node.clipRect.style.clip = "");
+ }
+ }
if (o.type == "image" && params.src) {
node.src = params.src;
}
if (o.type == "image" && params.opacity) {
node.filterOpacity = " progid:DXImageTransform.Microsoft.Alpha(opacity=" + (params.opacity * 100) + ")";
- node.style.filter = (node.filterMatrix || "") + (node.filterOpacity || "");
+ s.filter = (node.filterMatrix || "") + (node.filterOpacity || "");
}
params.font && (s.font = params.font);
params["font-family"] && (s.fontFamily = '"' + params["font-family"].split(",")[0].replace(/^['"]+|['"]+$/g, "") + '"');
params["font-size"] && (s.fontSize = params["font-size"]);
params["font-weight"] && (s.fontWeight = params["font-weight"]);
params["font-style"] && (s.fontStyle = params["font-style"]);
- if (typeof params.opacity != "undefined" || typeof params["stroke-width"] != "undefined" || typeof params.fill != "undefined" || typeof params.stroke != "undefined" || params["stroke-width"] || params["stroke-opacity"] || params["fill-opacity"] || params["stroke-dasharray"] || params["stroke-miterlimit"] || params["stroke-linejoin"] || params["stroke-linecap"]) {
- o = o.shape || node;
- var fill = (o.getElementsByTagName("fill") && o.getElementsByTagName("fill")[0]) || createNode("fill");
+ if (params.opacity != null ||
+ params["stroke-width"] != null ||
+ params.fill != null ||
+ params.stroke != null ||
+ params["stroke-width"] != null ||
+ params["stroke-opacity"] != null ||
+ params["fill-opacity"] != null ||
+ params["stroke-dasharray"] != null ||
+ params["stroke-miterlimit"] != null ||
+ params["stroke-linejoin"] != null ||
+ params["stroke-linecap"] != null) {
+ node = o.shape || node;
+ var fill = (node.getElementsByTagName("fill") && node.getElementsByTagName("fill")[0]),
+ newfill = false;
+ !fill && (newfill = fill = createNode("fill"));
if ("fill-opacity" in params || "opacity" in params) {
- var opacity = ((+params["fill-opacity"] + 1 || 2) - 1) * ((+params.opacity + 1 || 2) - 1);
+ var opacity = ((+a["fill-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1);
opacity < 0 && (opacity = 0);
opacity > 1 && (opacity = 1);
fill.opacity = opacity;
}
params.fill && (fill.on = true);
- if (typeof fill.on == "undefined" || params.fill == "none") {
+ if (fill.on == null || params.fill == "none") {
fill.on = false;
}
if (fill.on && params.fill) {
fill.type = "solid";
}
}
- o.appendChild(fill);
- var stroke = (o.getElementsByTagName("stroke") && o.getElementsByTagName("stroke")[0]) || createNode("stroke");
- if ((params.stroke && params.stroke != "none") || params["stroke-width"] || typeof params["stroke-opacity"] != "undefined" || params["stroke-dasharray"] || params["stroke-miterlimit"] || params["stroke-linejoin"] || params["stroke-linecap"]) {
+ newfill && node.appendChild(fill);
+ var stroke = (node.getElementsByTagName("stroke") && node.getElementsByTagName("stroke")[0]),
+ newstroke = false;
+ !stroke && (newstroke = stroke = createNode("stroke"));
+ if ((params.stroke && params.stroke != "none") ||
+ params["stroke-width"] ||
+ params["stroke-opacity"] != null ||
+ params["stroke-dasharray"] ||
+ params["stroke-miterlimit"] ||
+ params["stroke-linejoin"] ||
+ params["stroke-linecap"]) {
stroke.on = true;
}
- if (params.stroke == "none" || typeof stroke.on == "undefined" || params.stroke == 0) {
- stroke.on = false;
- }
- if (stroke.on && params.stroke) {
- stroke.color = R.getRGB(params.stroke).hex;
- }
- var opacity = ((+params["stroke-opacity"] + 1 || 2) - 1) * ((+params.opacity + 1 || 2) - 1);
+ (params.stroke == "none" || stroke.on == null || params.stroke == 0 || params["stroke-width"] == 0) && (stroke.on = false);
+ stroke.on && params.stroke && (stroke.color = R.getRGB(params.stroke).hex);
+ var opacity = ((+a["stroke-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1);
opacity < 0 && (opacity = 0);
opacity > 1 && (opacity = 1);
stroke.opacity = opacity;
};
stroke.dashstyle = dasharray[params["stroke-dasharray"]] || "";
}
- o.appendChild(stroke);
+ newstroke && node.appendChild(stroke);
}
if (res.type == "text") {
- var s = paper.span.style,
- a = res.attrs;
+ var s = paper.span.style;
a.font && (s.font = a.font);
a["font-family"] && (s.fontFamily = a["font-family"]);
a["font-size"] && (s.fontSize = a["font-size"]);
a["font-weight"] && (s.fontWeight = a["font-weight"]);
a["font-style"] && (s.fontStyle = a["font-style"]);
- paper.span.innerHTML = "";
- paper.span.appendChild(doc.createTextNode(res.node.string));
+ paper.span.innerHTML = res.node.string.replace(/</g, "<").replace(/&/g, "&").replace(/\n/g, "<br>");
res.W = a.w = paper.span.offsetWidth;
res.H = a.h = paper.span.offsetHeight;
res.X = a.x;
fill.on = true;
fill.method = "none";
fill.type = ((gradient.type + "").toLowerCase() == "radial") ? "gradientTitle" : "gradient";
- if (typeof gradient.dots[0].color != "undefined") {
+ if (!R.is(gradient.dots[0].color, "undefined")) {
fill.color = R.getRGB(gradient.dots[0].color).hex;
}
- if (typeof gradient.dots[gradient.dots.length - 1].color != "undefined") {
+ if (!R.is(gradient.dots[gradient.dots.length - 1].color, "undefined")) {
fill.color2 = R.getRGB(gradient.dots[gradient.dots.length - 1].color).hex;
}
var clrs = [];
clrs.push(gradient.dots[i].offset + " " + R.getRGB(gradient.dots[i].color).hex);
}
};
- var fillOpacity = typeof gradient.dots[gradient.dots.length - 1].opacity == "undefined" ? (typeof attrs.opacity == "undefined" ? 1 : attrs.opacity) : gradient.dots[gradient.dots.length - 1].opacity;
+ var fillOpacity = R.is(gradient.dots[gradient.dots.length - 1].opacity, "undefined") ? (R.is(attrs.opacity, "undefined") ? 1 : attrs.opacity) : gradient.dots[gradient.dots.length - 1].opacity;
if (clrs.length) {
fill.colors.value = clrs.join(",");
- fillOpacity = typeof attrs.opacity == "undefined" ? 1 : attrs.opacity;
+ fillOpacity = R.is(attrs.opacity, "undefined") ? 1 : attrs.opacity;
} else {
fill.colors && (fill.colors.value = "0% " + fill.color);
}
fill.opacity = fillOpacity;
- if (typeof gradient.angle != "undefined") {
+ if (!R.is(gradient.angle, "undefined")) {
fill.angle = (-gradient.angle + 270) % 360;
} else if (gradient.vector) {
fill.angle = getAngle.apply(null, gradient.vector);
// var fill = (this.shape || this.node).getElementsByTagName("fill");
// fill = fill[0] || {};
// var b = ((360 - this._.rt.deg) - 270) % 360;
- // typeof fill.angle != "undefined" && (fill.angle = b);
+ // !R.is(fill.angle, "undefined") && (fill.angle = b);
return this;
};
Element.prototype.setBox = function (params, cx, cy) {
var gs = this.Group.style,
os = (this.shape && this.shape.style) || this.node.style;
params = params || {};
- for (var i in params) {
+ for (var i in params) if (params.hasOwnProperty(i)) {
this.attrs[i] = params[i];
}
cx = cx || this._.rt.cx;
w = this.paper.width;
h = this.paper.height;
} else {
- var dim = pathDimensions(this.attrs.path),
+ var dim = pathDimensions(this.attrs.path);
x = dim.x;
y = dim.y;
w = dim.width;
};
Element.prototype.getBBox = function () {
if (this.type == "path") {
- return pathDimensions(this.attr("path"));
+ return pathDimensions(this.attrs.path);
}
return {
x: this.X + (this.bbx || 0),
this.shape && this.shape.parentNode.removeChild(this.shape);
};
Element.prototype.attr = function () {
- if (arguments.length == 1 && typeof arguments[0] == "string") {
+ if (arguments.length == 1 && R.is(arguments[0], "string")) {
if (arguments[0] == "translation") {
return this.translate();
}
}
return this.attrs[arguments[0]];
}
- if (this.attrs && arguments.length == 1 && R.isArray(arguments[0])) {
+ if (this.attrs && arguments.length == 1 && R.is(arguments[0], "array")) {
var values = {};
for (var i = 0, ii = arguments[0].length; i < ii; i++) {
values[arguments[0][i]] = this.attrs[arguments[0][i]];
params = {};
params[arguments[0]] = arguments[1];
}
- if (arguments.length == 1 && typeof arguments[0] == "object") {
+ if (arguments.length == 1 && R.is(arguments[0], "object")) {
params = arguments[0];
}
if (params) {
element.Group.parentNode.insertBefore(this.Group, element.Group);
return this;
};
+ Element.prototype.blur = function (size) {
+ var s = this.node.style,
+ f = s.filter;
+ f = f.replace(/progid:DXImageTransform\.Microsoft\.Blur\(pixelradius\=[^\)]+\)/g, "");
+ if (size != "none") {
+ s.filter = f + " progid:DXImageTransform.Microsoft.Blur(pixelradius=" + (+size || 1.5) + ")";
+ s.margin = R.format("-{0}px 0 0 -{0}px", Math.round(+size || 1.5));
+ } else {
+ s.filter = f;
+ s.margin = 0;
+ }
+ };
+
var theCircle = function (vml, x, y, r) {
var g = createNode("group"),
gl = g.style,
};
var setSize = function (width, height) {
var cs = this.canvas.style;
- this.width = width || this.width;
- this.height = height || this.height;
+ this.width = parseFloat(width || this.width);
+ this.height = parseFloat(height || this.height);
cs.width = this.width + "px";
cs.height = this.height + "px";
cs.clip = "rect(0 " + this.width + "px " + this.height + "px 0)";
- this.canvas.coordsize = this.width + " " + this.height;
+ this.coordsize = this.width + " " + this.height;
return this;
};
doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
try {
- if (!doc.namespaces.rvml) {
- doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
- }
+ !doc.namespaces.rvml && doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
var createNode = function (tagName) {
return doc.createElement('<rvml:' + tagName + ' class="rvml">');
};
var create = function () {
var con = getContainer.apply(null, arguments),
container = con.container,
- x = con.x,
- y = con.y,
- width = con.width,
+ height = con.height,
s,
- height = con.height;
+ width = con.width,
+ x = con.x,
+ y = con.y;
if (!container) {
throw new Error("VML container not found.");
}
container.appendChild(c);
}
}
- for (var prop in paper) {
+ for (var prop in paper) if (paper.hasOwnProperty(prop)) {
container[prop] = paper[prop];
}
plugins.call(container, container, R.fn);
for (var i = events.length; i--;) {
(function (eventName) {
Element.prototype[eventName] = function (fn) {
- if (typeof fn == "function") {
+ if (R.is(fn, "function")) {
this.events = this.events || {};
this.events[eventName] = this.events[eventName] || {};
this.events[eventName][fn] = this.events[eventName][fn] || [];
paper.ellipse = function (x, y, rx, ry) {
return theEllipse(this, x, y, rx, ry);
};
- paper.path = function (params, pathString) {
- if (typeof params == "string" && !pathString) {
- pathString = params;
- params = {};
- }
- params = params || {};
- return thePath(params, pathString, this);
+ paper.path = function (pathString) {
+ pathString && !R.is(pathString, "string") && !R.is(pathString[0], "array") && (pathString += "");
+ return thePath(R.format.apply(R, arguments), this);
};
paper.image = function (src, x, y, w, h) {
return theImage(this, src, x, y, w, h);
paper.text = function (x, y, text) {
return theText(this, x, y, text);
};
- paper.drawGrid = function (x, y, w, h, wv, hv, color) {
- color = color || "#000";
- var path = ["M", x, y, "L", x + w, y, x + w, y + h, x, y + h, x, y],
- rowHeight = h / hv,
- columnWidth = w / wv;
- for (var i = 1; i < hv; i++) {
- path = path.concat(["M", x, y + i * rowHeight, "L", x + w, y + i * rowHeight]);
- }
- for (var i = 1; i < wv; i++) {
- path = path.concat(["M", x + i * columnWidth, y, "L", x + i * columnWidth, y + h]);
- }
- return this.path({stroke: color, "stroke-width": 1}, path.join(","));
- };
paper.set = function (itemsArray) {
+ arguments.length > 1 && (itemsArray = Array.prototype.splice.call(arguments, 0, arguments.length));
return new Set(itemsArray);
};
paper.setSize = setSize;
Element.prototype.stop = function () {
clearTimeout(this.animation_in_progress);
+ return this;
};
Element.prototype.scale = function (x, y, cx, cy) {
if (x == null && y == null) {
- return {x: this._.sx, y: this._.sy, toString: function () { return +this.x.toFixed(3) + " " + (+this.y.toFixed(3)); }};
+ return {x: this._.sx, y: this._.sy, toString: function () { return this.x + " " + this.y; }};
}
y = y || x;
!+y && (y = x);
dcy,
a = this.attrs;
if (x != 0) {
- var bb = this.type == "path" ? pathDimensions(a.path) : this.getBBox(),
+ var bb = this.getBBox(),
rcx = bb.x + bb.width / 2,
rcy = bb.y + bb.height / 2,
kx = x / this._.sx,
path = pathToRelative(path);
path[0][1] += dx;
path[0][2] += dy;
-
+
this.attr({path: path.join(" ")});
break;
}
return this;
};
+ // animation easing formulas
R.easing_formulas = {
linear: function (n) {
return n;
},
backIn: function (n) {
var s = 1.70158;
- return Math.pow(n, 2) * ((s + 1) * n - s);
+ return n * n * ((s + 1) * n - s);
},
backOut: function (n) {
n = n - 1;
var s = 1.70158;
- return Math.pow(n, 2) * ((s + 1) * n + s) + 1;
+ return n * n * ((s + 1) * n + s) + 1;
},
elastic: function (n) {
if (n == 0 || n == 1) {
p = 2.75,
l;
if (n < (1 / p)) {
- l = s * Math.pow(n, 2);
+ l = s * n * n;
} else {
if (n < (2 / p)) {
n -= (1.5 / p);
- l = s * Math.pow(n, 2) + .75;
+ l = s * n * n + .75;
} else {
if (n < (2.5 / p)) {
n -= (2.25 / p);
- l = s * Math.pow(n, 2) + .9375;
+ l = s * n * n + .9375;
} else {
n -= (2.625 / p);
- l = s * Math.pow(n, 2) + .984375;
+ l = s * n * n + .984375;
}
}
}
}
};
- // animation easing formulas
- R.easing = function(easing, n) {
- return R.easing_formulas[easing] ? R.easing_formulas[easing](n) : n;
- };
-
Element.prototype.animate = function (params, ms, easing, callback) {
clearTimeout(this.animation_in_progress);
- if (typeof easing == "function" || !easing) {
+ if (R.is(easing, "function") || !easing) {
callback = easing || null;
- easing = "linear";
}
var from = {},
to = {},
diff = {},
t = {x: 0, y: 0};
- for (var attr in params) {
+ for (var attr in params) if (params.hasOwnProperty(attr)) {
if (attr in availableAnimAttrs) {
from[attr] = this.attr(attr);
- (typeof from[attr] == "undefined") && (from[attr] = availableAttrs[attr]);
+ (from[attr] == null) && (from[attr] = availableAttrs[attr]);
to[attr] = params[attr];
switch (availableAnimAttrs[attr]) {
case "number":
params[attr] = values;
from[attr] = (from[attr] + "").split(separator);
diff[attr] = [(values[0] - from[attr][0]) / ms, (values[1] - from[attr][1]) / ms, 0, 0];
+ break;
+ case "clip-rect":
+ from[attr] = (from[attr] + "").split(separator);
+ diff[attr] = [];
+ var i = 4;
+ while (i--) {
+ diff[attr][i] = (values[i] - from[attr][i]) / ms;
+ }
+ break;
}
to[attr] = values;
}
}
var start = +new Date,
prev = 0,
+ upto255 = function (color) {
+ return +color > 255 ? 255 : +color;
+ },
that = this;
(function tick() {
var time = new Date - start,
set = {},
now;
if (time < ms) {
- pos = R.easing(easing, time / ms);
- for (var attr in from) {
+ var pos = R.easing_formulas[easing] ? R.easing_formulas[easing](time / ms) : time / ms;
+ for (var attr in from) if (from.hasOwnProperty(attr)) {
switch (availableAnimAttrs[attr]) {
case "number":
now = +from[attr] + pos * ms * diff[attr];
break;
case "colour":
now = "rgb(" + [
- Math.round(from[attr].r + pos * ms * diff[attr].r),
- Math.round(from[attr].g + pos * ms * diff[attr].g),
- Math.round(from[attr].b + pos * ms * diff[attr].b)
+ upto255(Math.round(from[attr].r + pos * ms * diff[attr].r)),
+ upto255(Math.round(from[attr].g + pos * ms * diff[attr].g)),
+ upto255(Math.round(from[attr].b + pos * ms * diff[attr].b))
].join(",") + ")";
break;
case "path":
break;
case "scale":
now = [+from[attr][0] + pos * ms * diff[attr][0], +from[attr][1] + pos * ms * diff[attr][1], (2 in params[attr] ? params[attr][2] : ""), (3 in params[attr] ? params[attr][3] : "")].join(" ");
+ break;
+ case "clip-rect":
+ now = [];
+ var i = 4;
+ while (i--) {
+ now[i] = +from[attr][i] + pos * ms * diff[attr][i];
+ }
+ break;
}
break;
}
- if (attr == "font-size") {
- set[attr] = now + "px";
- } else {
- set[attr] = now;
- }
+ set[attr] = now;
}
that.attr(set);
that.animation_in_progress = setTimeout(tick);
that.attr(params);
clearTimeout(that.animation_in_progress);
R.svg && paper.safari();
- (typeof callback == "function") && callback.call(that);
+ (R.is(callback, "function")) && callback.call(that);
}
prev = time;
})();
var path = pathToRelative(this.attrs.path);
path[0][1] += +x;
path[0][2] += +y;
- this.attr({path: path.join(" ")});
+ this.attr({path: path});
break;
}
return this;
}
return this;
};
- Set.prototype.pop = function (id) {
- var res = this.items.splice(id, 1)[0];
- for (var j = id, jj = this.items.length; j < jj; j++) {
- this[j] = this[j + 1];
- }
- delete this[jj + 1];
- this.length--;
- return res;
+ Set.prototype.pop = function () {
+ delete this[this.length--];
+ return this.items.pop();
};
- for (var method in Element.prototype) {
+ for (var method in Element.prototype) if (Element.prototype.hasOwnProperty(method)) {
Set.prototype[method] = (function (methodname) {
return function () {
for (var i = 0, ii = this.items.length; i < ii; i++) {
})(method);
}
Set.prototype.attr = function (name, value) {
- if (name && R.isArray(name) && typeof name[0] == "object") {
+ if (name && R.is(name, "array") && R.is(name[0], "object")) {
for (var j = 0, jj = name.length; j < jj; j++) {
this.items[j].attr(name[j]);
}
}
return this;
};
-
+
Set.prototype.getBBox = function () {
var x = [],
y = [],
glyphs: {}
},
family = font.face["font-family"];
- for (var prop in font.face) {
+ for (var prop in font.face) if (font.face.hasOwnProperty(prop)) {
fontcopy.face[prop] = font.face[prop];
}
if (this.fonts[family]) {
}
if (!font.svg) {
fontcopy.face["units-per-em"] = parseInt(font.face["units-per-em"], 10);
- for (var glyph in font.glyphs) {
+ for (var glyph in font.glyphs) if (font.glyphs.hasOwnProperty(glyph)) {
var path = font.glyphs[glyph];
fontcopy.glyphs[glyph] = {
w: path.w,
}) + "z"
};
if (path.k) {
- for (var k in path.k) {
+ for (var k in path.k) if (path.khasOwnProperty(k)) {
fontcopy.glyphs[glyph].k[k] = path.k[k];
}
}
var font = R.fonts[family];
if (!font) {
var name = new RegExp("(^|\\s)" + family.replace(/[^\w\d\s+!~.:_-]/g, "") + "(\\s|$)", "i");
- for (var fontName in R.fonts) {
+ for (var fontName in R.fonts) if (R.fonts.hasOwnProperty(fontName)) {
if (name.test(fontName)) {
font = R.fonts[fontName];
break;
shift = 0,
path = "",
scale;
+ R.is(font, "string") && (font = this.getFont(font));
if (font) {
scale = (size || 16) / font.face["units-per-em"];
for (var i = 0, ii = letters.length; i < ii; i++) {
var prev = i && font.glyphs[letters[i - 1]] || {},
curr = font.glyphs[letters[i]];
shift += i ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) : 0;
- curr && curr.d && out.push(this.path({fill: "#000", stroke: "none"}, curr.d).translate(shift, 0));
+ curr && curr.d && out.push(this.path(curr.d).attr({fill: "#000", stroke: "none", translation: [shift, 0]}));
}
out.scale(scale, scale, 0, y).translate(x, (size || 16) / 2);
}
return out;
};
+ R.format = function (token) {
+ var args = R.is(arguments[1], "array") ? [0].concat(arguments[1]) : arguments;
+ token && R.is(token, "string") && args.length - 1 && (token = token.replace(/\{(\d+)\}/g, function (str, i) {
+ return args[++i] == null ? "" : args[i];
+ }));
+ return token;
+ };
R.ninja = function () {
- var r = window.Raphael;
+ var r = window.Raphael, u;
if (oldRaphael.was) {
window.Raphael = oldRaphael.is;
} else {
try {
delete window.Raphael;
} catch (e) {
- window.Raphael = void(0);
+ window.Raphael = u;
}
}
return r;
projects / raphael / blobdiff