/*
- * Raphael 0.8.5 - JavaScript Vector Library
+ * Raphael 1.0 - 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.
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"},
events = ["click", "dblclick", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup"];
- R.version = "0.8.5";
+ R.version = "1.0";
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;
doc = win.document;
};
// colour utilities
- R.hsb2rgb = function (hue, saturation, brightness) {
+ R.hsb2rgb = cacher(function (hue, saturation, brightness) {
if (typeof hue == "object" && "h" in hue && "s" in hue && "b" in hue) {
brightness = hue.b;
saturation = hue.s;
}
rgb.hex = "#" + r + g + b;
return rgb;
- };
- R.rgb2hsb = function (red, green, blue) {
+ }, R);
+ R.rgb2hsb = cacher(function (red, green, blue) {
if (typeof red == "object" && "r" in red && "g" in red && "b" in red) {
blue = red.b;
green = red.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) {
} 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 pathcache = {},
- 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 = [],
- toString = function () {
- var res = "";
- for (var i = 0, ii = this.length; i < ii; i++) {
- res += this[i][0] + this[i].join(",").substring(2);
- }
- return res;
- };
- if (pathString.toString.toString() == toString.toString()) {
+ data = [];
+ if (R.isArray(pathString) && R.isArray(pathString[0])) { // rough assumption
data = pathString;
}
if (!data.length) {
- pathString.replace(/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig, function (a, b, c) {
+ (pathString + "").replace(/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig, function (a, b, c) {
var params = [],
name = b.toLowerCase();
c.replace(/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig, function (a, b) {
};
}
});
- data.toString = toString;
- }
- 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;
- if (typeof path == "string") {
- pathArray = R.parsePathString(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]);
- }
+ }, R);
+ var pathDimensions = cacher(function (path) {
+ 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];
+ } 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);
}
}
- 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
- };
- }
- },
- addRoundedCorner = function (r, dir) {
- var R = .5522 * r,
- rollback = this.isAbsolute,
- o = this;
- if (rollback) {
- this.relatively();
- rollback = function () {
- o.absolutely();
- };
- } else {
- rollback = function () {};
- }
- var actions = {
- l: function () {
- return {
- u: function () {
- o.curveTo(-R, 0, -r, -(r - R), -r, -r);
- },
- d: function () {
- o.curveTo(-R, 0, -r, r - R, -r, r);
- }
- };
- },
- r: function () {
- return {
- u: function () {
- o.curveTo(R, 0, r, -(r - R), r, -r);
- },
- d: function () {
- o.curveTo(R, 0, r, r - R, r, r);
- }
- };
- },
- u: function () {
- return {
- r: function () {
- o.curveTo(0, -R, -(R - r), -r, r, -r);
- },
- l: function () {
- o.curveTo(0, -R, R - r, -r, -r, -r);
- }
- };
- },
- d: function () {
- return {
- r: function () {
- o.curveTo(0, R, -(R - r), r, r, r);
- },
- l: function () {
- o.curveTo(0, R, R - r, r, -r, r);
- }
- };
- }
- };
- actions[dir.charAt(0)]()[dir.charAt(1)]();
- rollback();
- return o;
- },
- 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
+ };
+ }),
+ pathToRelative = cacher(function (pathArray) {
+ if (!R.isArray(pathArray) || !R.isArray(pathArray && pathArray[0])) { // 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 "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);
break;
case "v":
- r[1] = (pa[1] - y).toFixed(3);
+ 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][res[i].length - 1];
+ x += +res[i][len - 1];
break;
case "v":
- y += res[i][res[i].length - 1];
+ y += +res[i][len - 1];
break;
default:
- x += res[i][res[i].length - 2];
- y += res[i][res[i].length - 1];
+ x += +res[i][len - 2];
+ y += +res[i][len - 1];
}
}
- res.toString = pathArray.toString;
+ res.toString = R._path2string;
return res;
- },
- pathToAbsolute = function (pathArray) {
+ }, null, pathClone),
+ pathClone = function (pathArray) {
var res = [];
- if (typeof pathArray == "string") {
+ if (!R.isArray(pathArray) || !R.isArray(pathArray && pathArray[0])) { // 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;
+ },
+ pathToAbsolute = cacher(function (pathArray) {
+ if (!R.isArray(pathArray) || !R.isArray(pathArray && pathArray[0])) { // rough assumption
pathArray = R.parsePathString(pathArray);
}
- var x = 0,
+ var res = [],
+ x = 0,
y = 0,
+ mx = 0,
+ my = 0,
start = 0;
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];
+ },
+ q2c = function (x1, y1, ax, ay, x2, y2) {
+ return [
+ 2 / 3 * x1 + 1 / 3 * ax,
+ 2 / 3 * y1 + 1 / 3 * ay,
+ 2 / 3 * x1 + 1 / 3 * x2,
+ 2 / 3 * y1 + 1 / 3 * y2,
+ x2,
+ y2
+ ];
},
- pecache = {}, pecount = [],
- pathEqualiser = function (path1, path2) {
- if ((path1 + path2) in pecache) {
- return pecache[path1 + path2];
+ a2c = function (x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2, recursive) {
+ // 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 = [];
+ if (!recursive) {
+ var x = (x1 - x2) / 2,
+ y = (y1 - y2) / 2,
+ 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)),
+ cx = k * rx * y / ry + (x1 + x2) / 2,
+ cy = k * -ry * x / rx + (y1 + y2) / 2,
+ f1 = Math.asin((y1 - cy) / ry),
+ f2 = Math.asin((y2 - cy) / ry);
+
+ f1 = x1 < cx ? Math.PI - f1 : f1;
+ f2 = x2 < cx ? Math.PI - f2 : f2;
+ f1 < 0 && (f1 = Math.PI * 2 + f1);
+ f2 < 0 && (f2 = Math.PI * 2 + f2);
+ if (sweep_flag && f1 > f2) {
+ f1 = f1 - Math.PI * 2;
+ }
+ if (!sweep_flag && f2 > f1) {
+ f2 = f2 - Math.PI * 2;
+ }
+ } else {
+ f1 = recursive[0];
+ f2 = recursive[1];
+ cx = recursive[2];
+ cy = recursive[3];
+ }
+ var df = f2 - f1;
+ if (Math.abs(df) > _120) {
+ var f2old = f2,
+ x2old = x2,
+ y2old = y2;
+ 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]);
+ }
+ 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,
+ m1 = [x1, y1],
+ m2 = [x1 + hx * s1, y1 - hy * c1],
+ m3 = [x2 + hx * s2, y2 - hy * c2],
+ m4 = [x2, y2];
+ m2[0] = 2 * m1[0] - m2[0];
+ m2[1] = 2 * m1[1] - m2[1];
+ if (recursive) {
+ 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];
+ }
+ return res;
}
- var data = [pathToAbsolute(R.parsePathString(path1)), pathToAbsolute(R.parsePathString(path2))],
- attrs = [{x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0}, {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0}],
+ },
+ 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),
+ my = p1y + 2 * t * (c1y - p1y) + t * t * (c2y - 2 * c1y + p1y),
+ nx = c1x + 2 * t * (c2x - c1x) + t * t * (p2x - 2 * c2x + c1x),
+ ny = c1y + 2 * t * (c2y - c1y) + t * t * (p2y - 2 * c2y + c1y),
+ ax = (1 - t) * p1x + t * c1x,
+ ay = (1 - t) * p1y + t * c1y,
+ 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}};
+ }),
+ 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) {
if (!path) {
- return ["U"];
+ return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
}
switch (path[0]) {
case "M":
d.X = path[1];
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]));
+ break;
case "S":
var nx = d.x + (d.x - (d.bx || d.x)),
ny = d.y + (d.y - (d.by || d.y));
case "T":
var nx = d.x + (d.x - (d.bx || d.x)),
ny = d.y + (d.y - (d.by || d.y));
- path = ["Q", nx, ny, path[1], path[2]];
+ path = ["C"].concat(q2c(d.x, d.y, nx, ny, path[1], path[2]));
+ break;
+ case "Q":
+ path = ["C"].concat(q2c(d.x, d.y, path[1], path[2], path[3], path[4]));
+ break;
+ case "L":
+ path = ["C"].concat(l2c(d.x, d.y, path[1], path[2]));
break;
case "H":
- path = ["L", path[1], d.y];
+ path = ["C"].concat(l2c(d.x, d.y, path[1], d.y));
break;
case "V":
- path = ["L", d.x, path[1]];
+ path = ["C"].concat(l2c(d.x, d.y, d.x, path[1]));
break;
case "Z":
- path = ["L", d.X, d.Y];
+ path = ["C"].concat(l2c(d.x, d.y, d.X, d.Y));
break;
}
return path;
},
- edgeCases = function (a, b, i) {
- if (data[a][i][0] == "M" && data[b][i][0] != "M") {
- data[b].splice(i, 0, ["M", attrs[b].x, attrs[b].y]);
- attrs[a].bx = data[a][i][data[a][i].length - 4] || 0;
- attrs[a].by = data[a][i][data[a][i].length - 3] || 0;
- attrs[a].x = data[a][i][data[a][i].length - 2];
- attrs[a].y = data[a][i][data[a][i].length - 1];
- return true;
- } else if (data[a][i][0] == "L" && data[b][i][0] == "C") {
- data[a][i] = ["C", attrs[a].x, attrs[a].y, data[a][i][1], data[a][i][2], data[a][i][1], data[a][i][2]];
- } else if (data[a][i][0] == "L" && data[b][i][0] == "Q") {
- data[a][i] = ["Q", data[a][i][1], data[a][i][2], data[a][i][1], data[a][i][2]];
- } else if (data[a][i][0] == "Q" && data[b][i][0] == "C") {
- var x = data[b][i][data[b][i].length - 2],
- y = data[b][i][data[b][i].length - 1];
- data[b].splice(i + 1, 0, ["Q", x, y, x, y]);
- data[a].splice(i, 0, ["C", attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y]);
- i++;
- attrs[b].bx = data[b][i][data[b][i].length - 4] || 0;
- attrs[b].by = data[b][i][data[b][i].length - 3] || 0;
- attrs[b].x = data[b][i][data[b][i].length - 2];
- attrs[b].y = data[b][i][data[b][i].length - 1];
- return true;
- } else if (data[a][i][0] == "A" && data[b][i][0] == "C") {
- var x = data[b][i][data[b][i].length - 2],
- y = data[b][i][data[b][i].length - 1];
- data[b].splice(i + 1, 0, ["A", 0, 0, data[a][i][3], data[a][i][4], data[a][i][5], x, y]);
- data[a].splice(i, 0, ["C", attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y, attrs[a].x, attrs[a].y]);
- i++;
- attrs[b].bx = data[b][i][data[b][i].length - 4] || 0;
- attrs[b].by = data[b][i][data[b][i].length - 3] || 0;
- attrs[b].x = data[b][i][data[b][i].length - 2];
- attrs[b].y = data[b][i][data[b][i].length - 1];
- return true;
- } else if (data[a][i][0] == "U") {
- data[a][i][0] = data[b][i][0];
- for (var j = 1, jj = data[b][i].length; j < jj; j++) {
- data[a][i][j] = (j % 2) ? attrs[a].x : attrs[a].y;
+ fixArc = function (pp, i) {
+ if (pp[i].length > 7) {
+ pp[i].shift();
+ var pi = pp[i];
+ while (pi.length) {
+ pp.splice(i++, 0, ["C"].concat(pi.splice(0, 6)));
}
+ pp.splice(i, 1);
+ ii = Math.max(p.length, p2 && p2.length || 0);
+ }
+ },
+ fixM = function (path1, path2, a1, a2, i) {
+ if (path1 && path2 && path1[i][0] == "M" && path2[i][0] != "M") {
+ path2.splice(i, 0, ["M", a2.x, a2.y]);
+ a1.bx = 0;
+ a1.by = 0;
+ a1.x = path1[i][1];
+ a1.y = path1[i][2];
+ ii = Math.max(p.length, p2 && p2.length || 0);
}
- return false;
};
- for (var i = 0; i < Math.max(data[0].length, data[1].length); i++) {
- data[0][i] = processPath(data[0][i], attrs[0]);
- data[1][i] = processPath(data[1][i], attrs[1]);
- if (data[0][i][0] != data[1][i][0] && (edgeCases(0, 1, i) || edgeCases(1, 0, i))) {
- continue;
- }
- attrs[0].bx = data[0][i][data[0][i].length - 4] || 0;
- attrs[0].by = data[0][i][data[0][i].length - 3] || 0;
- attrs[0].x = data[0][i][data[0][i].length - 2];
- attrs[0].y = data[0][i][data[0][i].length - 1];
- attrs[1].bx = data[1][i][data[1][i].length - 4] || 0;
- attrs[1].by = data[1][i][data[1][i].length - 3] || 0;
- attrs[1].x = data[1][i][data[1][i].length - 2];
- attrs[1].y = data[1][i][data[1][i].length - 1];
- }
- if (pecount.length > 20) {
- delete pecache[pecount.unshift()];
- }
- pecount.push(path1 + path2);
- pecache[path1 + path2] = data;
- return data;
- },
- toGradient = function (gradient) {
+ for (var i = 0, ii = Math.max(p.length, p2 && p2.length || 0); i < ii; i++) {
+ p[i] = processPath(p[i], attrs);
+ fixArc(p, i);
+ p2 && (p2[i] = processPath(p2[i], attrs2));
+ p2 && fixArc(p2, i);
+ fixM(p, p2, attrs, attrs2, i);
+ fixM(p2, p, attrs2, attrs, i);
+ var seg = p[i],
+ seg2 = p2 && p2[i],
+ seglen = seg.length,
+ seg2len = p2 && seg2.length;
+ attrs.bx = seg[seglen - 4] || 0;
+ attrs.by = seg[seglen - 3] || 0;
+ attrs.x = seg[seglen - 2];
+ attrs.y = seg[seglen - 1];
+ attrs2.bx = p2 && (seg2[seg2len - 4] || 0);
+ attrs2.by = p2 && (seg2[seg2len - 3] || 0);
+ attrs2.x = p2 && seg2[seg2len - 2];
+ attrs2.y = p2 && seg2[seg2len - 1];
+ }
+ return p2 ? [p, p2] : p;
+ }),
+ toGradient = cacher(function (gradient) {
if (typeof gradient == "string") {
gradient = gradient.split(/\s*\-\s*/);
var angle = gradient.shift();
} else {
return gradient;
}
- },
+ }),
getContainer = function () {
var container,
x,
// SVG
if (R.svg) {
- R.toString = function () {
- return "Your browser supports SVG.\nYou are running Rapha\u00ebl " + this.version;
+ var round = function (num) {
+ return +num + (Math.floor(num) == num) * .5;
};
- 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) + " ";
- var oldD = this[0].getAttribute("d") || "";
- (oldD == "M0,0") && (oldD = "");
- this[0].setAttribute("d", oldD + d);
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
- this.attrs.path = oldD + d;
- return this;
- },
- lineTo: function (x, y) {
- this.last.x = (!this.isAbsolute * this.last.x) + parseFloat(x);
- this.last.y = (!this.isAbsolute * this.last.y) + parseFloat(y);
- var d = this.isAbsolute ? "L" : "l";
- d += parseFloat(x).toFixed(3) + " " + parseFloat(y).toFixed(3) + " ";
- var oldD = this.node.getAttribute("d") || "";
- this.node.setAttribute("d", oldD + d);
- this.attrs.path = oldD + 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(" ");
- var oldD = this[0].getAttribute("d") || "";
- this.node.setAttribute("d", oldD + d);
- this.last.x = parseFloat(x);
- this.last.y = parseFloat(y);
- this.attrs.path = oldD + d;
- return this;
- },
- cplineTo: function (x1, y1, w1) {
- if (!w1) {
- return this.lineTo(x1, y1);
- } else {
- var p = {},
- x = parseFloat(x1),
- y = parseFloat(y1),
- w = parseFloat(w1),
- d = this.isAbsolute ? "C" : "c",
- attr = [+this.last.x + w, +this.last.y, x - w, y, x, y];
- for (var i = 0, ii = attr.length; i < ii; i++) {
- d += attr[i] + " ";
+ 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]);
}
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + attr[4];
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + attr[5];
- this.last.bx = attr[2];
- this.last.by = attr[3];
- var oldD = this.node.getAttribute("d") || "";
- this.node.setAttribute("d", oldD + d);
- this.attrs.path = oldD + d;
- return this;
+ } else {
+ path[i][6] = round(path[i][6]);
+ path[i][7] = round(path[i][7]);
}
- },
- curveTo: function () {
- var p = {},
- d = [0, 1, 2, 3, "s", 5, "c"][arguments.length];
- if (this.isAbsolute) {
- d = d.toUpperCase();
- }
- for (var i = 0, ii = arguments.length; i < ii; i++) {
- d += parseFloat(arguments[i]).toFixed(3) + " ";
- }
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[arguments.length - 2]);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[arguments.length - 1]);
- this.last.bx = parseFloat(arguments[arguments.length - 4]);
- this.last.by = parseFloat(arguments[arguments.length - 3]);
- var oldD = this.node.getAttribute("d") || "";
- this.node.setAttribute("d", oldD + d);
- this.attrs.path = oldD + d;
- return this;
- },
- qcurveTo: function () {
- var p = {},
- d = [0, 1, "t", 3, "q"][arguments.length];
- if (this.isAbsolute) {
- d = d.toUpperCase();
- }
- for (var i = 0, ii = arguments.length; i < ii; i++) {
- d += parseFloat(arguments[i]).toFixed(3) + " ";
- }
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[arguments.length - 2]);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[arguments.length - 1]);
- if (arguments.length != 2) {
- this.last.qx = parseFloat(arguments[arguments.length - 4]);
- this.last.qy = parseFloat(arguments[arguments.length - 3]);
- }
- var oldD = this.node.getAttribute("d") || "";
- this.node.setAttribute("d", oldD + d);
- this.attrs.path = oldD + d;
- return this;
- },
- addRoundedCorner: addRoundedCorner,
- andClose: function () {
- var oldD = this[0].getAttribute("d") || "";
- this[0].setAttribute("d", oldD + "Z ");
- this.attrs.path = oldD + "Z ";
- return this;
}
+ return path;
};
- var thePath = function (params, pathString, SVG) {
+ R.toString = function () {
+ return "Your browser supports SVG.\nYou are running Rapha\u00ebl " + this.version;
+ };
+ var thePath = function (pathString, SVG) {
var el = doc.createElementNS(SVG.svgns, "path");
if (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.last = {x: 0, y: 0, bx: 0, by: 0};
- if (pathString) {
- p.attrs.path = "" + pathString;
- p.absolutely();
- paper.pathfinder(p, p.attrs.path);
- }
- if (params) {
- !params.gradient && (params.fill = params.fill || "none");
- params.stroke = params.stroke || "#000";
- } else {
- params = {fill: "none", stroke: "#000"};
- }
- setFillAndStroke(p, params);
+ pathString && (p.attrs.path = roundPath(pathToAbsolute(pathString))) && p.node.setAttribute("d", p.attrs.path);
+ setFillAndStroke(p, {fill: "none", stroke: "#000"});
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++;
+ 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]);
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.setAttribute("patternTransform", "translate(".concat(bbox.x, ",", bbox.y, ")"));
};
var setFillAndStroke = function (o, params) {
var dasharray = {
+ "": [0],
+ "none": [0],
"-": [3, 1],
".": [1, 1],
"-.": [3, 1, 1, 1],
},
node = o.node,
attrs = o.attrs,
- rot = attrs.rotation,
+ rot = o.attr("rotation"),
addDashes = function (o, value) {
- value = dasharray[value.toString().toLowerCase()];
+ 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,
node.setAttribute("stroke-dasharray", value);
}
};
- o.rotate(0, true);
+ parseInt(rot, 10) && o.rotate(0, true);
for (var att in params) {
if (!(att in availableAttrs)) {
continue;
break;
case "path":
if (o.type == "path") {
- node.setAttribute("d", "M0,0");
- paper.pathfinder(o, value);
+ attrs.path = roundPath(pathToAbsolute(value));
+ node.setAttribute("d", attrs.path);
}
case "width":
node.setAttribute(att, value);
case "rx":
case "cx":
node.setAttribute(att, value);
- updatePosition(o);
+ o.pattern && updatePosition(o);
break;
case "height":
node.setAttribute(att, value);
case "ry":
case "cy":
node.setAttribute(att, value);
- updatePosition(o);
+ o.pattern && updatePosition(o);
break;
case "r":
if (o.type == "rect") {
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.id = "r" + (R.idGenerator++).toString(36);
el.setAttribute("x", 0);
el.setAttribute("y", 0);
el.setAttribute("patternUnits", "userSpaceOnUse");
node.style.fill = "url(#" + el.id + ")";
node.setAttribute("fill", "url(#" + el.id + ")");
o.pattern = el;
- updatePosition(o);
+ o.pattern && updatePosition(o);
break;
}
delete params.gradient;
node.setAttribute("opacity", attrs.opacity);
}
if (typeof attrs["fill-opacity"] != "undefined" && typeof params["fill-opacity"] == "undefined" ) {
- node.style.fillOpacity = o.attrs["fill-opacity"];
+ node.style.fillOpacity = attrs["fill-opacity"];
// Need following line for Firefox
node.setAttribute("fill-opacity", attrs["fill-opacity"]);
}
}
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) {
this._ = {
tx: 0,
ty: 0,
- rt: {deg: 0, x: 0, y: 0},
+ rt: {deg: 0, cx: 0, cy: 0},
sx: 1,
sy: 1
};
};
Element.prototype.rotate = function (deg, cx, cy) {
if (deg == null) {
+ if (this._.rt.cx) {
+ return [this._.rt.deg, this._.rt.cx, this._.rt.cy].join(" ");
+ }
return this._.rt.deg;
}
var bbox = this.getBBox();
- deg = deg.toString().split(separator);
+ deg = (deg + "").split(separator);
if (deg.length - 1) {
cx = parseFloat(deg[1]);
cy = parseFloat(deg[2]);
} else {
this._.rt.deg += deg;
}
- if (cy == null) {
- cx = null;
- }
+ (cy == null) && (cx = null);
+ this._.rt.cx = cx;
+ this._.rt.cy = cy;
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] = "rotate(".concat(this._.rt.deg, " ", cx, " ", cy, ")");
} else {
this.transformations[0] = "";
}
this.show();
var hide = true;
}
- var bbox = this.node.getBBox() || {};
+ var bbox = {};
+ try {
+ bbox = this.node.getBBox();
+ } catch(e) {
+ // Firefox 3.0.x plays badly here
+ } finally {
+ bbox = bbox || {};
+ }
if (this.type == "text") {
bbox = {x: bbox.x, y: Infinity, width: bbox.width, height: 0};
for (var i = 0, ii = this.node.getNumberOfChars(); i < ii; i++) {
if (arguments[0] == "translation") {
return this.translate();
}
+ if (arguments[0] == "rotation") {
+ return this.rotate();
+ }
+ if (arguments[0] == "scale") {
+ return this.scale();
+ }
return this.attrs[arguments[0]];
}
if (arguments.length == 1 && R.isArray(arguments[0])) {
return this;
};
var theCircle = function (svg, x, y, r) {
+ x = round(x);
+ y = round(y);
var el = doc.createElementNS(svg.svgns, "circle");
el.setAttribute("cx", x);
el.setAttribute("cy", y);
return res;
};
var theRect = function (svg, x, y, w, h, r) {
+ x = round(x);
+ y = round(y);
var el = doc.createElementNS(svg.svgns, "rect");
el.setAttribute("x", x);
el.setAttribute("y", y);
return res;
};
var theEllipse = function (svg, x, y, rx, ry) {
+ x = round(x);
+ y = round(y);
var el = doc.createElementNS(svg.svgns, "ellipse");
el.setAttribute("cx", x);
el.setAttribute("cy", y);
}
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;
}
var res = new Element(el, svg);
res.attrs = res.attrs || {};
+ res.attrs.text = text;
res.attrs.x = x;
res.attrs.y = y;
res.type = "text";
return container;
};
paper.remove = function () {
- this.canvas.parentNode.removeChild(this.canvas);
+ 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";
// VML
if (R.vml) {
- 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 pathMethods = {
- absolutely: function () {
- this.isAbsolute = true;
- return this;
- },
- relatively: function () {
- this.isAbsolute = false;
- return this;
- },
- moveTo: function (x, y) {
- var X = Math.round(parseFloat(x)) - 1,
- Y = Math.round(parseFloat(y)) - 1,
- d = this.isAbsolute ? "m" : "t";
- d += X + " " + Y;
- this.node.path = this.Path += d;
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
- this.last.isAbsolute = this.isAbsolute;
- this.attrs.path += (this.isAbsolute ? "M" : "m") + [x, y];
- return this;
- },
- lineTo: function (x, y) {
- var X = Math.round(parseFloat(x)) - 1,
- Y = Math.round(parseFloat(y)) - 1,
- d = this.isAbsolute ? "l" : "r";
- d += X + " " + Y;
- this.node.path = this.Path += d;
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
- this.last.isAbsolute = this.isAbsolute;
- this.attrs.path += (this.isAbsolute ? "L" : "l") + [x, y];
- return this;
- },
- arcTo: function (rx, ry, large_arc_flag, sweep_flag, x2, y2) {
- // for more information of where this math came from visit:
- // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
- x2 = (this.isAbsolute ? 0 : this.last.x) + x2 - 1;
- y2 = (this.isAbsolute ? 0 : this.last.y) + y2 - 1;
- var x1 = this.last.x - 1,
- y1 = this.last.y - 1,
- x = (x1 - x2) / 2,
- y = (y1 - y2) / 2,
- k = (large_arc_flag == sweep_flag ? -1 : 1) *
- Math.sqrt(Math.abs(rx * rx * ry * ry - rx * rx * y * y - ry * ry * x * x) / (rx * rx * y * y + ry * ry * x * x)),
- cx = k * rx * y / ry + (x1 + x2) / 2,
- cy = k * -ry * x / rx + (y1 + y2) / 2,
- d = sweep_flag ? (this.isAbsolute ? "wa" : "wr") : (this.isAbsolute ? "at" : "ar"),
- left = Math.round(cx - rx),
- top = Math.round(cy - ry);
- d += [left, top, Math.round(left + rx * 2), Math.round(top + ry * 2), Math.round(x1), Math.round(y1), Math.round(parseFloat(x2)), Math.round(parseFloat(y2))].join(", ");
- this.node.path = this.Path += d;
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x2);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y2);
- this.last.isAbsolute = this.isAbsolute;
- this.attrs.path += (this.isAbsolute ? "A" : "a") + [rx, ry, 0, large_arc_flag, sweep_flag, x2, y2];
- return this;
- },
- cplineTo: function (x1, y1, w1) {
- if (!w1) {
- return this.lineTo(x1, y1);
- } else {
- var x = Math.round(parseFloat(x1)) - 1,
- y = Math.round(parseFloat(y1)) - 1,
- w = Math.round(parseFloat(w1)),
- d = this.isAbsolute ? "c" : "v",
- attr = [Math.round(this.last.x) - 1 + w, Math.round(this.last.y) - 1, x - w, y, x, y],
- svgattr = [this.last.x + w1, this.last.y, x1 - w1, y1, x1, y1];
- d += attr.join(" ") + " ";
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + attr[4];
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + attr[5];
- this.last.bx = attr[2];
- this.last.by = attr[3];
- this.node.path = this.Path += d;
- this.attrs.path += (this.isAbsolute ? "C" : "c") + svgattr;
- return this;
+ var path2vml = function (path) {
+ var pa = path2curve(path);
+ for (var i = 0, ii = pa.length; i < ii; i++) {
+ 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]);
}
- },
- curveTo: function () {
- var d = this.isAbsolute ? "c" : "v";
- if (arguments.length == 6) {
- this.last.bx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2]);
- this.last.by = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3]);
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[4]);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[5]);
- d += [Math.round(parseFloat(arguments[0])) - 1,
- Math.round(parseFloat(arguments[1])) - 1,
- Math.round(parseFloat(arguments[2])) - 1,
- Math.round(parseFloat(arguments[3])) - 1,
- Math.round(parseFloat(arguments[4])) - 1,
- Math.round(parseFloat(arguments[5])) - 1].join(" ") + " ";
- this.last.isAbsolute = this.isAbsolute;
- this.attrs.path += (this.isAbsolute ? "C" : "c") + Array.prototype.splice.call(arguments, 0, arguments.length);
- }
- if (arguments.length == 4) {
- var bx = this.last.x * 2 - this.last.bx,
- by = this.last.y * 2 - this.last.by;
- this.last.bx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[0]);
- this.last.by = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[1]);
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2]);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3]);
- d += [Math.round(bx) - 1, Math.round(by) - 1,
- Math.round(parseFloat(arguments[0])) - 1,
- Math.round(parseFloat(arguments[1])) - 1,
- Math.round(parseFloat(arguments[2])) - 1,
- Math.round(parseFloat(arguments[3])) - 1].join(" ") + " ";
- this.attrs.path += (this.isAbsolute ? "S" : "s") + Array.prototype.splice.call(arguments, 0, arguments.length);
- }
- this.node.path = this.Path += d;
- return this;
- },
- qcurveTo: function () {
- var lx = Math.round(this.last.x) - 1,
- ly = Math.round(this.last.y) - 1,
- res = [];
- if (arguments.length == 4) {
- this.last.qx = (!this.isAbsolute * this.last.x) + parseFloat(arguments[0]);
- this.last.qy = (!this.isAbsolute * this.last.y) + parseFloat(arguments[1]);
- this.last.x = (!this.isAbsolute * this.last.x) + parseFloat(arguments[2]);
- this.last.y = (!this.isAbsolute * this.last.y) + parseFloat(arguments[3]);
- res = [this.last.qx, this.last.qy, this.last.x, this.last.y];
- this.last.isAbsolute = this.isAbsolute;
- this.attrs.path += (this.isAbsolute ? "Q" : "q") + Array.prototype.splice.call(arguments, 0, arguments.length);
- }
- if (arguments.length == 2) {
- this.last.qx = this.last.x * 2 - this.last.qx;
- this.last.qy = this.last.y * 2 - this.last.qy;
- this.last.x = (!this.isAbsolute * this.last.x) + parseFloat(arguments[2]);
- this.last.y = (!this.isAbsolute * this.last.y) + parseFloat(arguments[3]);
- res = [this.last.qx, this.last.qy, this.last.x, this.last.y];
- this.attrs.path += (this.isAbsolute ? "T" : "t") + Array.prototype.splice.call(arguments, 0, arguments.length);
- }
- var d = "c" + [
- Math.round(2 / 3 * res[0] + 1 / 3 * lx) - 1,
- Math.round(2 / 3 * res[1] + 1 / 3 * ly) - 1,
- Math.round(2 / 3 * res[0] + 1 / 3 * res[2]) - 1,
- Math.round(2 / 3 * res[1] + 1 / 3 * res[3]) - 1,
- Math.round(res[2]) - 1,
- Math.round(res[3]) - 1
- ].join(" ") + " ";
- this.node.path = this.Path += d;
- return this;
- },
- addRoundedCorner: addRoundedCorner,
- andClose: function () {
- this.node.path = (this.Path += "x");
- this.attrs.path += "z";
- return this;
}
+ 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 (pathString) {
- p.absolutely();
- p.attrs.path = "";
- paper.pathfinder(p, "" + pathString);
- }
- if (params) {
- params.fill = params.fill || "none";
- params.stroke = params.stroke || "#000";
- } else {
- params = {fill: "none", stroke: "#000"};
- }
- 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];
+ 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.Path = "";
- o.path = [];
- paper.pathfinder(o, params.path);
+ a.path = R.parsePathString(params.path);
+ node.path = path2vml(a.path);
}
if (params.rotation != null) {
o.rotate(params.rotation, true);
}
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.innerText = res.node.string;
+ paper.span.innerHTML = "";
+ paper.span.appendChild(doc.createTextNode(res.node.string));
res.W = a.w = paper.span.offsetWidth;
res.H = a.h = paper.span.offsetHeight;
res.X = a.x;
gradient = toGradient(gradient);
o.attrs = o.attrs || {};
var attrs = o.attrs,
- fill = o.getElementsByTagName("fill");
+ fill = o.node.getElementsByTagName("fill");
o.attrs.gradient = gradient;
- o = o.shape || o[0];
+ o = o.shape || o.node;
if (fill.length) {
fill = fill[0];
} else {
};
Element.prototype.rotate = function (deg, cx, cy) {
if (deg == null) {
+ if (this._.rt.cx) {
+ return [this._.rt.deg, this._.rt.cx, this._.rt.cy].join(" ");
+ }
return this._.rt.deg;
}
deg = (deg + "").split(separator);
} else {
this._.rt.deg += deg;
}
- if (cy == null) {
- cx = null;
- }
+ (cy == null) && (cx = null);
this._.rt.cx = cx;
this._.rt.cy = cy;
this.setBox(this.attrs, cx, cy);
};
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),
if (arguments[0] == "translation") {
return this.translate();
}
+ if (arguments[0] == "rotation") {
+ return this.rotate();
+ }
+ if (arguments[0] == "scale") {
+ return this.scale();
+ }
return this.attrs[arguments[0]];
}
if (this.attrs && arguments.length == 1 && R.isArray(arguments[0])) {
g.appendChild(o);
var res = new Element(o, g, vml);
res.type = "image";
+ res.attrs.src = src;
res.attrs.x = x;
res.attrs.y = y;
res.attrs.w = w;
res.shape = el;
res.textpath = path;
res.type = "text";
+ res.attrs.text = text;
res.attrs.x = x;
res.attrs.y = y;
res.attrs.w = 1;
paper.ellipse = function (x, y, rx, ry) {
return theEllipse(this, x, y, rx, ry);
};
- paper.path = function (params, pathString) {
- return thePath(params, pathString, this);
+ paper.path = function (pathString) {
+ return thePath(pathString, 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.pathfinder = function (p, path) {
- var commands = {
- M: function (x, y) {
- this.moveTo(x, y);
- },
- C: function (x1, y1, x2, y2, x3, y3) {
- this.curveTo(x1, y1, x2, y2, x3, y3);
- },
- Q: function (x1, y1, x2, y2) {
- this.qcurveTo(x1, y1, x2, y2);
- },
- T: function (x, y) {
- this.qcurveTo(x, y);
- },
- S: function (x1, y1, x2, y2) {
- p.curveTo(x1, y1, x2, y2);
- },
- L: function (x, y) {
- p.lineTo(x, y);
- },
- H: function (x) {
- this.lineTo(x, this.last.y);
- },
- V: function (y) {
- this.lineTo(this.last.x, y);
- },
- A: function (rx, ry, xaxisrotation, largearcflag, sweepflag, x, y) {
- this.arcTo(rx, ry, largearcflag, sweepflag, x, y);
- },
- Z: function () {
- this.andClose();
- }
- };
-
- path = pathToAbsolute(path);
- for (var i = 0, ii = path.length; i < ii; i++) {
- var b = path[i].shift();
- commands[b].apply(p, path[i]);
- path[i].unshift(b);
- }
- };
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.toFixed(3) + " " + (+this.y.toFixed(3)); }};
}
y = y || x;
!+y && (y = x);
if (x != 0) {
var bb = this.type == "path" ? pathDimensions(a.path) : this.getBBox(),
rcx = bb.x + bb.width / 2,
- rcy = bb.y + bb.height / 2;
+ rcy = bb.y + bb.height / 2,
+ kx = x / this._.sx,
+ ky = y / this._.sy;
cx = (+cx || cx == 0) ? cx : rcx;
cy = (+cy || cy == 0) ? cy : rcy;
var dirx = Math.round(x / Math.abs(x)),
diry = Math.round(y / Math.abs(y)),
s = this.node.style,
- ncx = cx + (rcx - cx) * x * dirx / this._.sx,
- ncy = cy + (rcy - cy) * y * diry / this._.sy;
+ ncx = cx + (rcx - cx) * dirx * kx,
+ ncy = cy + (rcy - cy) * diry * ky;
switch (this.type) {
case "rect":
case "image":
- var neww = a.width * x * dirx / this._.sx,
- newh = a.height * y * diry / this._.sy,
+ var neww = a.width * dirx * kx,
+ newh = a.height * diry * ky,
newx = ncx - neww / 2,
newy = ncy - newh / 2;
this.attr({
case "circle":
case "ellipse":
this.attr({
- rx: a.rx * x / this._.sx,
- ry: a.ry * y / this._.sy,
- r: a.r * x / this._.sx,
+ rx: a.rx * kx,
+ ry: a.ry * ky,
+ r: a.r * kx,
cx: ncx,
cy: ncy
});
skip = false;
}
if (R.svg && p[0].toUpperCase() == "A") {
- p[path[i].length - 2] *= x / this._.sx;
- p[path[i].length - 1] *= y / this._.sy;
- p[1] *= x / this._.sx;
- p[2] *= y / this._.sy;
+ p[path[i].length - 2] *= kx;
+ p[path[i].length - 1] *= ky;
+ p[1] *= kx;
+ p[2] *= ky;
p[5] = +(dirx + diry ? !!+p[5] : !+p[5]);
} else {
for (var j = 1, jj = p.length; j < jj; j++) {
- p[j] *= (j % 2) ? x / this._.sx : y / this._.sy;
+ p[j] *= (j % 2) ? kx : ky;
}
}
}
};
R.easing_formulas = {
- linear: function(n) {
+ linear: function (n) {
return n;
-
},
- "<": function(n) {
+ "<": function (n) {
return Math.pow(n, 3);
},
- ">": function(n) {
+ ">": function (n) {
return Math.pow(n - 1, 3) + 1;
},
- "<>": function(n) {
+ "<>": function (n) {
n = n * 2;
if (n < 1) {
return Math.pow(n, 3) / 2;
}
n -= 2;
return (Math.pow(n, 3) + 2) / 2;
-
},
- backIn: function(n) {
+ backIn: function (n) {
var s = 1.70158;
return Math.pow(n, 2) * ((s + 1) * n - s);
},
- backOut: function(n) {
+ backOut: function (n) {
n = n - 1;
var s = 1.70158;
return Math.pow(n, 2) * ((s + 1) * n + s) + 1;
},
- elastic: function(n) {
+ elastic: function (n) {
if (n == 0 || n == 1) {
return n;
}
s = p / 4;
return Math.pow(2, -10 * n) * Math.sin((n - s) * (2 * Math.PI) / p) + 1;
},
- bounce: function(n) {
+ bounce: function (n) {
var s = 7.5625,
p = 2.75,
l;
clearTimeout(this.animation_in_progress);
if (typeof easing == "function" || !easing) {
callback = easing || null;
- easing = "linear";
}
var from = {},
to = {},
};
break;
case "path":
- var pathes = pathEqualiser(from[attr], to[attr]);
+ var pathes = path2curve(from[attr], to[attr]);
from[attr] = pathes[0];
to[attr] = pathes[1];
diff[attr] = [];
}
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);
+ var pos = R.easing(easing, time / ms);
for (var attr in from) {
switch (availableAnimAttrs[attr]) {
case "number":
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":
for (var i = 0, ii = from[attr].length; i < ii; i++) {
now[i] = [from[attr][i][0]];
for (var j = 1, jj = from[attr][i].length; j < jj; j++) {
- now[i][j] = from[attr][i][j] + pos * ms * diff[attr][i][j];
+ now[i][j] = +from[attr][i][j] + pos * ms * diff[attr][i][j];
}
now[i] = now[i].join(" ");
}
}
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);
- paper.safari();
+ R.svg && paper.safari();
} else {
(t.x || t.y) && that.translate(-t.x, -t.y);
that.attr(params);
clearTimeout(that.animation_in_progress);
- paper.safari();
+ R.svg && paper.safari();
(typeof callback == "function") && callback.call(that);
}
prev = time;
switch (this.type) {
case "circle":
case "ellipse":
- this.attr({cx: this.attrs.cx + x, cy: this.attrs.cy + y});
+ this.attr({cx: +x + this.attrs.cx, cy: +y + this.attrs.cy});
break;
case "rect":
case "image":
case "text":
- this.attr({x: this.attrs.x + (+x), y: this.attrs.y + (+y)});
+ this.attr({x: +x + this.attrs.x, y: +y + this.attrs.y});
break;
case "path":
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;
};
-
+
// Set
var Set = function (items) {
this.items = [];
projects / raphael / blobdiff