/*
- * Raphael 0.7 - JavaScript Vector Library
+ * Raphael 0.8 - JavaScript Vector Library
*
- * Copyright (c) 2008 – 2009 Dmitry Baranovskiy (http://raphaeljs.com)
+ * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
*/
-function Raphael() {
- return Raphael._create.apply(Raphael, arguments);
-};
-(function (R) {
- R.version = "0.7";
- R.type = (window.SVGAngle ? "SVG" : "VML");
+window.Raphael = (function () {
+ var separator = /[, ]+/,
+ doc = document,
+ win = window,
+ oldRaphael = {
+ was: "Raphael" in window,
+ is: window.Raphael
+ },
+ R = function () {
+ 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"},
+ events = ["click", "dblclick", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup"];
+ R.version = "0.8";
+ 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;
- var paper = {};
R.fn = {};
- var availableAttrs = {cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '16px "Arial"', "font-family": '"Arial"', "font-size": "16", gradient: 0, height: 0, opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, 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: "number", rx: "number", ry: "number", scale: "csv", stroke: "colour", "stroke-opacity": "number", "stroke-width": "number", translation: "csv", width: "number", x: "number", y: "number"};
-
R.toString = function () {
return "Your browser " + (this.vml ? "doesn't ": "") + "support" + (this.svg ? "s": "") +
" SVG.\nYou are running " + unescape("Rapha%EBl%20") + this.version;
};
- // generic utilities
+ 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) {
brightness = hue.b;
blue;
if (brightness == 0) {
return {r: 0, g: 0, b: 0, hex: "#000"};
- } else {
- var i = Math.floor(hue * 6),
- f = (hue * 6) - i,
- p = brightness * (1 - saturation),
- q = brightness * (1 - (saturation * f)),
- t = brightness * (1 - (saturation * (1 - f)));
- [
- function () {red = brightness; green = t; blue = p;},
- function () {red = q; green = brightness; blue = p;},
- function () {red = p; green = brightness; blue = t;},
- function () {red = p; green = q; blue = brightness;},
- function () {red = t; green = p; blue = brightness;},
- function () {red = brightness; green = p; blue = q;},
- function () {red = brightness; green = t; blue = p;}
- ][i]();
}
- var rgb = {r: red, g: green, b: blue};
+ if (hue > 1 || saturation > 1 || brightness > 1) {
+ hue /= 255;
+ saturation /= 255;
+ brightness /= 255;
+ }
+ var i = Math.floor(hue * 6),
+ f = (hue * 6) - i,
+ p = brightness * (1 - saturation),
+ q = brightness * (1 - (saturation * f)),
+ t = brightness * (1 - (saturation * (1 - f)));
+ red = [brightness, q, p, p, t, brightness, brightness][i];
+ green = [t, brightness, brightness, q, p, p, t][i];
+ blue = [p, p, t, brightness, brightness, q, p][i];
red *= 255;
green *= 255;
blue *= 255;
+ var rgb = {r: red, g: green, b: blue};
var r = Math.round(red).toString(16);
if (r.length == 1) {
r = "0" + r;
green = red.g;
red = red.r;
}
- if (typeof red == "string" && red.charAt(0) == "#") {
- if (red.length == 4) {
- blue = parseInt(red.substring(3), 16);
- green = parseInt(red.substring(2, 3), 16);
- red = parseInt(red.substring(1, 2), 16);
- } else {
- blue = parseInt(red.substring(5), 16);
- green = parseInt(red.substring(3, 5), 16);
- red = parseInt(red.substring(1, 3), 16);
- }
+ if (typeof red == "string") {
+ var clr = getRGB(red);
+ red = clr.r;
+ green = clr.g;
+ blue = clr.b;
}
if (red > 1 || green > 1 || blue > 1) {
red /= 255;
}
return {h: hue, s: saturation, b: brightness};
};
- R.getRGB = function (colour) {
+ var getRGB = 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"};
+ if (colour.toString().toLowerCase() in htmlcolors) {
+ colour = htmlcolors[colour.toString().toLowerCase()];
+ }
+ if (!colour) {
+ return {r: 0, g: 0, b: 0, hex: "#000"};
+ }
+ if (colour == "none") {
+ return {r: -1, g: -1, b: -1, hex: "none"};
+ }
var red, green, blue,
- rgb = colour.match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*(\d+,\s*\d+,\s*\d+)\s*\)|rgb\(\s*(\d+%,\s*\d+%,\s*\d+%)\s*\)|hsb\(\s*(\d+,\s*\d+,\s*\d+)\s*\)|hsb\(\s*(\d+%,\s*\d+%,\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*\)|hsb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hsb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i);
if (rgb) {
if (rgb[2]) {
blue = parseInt(rgb[2].substring(5), 16);
}
if (rgb[4]) {
rgb = rgb[4].split(/\s*,\s*/);
- red = parseInt(rgb[0], 10);
- green = parseInt(rgb[1], 10);
- blue = parseInt(rgb[2], 10);
+ red = parseFloat(rgb[0]);
+ green = parseFloat(rgb[1]);
+ blue = parseFloat(rgb[2]);
}
if (rgb[5]) {
rgb = rgb[5].split(/\s*,\s*/);
- red = parseInt(rgb[0], 10) * 2.55;
- green = parseInt(rgb[1], 10) * 2.55;
- blue = parseInt(rgb[2], 10) * 2.55;
+ red = parseFloat(rgb[0]) * 2.55;
+ green = parseFloat(rgb[1]) * 2.55;
+ blue = parseFloat(rgb[2]) * 2.55;
}
if (rgb[6]) {
rgb = rgb[6].split(/\s*,\s*/);
- red = parseInt(rgb[0], 10);
- green = parseInt(rgb[1], 10);
- blue = parseInt(rgb[2], 10);
- return this.hsb2rgb(red, green, blue);
+ red = parseFloat(rgb[0]);
+ green = parseFloat(rgb[1]);
+ blue = parseFloat(rgb[2]);
+ return R.hsb2rgb(red, green, blue);
}
if (rgb[7]) {
rgb = rgb[7].split(/\s*,\s*/);
- red = parseInt(rgb[0], 10) * 2.55;
- green = parseInt(rgb[1], 10) * 2.55;
- blue = parseInt(rgb[2], 10) * 2.55;
- return this.hsb2rgb(red, green, blue);
+ red = parseFloat(rgb[0]) * 2.55;
+ green = parseFloat(rgb[1]) * 2.55;
+ blue = parseFloat(rgb[2]) * 2.55;
+ return R.hsb2rgb(red, green, blue);
}
var rgb = {r: red, g: green, b: blue};
var r = Math.round(red).toString(16);
(b.length == 1) && (b = "0" + b);
rgb.hex = "#" + r + g + b;
return rgb;
+ } else {
+ return {r: -1, g: -1, b: -1, hex: "none"};
}
};
R.getColor = function (value) {
return rgb.hex;
};
R.getColor.reset = function () {
- this.start = undefined;
+ delete this.start;
};
+ // path utilities
R.parsePathString = function (pathString) {
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.toString() == toString.toString()) {
return pathString;
}
- pathString.replace(/([achlmqstvz])[\s,]*((-?\d*\.?\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*)\s*,?\s*/ig, function (a, b) {
+ c.replace(/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig, function (a, b) {
b && params.push(+b);
});
while (params.length >= paramCounts[name]) {
data.toString = toString;
return data;
};
- R.pathDimensions = function (path) {
+ var pathDimensions = function (path) {
var pathArray = path;
if (typeof path == "string") {
- pathArray = this.parsePathString(path);
+ pathArray = R.parsePathString(path);
}
- pathArray = this.pathToAbsolute(pathArray);
+ pathArray = pathToAbsolute(pathArray);
var x = [], y = [], length = 0;
for (var i = 0, ii = pathArray.length; i < ii; i++) {
switch (pathArray[i][0]) {
Y: y
};
};
- R.pathToRelative = function (pathArray) {
+ var pathToRelative = function (pathArray) {
var res = [];
if (typeof pathArray == "string") {
- pathArray = this.parsePathString(pathArray);
+ pathArray = R.parsePathString(pathArray);
}
var x = 0, y = 0, start = 0;
if (pathArray[0][0] == "M") {
switch (res[i][0]) {
case "z":
break;
- case "h":
+ case "h":
x += res[i][res[i].length - 1];
break;
case "v":
res.toString = pathArray.toString;
return res;
};
- R.pathToAbsolute = function (pathArray) {
+ var pathToAbsolute = function (pathArray) {
var res = [];
if (typeof pathArray == "string") {
- pathArray = this.parsePathString(pathArray);
+ pathArray = R.parsePathString(pathArray);
}
- var x = 0, y = 0, start = 0;
+ var x = 0,
+ y = 0,
+ start = 0;
if (pathArray[0][0] == "M") {
x = +pathArray[0][1];
y = +pathArray[0][2];
}
for (var i = start, ii = pathArray.length; i < ii; i++) {
res[i] = [];
- if (pathArray[i][0] != pathArray[i][0].toUpperCase()) {
- res[i][0] = pathArray[i][0].toUpperCase();
+ if (pathArray[i][0] != (pathArray[i][0] + "").toUpperCase()) {
+ res[i][0] = (pathArray[i][0] + "").toUpperCase();
switch (res[i][0]) {
case "A":
res[i][1] = pathArray[i][1];
switch (res[i][0]) {
case "Z":
break;
- case "H":
+ case "H":
x = res[i][1];
break;
case "V":
res.toString = pathArray.toString;
return res;
};
- R.pathEqualiser = function (path1, path2) {
- var data = [this.pathToAbsolute(this.parsePathString(path1)), this.pathToAbsolute(this.parsePathString(path2))],
+ var pathEqualiser = function (path1, path2) {
+ 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}],
processPath = function (path, d) {
if (!path) {
}
return data;
};
+ var toGradient = function (gradient) {
+ if (typeof gradient == "string") {
+ gradient = gradient.split(/\s*\-\s*/);
+ var angle = gradient.shift();
+ if (angle.toLowerCase() == "v") {
+ angle = 90;
+ } else if (angle.toLowerCase() == "h") {
+ angle = 0;
+ } else {
+ angle = parseFloat(angle);
+ }
+ angle = -angle;
+ var grobj = {angle: angle, type: "linear", dots: [], vector: [0, 0, Math.cos(angle * Math.PI / 180).toFixed(3), Math.sin(angle * Math.PI / 180).toFixed(3)]};
+ var max = 1 / (Math.max(Math.abs(grobj.vector[2]), Math.abs(grobj.vector[3])) || 1);
+ grobj.vector[2] *= max;
+ grobj.vector[3] *= max;
+ if (grobj.vector[2] < 0) {
+ grobj.vector[0] = -grobj.vector[2];
+ grobj.vector[2] = 0;
+ }
+ if (grobj.vector[3] < 0) {
+ 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);
+ for (var i = 0, ii = gradient.length; i < ii; i++) {
+ var dot = {};
+ var par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
+ dot.color = getRGB(par[1]).hex;
+ par[2] && (dot.offset = par[2] + "%");
+ grobj.dots.push(dot);
+ }
+ for (var i = 1, ii = grobj.dots.length - 1; i < ii; i++) {
+ if (!grobj.dots[i].offset) {
+ var start = parseFloat(grobj.dots[i - 1].offset || 0),
+ end = false;
+ for (var j = i + 1; j < ii; j++) {
+ if (grobj.dots[j].offset) {
+ end = grobj.dots[j].offset;
+ break;
+ }
+ }
+ if (!end) {
+ end = 100;
+ j = ii;
+ }
+ end = parseFloat(end);
+ var d = (end - start) / (j - i + 1);
+ for (; i < j; i++) {
+ start += d;
+ grobj.dots[i].offset = start + "%";
+ }
+ }
+ }
+ return grobj;
+ } else {
+ return gradient;
+ }
+ };
+ var getContainer = function () {
+ var container, x, y, width, height;
+ if (typeof arguments[0] == "string" || typeof arguments[0] == "object") {
+ if (typeof arguments[0] == "string") {
+ container = doc.getElementById(arguments[0]);
+ } else {
+ container = arguments[0];
+ }
+ if (container.tagName) {
+ if (arguments[1] == null) {
+ return {
+ container: container,
+ width: container.style.pixelWidth || container.offsetWidth,
+ height: container.style.pixelHeight || container.offsetHeight
+ };
+ } else {
+ return {container: container, width: arguments[1], height: arguments[2]};
+ }
+ }
+ } else if (typeof arguments[0] == "number" && arguments.length > 3) {
+ return {container: 1, x: arguments[0], y: arguments[1], width: arguments[2], height: arguments[3]};
+ }
+ };
+ var plugins = function (con, scope, add) {
+ for (var prop in add) if (add.hasOwnProperty(prop) && !(prop in con)) {
+ switch (typeof add[prop]) {
+ case "function":
+ con[prop] = con === scope ? add[prop] : function () { add[prop].apply(scope, arguments); };
+ break;
+ case "object":
+ con[prop] = {};
+ plugins(con[prop], con, add[prop]);
+ break;
+ default:
+ con[prop] = add[prop];
+ break;
+ }
+ }
+ };
// SVG
if (R.svg) {
- thePath = function (params, pathString, SVG) {
- var el = document.createElementNS(SVG.svgns, "path");
+ var thePath = function (params, pathString, SVG) {
+ var el = doc.createElementNS(SVG.svgns, "path");
el.setAttribute("fill", "none");
if (SVG.canvas) {
SVG.canvas.appendChild(el);
};
p.moveTo = function (x, y) {
var d = this.isAbsolute?"M":"m";
- d += parseFloat(x, 10).toFixed(3) + " " + parseFloat(y, 10).toFixed(3) + " ";
+ 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, 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y, 10);
+ 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;
};
p.lineTo = function (x, y) {
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x, 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y, 10);
+ this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x);
+ this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y);
var d = this.isAbsolute?"L":"l";
- d += parseFloat(x, 10).toFixed(3) + " " + parseFloat(y, 10).toFixed(3) + " ";
+ d += parseFloat(x).toFixed(3) + " " + parseFloat(y).toFixed(3) + " ";
var oldD = this[0].getAttribute("d") || "";
this[0].setAttribute("d", oldD + d);
this.attrs.path = oldD + d;
};
p.arcTo = function (rx, ry, large_arc_flag, sweep_flag, x, y) {
var d = this.isAbsolute ? "A" : "a";
- d += [parseFloat(rx, 10).toFixed(3), parseFloat(ry, 10).toFixed(3), 0, large_arc_flag, sweep_flag, parseFloat(x, 10).toFixed(3), parseFloat(y, 10).toFixed(3)].join(" ");
+ 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[0].setAttribute("d", oldD + d);
- this.last.x = parseFloat(x, 10);
- this.last.y = parseFloat(y, 10);
+ this.last.x = parseFloat(x);
+ this.last.y = parseFloat(y);
this.attrs.path = oldD + d;
return this;
};
return this.lineTo(x1, y1);
} else {
var p = {};
- var x = parseFloat(x1, 10);
- var y = parseFloat(y1, 10);
- var w = parseFloat(w1, 10);
+ var x = parseFloat(x1);
+ var y = parseFloat(y1);
+ var w = parseFloat(w1);
var d = this.isAbsolute?"C":"c";
var attr = [+this.last.x + w, +this.last.y, x - w, y, x, y];
for (var i = 0, ii = attr.length; i < ii; i++) {
d = d.toUpperCase();
}
for (var i = 0, ii = arguments.length; i < ii; i++) {
- d += parseFloat(arguments[i], 10).toFixed(3) + " ";
+ d += parseFloat(arguments[i]).toFixed(3) + " ";
}
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[arguments.length - 2], 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[arguments.length - 1], 10);
- this.last.bx = parseFloat(arguments[arguments.length - 4], 10);
- this.last.by = parseFloat(arguments[arguments.length - 3], 10);
+ 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;
d = d.toUpperCase();
}
for (var i = 0, ii = arguments.length; i < ii; i++) {
- d += parseFloat(arguments[i], 10).toFixed(3) + " ";
+ d += parseFloat(arguments[i]).toFixed(3) + " ";
}
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[arguments.length - 2], 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[arguments.length - 1], 10);
+ 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], 10);
- this.last.qy = parseFloat(arguments[arguments.length - 3], 10);
+ 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);
}
return p;
};
- addGrdientFill = function (o, gradient, SVG) {
- var el = document.createElementNS(SVG.svgns, gradient.type + "Gradient");
- el.id = "raphael-gradient-" + Raphael.idGenerator++;
+ var addGrdientFill = function (o, gradient, SVG) {
+ gradient = toGradient(gradient);
+ var el = doc.createElementNS(SVG.svgns, (gradient.type || "linear") + "Gradient");
+ el.id = "raphael-gradient-" + R.idGenerator++;
if (gradient.vector && gradient.vector.length) {
el.setAttribute("x1", gradient.vector[0]);
el.setAttribute("y1", gradient.vector[1]);
el.setAttribute("y2", gradient.vector[3]);
}
SVG.defs.appendChild(el);
+ var isopacity = true;
for (var i = 0, ii = gradient.dots.length; i < ii; i++) {
- var stop = document.createElementNS(SVG.svgns, "stop");
- stop.setAttribute("offset", gradient.dots[i].offset ? gradient.dots[i].offset : (i == 0) ? "0%" : "100%");
- stop.setAttribute("stop-color", gradient.dots[i].color || "#fff");
- if (typeof gradient.dots[i].opacity != "undefined") {
- stop.setAttribute("stop-opacity", gradient.dots[i].opacity);
+ var stop = doc.createElementNS(SVG.svgns, "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", 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);
+ }
o.setAttribute("fill", "url(#" + el.id + ")");
+ o.style.opacity = 1;
+ o.style.fillOpacity = 1;
+ o.setAttribute("opacity", 1);
+ o.setAttribute("fill-opacity", 1);
};
- updatePosition = function (o) {
+ var updatePosition = function (o) {
if (o.pattern) {
- var bbox = o.node.getBBox();
+ var bbox = o.getBBox();
o.pattern.setAttribute("patternTransform", "translate(" + [bbox.x, bbox.y].join(",") + ")");
}
};
- setFillAndStroke = function (o, params) {
+ var setFillAndStroke = function (o, params) {
var dasharray = {
"-": [3, 1],
".": [1, 1],
}
};
for (var att in params) {
+ if (!(att in availableAttrs)) {
+ continue;
+ }
var value = params[att];
o.attrs[att] = value;
switch (att) {
+ // Hyperlink
+ case "href":
+ case "title":
+ case "target":
+ var pn = o.node.parentNode;
+ if (pn.tagName.toLowerCase() != "a") {
+ var hl = doc.createElementNS(o.svg.svgns, "a");
+ pn.insertBefore(hl, o.node);
+ hl.appendChild(o.node);
+ pn = hl;
+ }
+ pn.setAttributeNS(o.svg.xlink, att, value);
+ break;
case "path":
if (o.type == "path") {
o.node.setAttribute("d", "M0,0");
case "height":
o.node.setAttribute(att, value);
break;
- case "gradient":
- addGrdientFill(o.node, value, o.svg);
+ case "r":
+ if (o.type == "rect") {
+ o.node.setAttribute("rx", value);
+ o.node.setAttribute("ry", value);
+ } else {
+ o.node.setAttribute(att, value);
+ }
+ break;
+ case "src":
+ if (o.type == "image") {
+ o.node.setAttributeNS(o.svg.xlink, "href", value);
+ }
break;
case "stroke-width":
o.node.style.strokeWidth = value;
case "stroke-dasharray":
addDashes(o, value);
break;
- case "text":
- if (o.type == "text") {
- o.node.childNodes.length && o.node.removeChild(o.node.firstChild);
- o.node.appendChild(document.createTextNode(value));
- }
- break;
case "rotation":
o.rotate(value, true);
break;
case "translation":
- var xy = value.split(/[, ]+/);
- o.translate(xy[0], xy[1]);
+ var xy = (value + "").split(separator);
+ o.translate((+xy[0] + 1 || 2) - 1, (+xy[1] + 1 || 2) - 1);
break;
case "scale":
- var xy = value.split(/[, ]+/);
- o.scale(xy[0], xy[1]);
+ var xy = (value + "").split(separator);
+ o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1);
break;
case "fill":
var isURL = value.match(/^url\(([^\)]+)\)$/i);
if (isURL) {
- var el = document.createElementNS(o.svg.svgns, "pattern");
- var ig = document.createElementNS(o.svg.svgns, "image");
- el.id = "raphael-pattern-" + Raphael.idGenerator++;
+ var el = doc.createElementNS(o.svg.svgns, "pattern");
+ var ig = doc.createElementNS(o.svg.svgns, "image");
+ el.id = "raphael-pattern-" + R.idGenerator++;
el.setAttribute("x", 0);
el.setAttribute("y", 0);
el.setAttribute("patternUnits", "userSpaceOnUse");
ig.setAttributeNS(o.svg.xlink, "href", isURL[1]);
el.appendChild(ig);
- var img = document.createElement("img");
+ var img = doc.createElement("img");
img.style.position = "absolute";
img.style.top = "-9999em";
img.style.left = "-9999em";
el.setAttribute("height", this.offsetHeight);
ig.setAttribute("width", this.offsetWidth);
ig.setAttribute("height", this.offsetHeight);
- document.body.removeChild(this);
+ doc.body.removeChild(this);
paper.safari();
};
- document.body.appendChild(img);
+ doc.body.appendChild(img);
img.src = isURL[1];
o.svg.defs.appendChild(el);
o.node.style.fill = "url(#" + el.id + ")";
updatePosition(o);
break;
}
+ delete params.gradient;
+ delete o.attrs.gradient;
+ if (typeof o.attrs.opacity != "undefined" && typeof params.opacity == "undefined" ) {
+ o.node.style.opacity = o.attrs.opacity;
+ // Need following line for Firefox
+ o.node.setAttribute("opacity", o.attrs.opacity);
+ }
+ if (typeof o.attrs["fill-opacity"] != "undefined" && typeof params["fill-opacity"] == "undefined" ) {
+ o.node.style.fillOpacity = o.attrs["fill-opacity"];
+ // Need following line for Firefox
+ o.node.setAttribute("fill-opacity", o.attrs["fill-opacity"]);
+ }
+ case "stroke":
+ o.node.style[att] = getRGB(value).hex;
+ // Need following line for Firefox
+ o.node.setAttribute(att, getRGB(value).hex);
+ break;
+ case "gradient":
+ addGrdientFill(o.node, value, o.svg);
+ break;
+ case "opacity":
+ case "fill-opacity":
+ if (o.attrs.gradient) {
+ var gradient = doc.getElementById(o.node.getAttribute("fill").replace(/^url\(#|\)$/g, ""));
+ if (gradient) {
+ var stops = gradient.getElementsByTagName("stop");
+ stops[stops.length - 1].setAttribute("stop-opacity", value);
+ }
+ break;
+ }
default :
var cssrule = att.replace(/(\-.)/g, function (w) {
return w.substring(1).toUpperCase();
break;
}
}
+ tuneText(o, params);
+ };
+ var leading = 1.2;
+ var tuneText = function (element, params) {
+ if (element.type != "text" || !("text" in params || "font" in params || "font-size" in params || "x" in params)) {
+ return;
+ }
+ var fontSize = element.node.firstChild ? parseInt(doc.defaultView.getComputedStyle(element.node.firstChild, "").getPropertyValue("font-size"), 10) : 10;
+ var height = 0;
+
+ if ("text" in params) {
+ while (element.node.firstChild) {
+ element.node.removeChild(element.node.firstChild);
+ }
+ var texts = (params.text + "").split("\n");
+ for (var i = 0, ii = texts.length; i < ii; i++) {
+ var tspan = doc.createElementNS(element.svg.svgns, "tspan");
+ i && tspan.setAttribute("dy", fontSize * leading);
+ i && tspan.setAttribute("x", element.attrs.x);
+ tspan.appendChild(doc.createTextNode(texts[i]));
+ element.node.appendChild(tspan);
+ height += fontSize * leading;
+ }
+ } else {
+ var texts = element.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", element.attrs.x);
+ height += fontSize * leading;
+ }
+ }
+ height -= fontSize * (leading - 1);
+ var dif = height / 2 - fontSize;
+ if (dif) {
+ element.node.setAttribute("y", element.attrs.y - dif);
+ }
};
var Element = function (node, svg) {
var X = 0,
sy: 1
};
};
- Element.prototype.translate = function (x, y) {
- if (x == undefined && y == undefined) {
- return {x: this._.tx, y: this._.ty};
- }
- this._.tx += +x;
- this._.ty += +y;
- switch (this.type) {
- case "circle":
- case "ellipse":
- this.attr({cx: this.attrs.cx + x, cy: this.attrs.cy + y});
- break;
- case "rect":
- case "image":
- case "text":
- this.attr({x: this.attrs.x + x, y: this.attrs.y + y});
- break;
- case "path":
- var path = Raphael.pathToRelative(this.attrs.path);
- path[0][1] += +x;
- path[0][2] += +y;
- this.attr({path: path.join(" ")});
- break;
- }
- return this;
- };
- Element.prototype.rotate = function (deg, isAbsolute) {
- if (deg == undefined) {
+ Element.prototype.rotate = function (deg, cx, cy) {
+ if (deg == null) {
return this._.rt.deg;
}
var bbox = this.getBBox();
- if (isAbsolute) {
+ deg = deg.toString().split(separator);
+ if (deg.length - 1) {
+ cx = parseFloat(deg[1]);
+ cy = parseFloat(deg[2]);
+ }
+ deg = parseFloat(deg[0]);
+ if (cx != null) {
this._.rt.deg = deg;
} else {
this._.rt.deg += deg;
}
-
+ if (cy == null) {
+ cx = null;
+ }
+ 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 + " " + (bbox.x + bbox.width / 2) + " " + (bbox.y + bbox.height / 2) + ")");
+ this.transformations[0] = ("rotate(" + this._.rt.deg + " " + cx + " " + cy + ")");
} else {
this.transformations[0] = "";
}
this.node.parentNode.removeChild(this.node);
};
Element.prototype.getBBox = function () {
- return this.node.getBBox();
+ var bbox = this.node.getBBox();
+ if (this.type == "text") {
+ var chr0 = this.node.getExtentOfChar(0);
+ if (chr0.height > bbox.height) {
+ var chrl = this.node.getExtentOfChar(this.node.getNumberOfChars() - 1);
+ return {
+ x: chr0.x,
+ y: chr0.y,
+ width: chrl.x - chr0.x + chrl.width,
+ height: chr0.height
+ };
+ }
+ }
+ return bbox;
};
Element.prototype.attr = function () {
if (arguments.length == 1 && typeof arguments[0] == "string") {
}
return this.attrs[arguments[0]];
}
- if (arguments.length == 1 && arguments[0] instanceof Array) {
+ if (arguments.length == 1 && arguments[0] instanceof win.Array) {
var values = {};
for (var j in arguments[0]) {
values[arguments[0][j]] = this.attrs[arguments[0][j]];
element.node.parentNode.insertBefore(this.node, element.node);
return this;
};
- theCircle = function (svg, x, y, r) {
- var el = document.createElementNS(svg.svgns, "circle");
+ 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);
res.type = "circle";
return res;
};
- theRect = function (svg, x, y, w, h, r) {
- var el = document.createElementNS(svg.svgns, "rect");
+ 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);
res.type = "rect";
return res;
};
- theEllipse = function (svg, x, y, rx, ry) {
- var el = document.createElementNS(svg.svgns, "ellipse");
+ 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);
res.type = "ellipse";
return res;
};
- theImage = function (svg, src, x, y, w, h) {
- var el = document.createElementNS(svg.svgns, "image");
+ 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);
res.type = "image";
return res;
};
- theText = function (svg, x, y, text) {
- var el = document.createElementNS(svg.svgns, "text");
+ 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 (text) {
- el.appendChild(document.createTextNode(text));
- }
if (svg.canvas) {
svg.canvas.appendChild(el);
}
res.attrs.x = x;
res.attrs.y = y;
res.type = "text";
- setFillAndStroke(res, {font: '10px "Arial"', stroke: "none", fill: "#000"});
+ setFillAndStroke(res, {font: availableAttrs.font, stroke: "none", fill: "#000", text: text});
return res;
};
- theGroup = function (svg) {
- var el = document.createElementNS(svg.svgns, "g");
+ var theGroup = function (svg) {
+ var el = doc.createElementNS(svg.svgns, "g");
if (svg.canvas) {
svg.canvas.appendChild(el);
}
i.type = "group";
return i;
};
- R._create = function () {
- // container, width, height
- // x, y, width, height
- if (typeof arguments[0] == "string") {
- var container = document.getElementById(arguments[0]);
- var width = arguments[1];
- var height = arguments[2];
- }
- if (typeof arguments[0] == "object") {
- var container = arguments[0];
- var width = arguments[1];
- var height = arguments[2];
- }
- if (typeof arguments[0] == "number") {
- var container = 1,
- x = arguments[0],
- y = arguments[1],
- width = arguments[2],
- height = arguments[3];
- }
+ var setSize = function (width, height) {
+ this.width = width || this.width;
+ this.height = height || this.height;
+ this.canvas.setAttribute("width", this.width);
+ this.canvas.setAttribute("height", this.height);
+ return this;
+ };
+ var create = function () {
+ var con = getContainer.apply(null, arguments);
+ var container = con.container,
+ x = con.x,
+ y = con.y,
+ width = con.width,
+ height = con.height;
if (!container) {
throw new Error("SVG container not found.");
}
- paper.canvas = document.createElementNS(paper.svgns, "svg");
+ paper.canvas = doc.createElementNS(paper.svgns, "svg");
paper.canvas.setAttribute("width", width || 320);
paper.width = width || 320;
paper.canvas.setAttribute("height", height || 200);
paper.height = height || 200;
if (container == 1) {
- document.body.appendChild(paper.canvas);
+ doc.body.appendChild(paper.canvas);
paper.canvas.style.position = "absolute";
paper.canvas.style.left = x + "px";
paper.canvas.style.top = y + "px";
while (this.canvas.firstChild) {
this.canvas.removeChild(this.canvas.firstChild);
}
- this.defs = document.createElementNS(paper.svgns, "defs");
+ this.defs = doc.createElementNS(paper.svgns, "defs");
this.canvas.appendChild(this.defs);
}
};
container[prop] = paper[prop];
}
}
- for (var prop in R.fn) {
- if (!container[prop]) {
- container[prop] = R.fn[prop];
- }
- }
+ plugins(container, container, R.fn);
container.clear();
return container;
};
// VML
if (R.vml) {
thePath = function (params, pathString, VML) {
- var g = document.createElement("rvml:group"), gl = g.style;
+ var g = createNode("group"), gl = g.style;
gl.position = "absolute";
gl.left = 0;
gl.top = 0;
gl.width = VML.width + "px";
gl.height = VML.height + "px";
- var el = document.createElement("rvml:shape"), ol = el.style;
+ var el = createNode("shape"), ol = el.style;
ol.width = VML.width + "px";
ol.height = VML.height + "px";
el.path = "";
if (params["class"]) {
- el.className = params["class"];
+ el.className = "rvml " + params["class"];
}
el.coordsize = this.coordsize;
el.coordorigin = this.coordorigin;
};
p.moveTo = function (x, y) {
var d = this.isAbsolute?"m":"t";
- d += Math.round(parseFloat(x, 10)) + " " + Math.round(parseFloat(y, 10));
+ d += Math.round(parseFloat(x)) + " " + Math.round(parseFloat(y));
this.node.path = this.Path += d;
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x, 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y, 10);
+ 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;
};
p.lineTo = function (x, y) {
var d = this.isAbsolute?"l":"r";
- d += Math.round(parseFloat(x, 10)) + " " + Math.round(parseFloat(y, 10));
+ d += Math.round(parseFloat(x)) + " " + Math.round(parseFloat(y));
this[0].path = this.Path += d;
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(x, 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y, 10);
+ 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;
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, 10)), Math.round(parseFloat(y2, 10))].join(", ");
+ 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, 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(y2, 10);
+ 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;
if (!w1) {
return this.lineTo(x1, y1);
} else {
- var x = Math.round(Math.round(parseFloat(x1, 10) * 100) / 100),
- y = Math.round(Math.round(parseFloat(y1, 10) * 100) / 100),
- w = Math.round(Math.round(parseFloat(w1, 10) * 100) / 100),
+ var x = Math.round(Math.round(parseFloat(x1) * 100) / 100),
+ y = Math.round(Math.round(parseFloat(y1) * 100) / 100),
+ w = Math.round(Math.round(parseFloat(w1) * 100) / 100),
d = this.isAbsolute ? "c" : "v",
attr = [Math.round(this.last.x) + w, Math.round(this.last.y), x - w, y, x, y],
svgattr = [this.last.x + w1, this.last.y, x1 - w1, y1, x1, y1];
p.curveTo = function () {
var d = this.isAbsolute ? "c" : "v";
if (arguments.length == 6) {
- this.last.bx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2], 10);
- this.last.by = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3], 10);
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[4], 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[5], 10);
- d += [Math.round(parseFloat(arguments[0], 10)),
- Math.round(parseFloat(arguments[1], 10)),
- Math.round(parseFloat(arguments[2], 10)),
- Math.round(parseFloat(arguments[3], 10)),
- Math.round(parseFloat(arguments[4], 10)),
- Math.round(parseFloat(arguments[5], 10))].join(" ") + " ";
+ 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])),
+ Math.round(parseFloat(arguments[1])),
+ Math.round(parseFloat(arguments[2])),
+ Math.round(parseFloat(arguments[3])),
+ Math.round(parseFloat(arguments[4])),
+ Math.round(parseFloat(arguments[5]))].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;
var by = this.last.y * 2 - this.last.by;
- this.last.bx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[0], 10);
- this.last.by = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[1], 10);
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2], 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3], 10);
+ 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), Math.round(by),
- Math.round(parseFloat(arguments[0], 10)),
- Math.round(parseFloat(arguments[1], 10)),
- Math.round(parseFloat(arguments[2], 10)),
- Math.round(parseFloat(arguments[3], 10))].join(" ") + " ";
+ Math.round(parseFloat(arguments[0])),
+ Math.round(parseFloat(arguments[1])),
+ Math.round(parseFloat(arguments[2])),
+ Math.round(parseFloat(arguments[3]))].join(" ") + " ";
this.attrs.path += (this.isAbsolute ? "S" : "s") + Array.prototype.splice.call(arguments, 0, arguments.length);
}
this.node.path = this.Path += d;
p.qcurveTo = function () {
var d = "qb";
if (arguments.length == 4) {
- this.last.qx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[0], 10);
- this.last.qy = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[1], 10);
- this.last.x = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[2], 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3], 10);
+ this.last.qx = (this.isAbsolute ? 0 : this.last.x) + parseFloat(arguments[0]);
+ this.last.qy = (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(this.last.qx),
Math.round(this.last.qy),
Math.round(this.last.x),
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 ? 0 : this.last.x) + parseFloat(arguments[2], 10);
- this.last.y = (this.isAbsolute ? 0 : this.last.y) + parseFloat(arguments[3], 10);
+ 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(this.last.qx),
Math.round(this.last.qy),
Math.round(this.last.x),
return o;
};
p.andClose = function () {
- this.node.path = (this.Path += "x e");
+ this.node.path = (this.Path += "x");
this.attrs.path += "z";
return this;
};
p.attrs.path = "";
paper.pathfinder(p, "" + pathString);
}
- p.setBox();
+ // p.setBox();
setFillAndStroke(p, params);
if (params.gradient) {
addGrdientFill(p, params.gradient);
}
return p;
};
- setFillAndStroke = function (o, params) {
+ var setFillAndStroke = function (o, params) {
var s = o.node.style,
res = o;
o.attrs = o.attrs || {};
for (var par in params) {
o.attrs[par] = params[par];
}
+ params.href && (o.node.href = params.href);
+ params.title && (o.node.title = params.title);
+ params.target && (o.node.target = params.target);
if (params.path && o.type == "path") {
o.Path = "";
o.path = [];
paper.pathfinder(o, params.path);
}
if (params.rotation != null) {
- o.Group.style.rotation = params.rotation;
+ o.rotate(params.rotation, true);
}
if (params.translation) {
- var xy = params.translation.split(/[, ]+/);
+ var xy = (params.translation + "").split(separator);
o.translate(xy[0], xy[1]);
}
if (params.scale) {
- var xy = params.scale.split(/[, ]+/);
+ var xy = (params.scale + "").split(separator);
o.scale(xy[0], xy[1]);
}
+ if (o.type == "image" && params.src) {
+ o.node.src = params.src;
+ }
if (o.type == "image" && params.opacity) {
o.node.filterOpacity = " progid:DXImageTransform.Microsoft.Alpha(opacity=" + (params.opacity * 100) + ")";
o.node.style.filter = (o.node.filterMatrix || "") + (o.node.filterOpacity || "");
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") {
+ 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 || o.node;
- var fill = (o.getElementsByTagName("fill") && o.getElementsByTagName("fill")[0]) || document.createElement("rvml:fill");
+ var fill = (o.getElementsByTagName("fill") && o.getElementsByTagName("fill")[0]) || createNode("fill");
if ("fill-opacity" in params || "opacity" in params) {
- fill.opacity = ((params["fill-opacity"] + 1 || 2) - 1) * ((params.opacity + 1 || 2) - 1);
+ fill.opacity = ((+params["fill-opacity"] + 1 || 2) - 1) * ((+params.opacity + 1 || 2) - 1);
}
if (params.fill) {
fill.on = true;
}
- if (fill.on == undefined || params.fill == "none") {
+ if (typeof fill.on == "undefined" || params.fill == "none") {
fill.on = false;
}
if (fill.on && params.fill) {
fill.src = isURL[1];
fill.type = "tile";
} else {
- fill.color = params.fill;
+ fill.color = getRGB(params.fill).hex;
fill.src = "";
fill.type = "solid";
}
}
o.appendChild(fill);
- var stroke = (o.getElementsByTagName("stroke") && o.getElementsByTagName("stroke")[0]) || document.createElement("rvml:stroke");
- if ((params.stroke && params.stroke != "none") || params["stroke-width"] || params["stroke-opacity"] || params["stroke-dasharray"]) {
+ 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"]) {
stroke.on = true;
}
- if (params.stroke == "none" || typeof stroke.on == "undefined") {
+ if (params.stroke == "none" || typeof stroke.on == "undefined" || params.stroke == 0) {
stroke.on = false;
}
if (stroke.on && params.stroke) {
- stroke.color = params.stroke;
+ stroke.color = getRGB(params.stroke).hex;
}
- stroke.opacity = ((params["stroke-opacity"] + 1 || 2) - 1) * ((params.opacity + 1 || 2) - 1);
+ stroke.opacity = ((+params["stroke-opacity"] + 1 || 2) - 1) * ((+params.opacity + 1 || 2) - 1);
params["stroke-linejoin"] && (stroke.joinstyle = params["stroke-linejoin"] || "miter");
stroke.miterlimit = params["stroke-miterlimit"] || 8;
params["stroke-linecap"] && (stroke.endcap = {butt: "flat", square: "square", round: "round"}[params["stroke-linecap"]] || "miter");
- params["stroke-width"] && (stroke.weight = (parseFloat(params["stroke-width"], 10) || 1) * 12 / 16);
+ params["stroke-width"] && (stroke.weight = (parseFloat(params["stroke-width"]) || 1) * 12 / 16);
if (params["stroke-dasharray"]) {
var dasharray = {
"-": "shortdash",
o.appendChild(stroke);
}
if (res.type == "text") {
- var span = document.createElement("span"),
+ var span = doc.createElement("span"),
s = span.style;
+ s.padding = 0;
+ s.margin = 0;
+ s.lineHeight = 1;
+ s.display = "inline";
res.attrs.font && (s.font = res.attrs.font);
res.attrs["font-family"] && (s.fontFamily = res.attrs["font-family"]);
res.attrs["font-size"] && (s.fontSize = res.attrs["font-size"]);
span.innerText = res.node.string;
res.W = res.attrs.w = span.offsetWidth;
res.H = res.attrs.h = span.offsetHeight;
- res.X = res.attrs.x - Math.round(res.W / 2);
- res.Y = res.attrs.y - Math.round(res.H / 2);
+ res.X = res.attrs.x;
+ res.Y = res.attrs.y + Math.round(res.H / 2);
res.node.parentNode.removeChild(span);
+
+ // text-anchor emulation
+ switch (res.attrs["text-anchor"]) {
+ case "start":
+ res.node.style["v-text-align"] = "left";
+ res.bbx = Math.round(res.W / 2);
+ break;
+ case "end":
+ res.node.style["v-text-align"] = "right";
+ res.bbx = -Math.round(res.W / 2);
+ break;
+ default:
+ res.node.style["v-text-align"] = "center";
+ break;
+ }
}
};
- addGrdientFill = function (o, gradient) {
+ var getAngle = function (a, b, c, d) {
+ var angle = Math.round(Math.atan((parseFloat(c) - parseFloat(a)) / (parseFloat(d) - parseFloat(b))) * 57.29) || 0;
+ if (!angle && parseFloat(a) < parseFloat(b)) {
+ angle = 180;
+ }
+ angle -= 180;
+ if (angle < 0) {
+ angle += 360;
+ }
+ return angle;
+ };
+ var addGrdientFill = function (o, gradient) {
+ gradient = toGradient(gradient);
o.attrs = o.attrs || {};
+ var attrs = o.attrs;
o.attrs.gradient = gradient;
o = o.shape || o[0];
var fill = o.getElementsByTagName("fill");
if (fill.length) {
fill = fill[0];
} else {
- fill = document.createElement("rvml:fill");
+ fill = createNode("fill");
}
if (gradient.dots.length) {
fill.on = true;
fill.method = "none";
- fill.type = (gradient.type.toLowerCase() == "linear") ? "gradient" : "gradientTitle";
+ fill.type = ((gradient.type + "").toLowerCase() == "radial") ? "gradientTitle" : "gradient";
if (typeof gradient.dots[0].color != "undefined") {
- fill.color = gradient.dots[0].color || "#000";
+ fill.color = getRGB(gradient.dots[0].color).hex;
}
if (typeof gradient.dots[gradient.dots.length - 1].color != "undefined") {
- fill.color2 = gradient.dots[gradient.dots.length - 1].color || "#000";
+ fill.color2 = getRGB(gradient.dots[gradient.dots.length - 1].color).hex;
}
var colors = [];
for (var i = 0, ii = gradient.dots.length; i < ii; i++) {
if (gradient.dots[i].offset) {
- colors.push(gradient.dots[i].offset + " " + gradient.dots[i].color);
+ colors.push(gradient.dots[i].offset + " " + getRGB(gradient.dots[i].color).hex);
}
};
- var fillOpacity = gradient.dots[0].opacity || 1;
- var fillOpacity2 = gradient.dots[gradient.dots.length - 1].opacity || 1;
- if (colors) {
+ 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;
+ if (colors.length) {
fill.colors.value = colors.join(",");
- fillOpacity2 += fillOpacity;
- fillOpacity = fillOpacity2 - fillOpacity;
- fillOpacity2 -= fillOpacity;
+ fillOpacity = typeof attrs.opacity == "undefined" ? 1 : attrs.opacity;
+ } else {
+ fill.colors.value = "0% " + fill.color;
}
- fill.setAttribute("opacity", fillOpacity);
- fill.setAttribute("opacity2", fillOpacity2);
- if (gradient.vector) {
- var angle = Math.round(Math.atan((parseFloat(gradient.vector[3], 10) - parseFloat(gradient.vector[1], 10)) / (parseFloat(gradient.vector[2], 10) - parseFloat(gradient.vector[0], 10))) * 57.29) || 0;
- fill.angle = 270 - angle;
+ fill.opacity = fillOpacity;
+ if (typeof gradient.angle != "undefined") {
+ fill.angle = (-gradient.angle + 270) % 360;
+ } else if (gradient.vector) {
+ fill.angle = getAngle.apply(null, gradient.vector);
}
- if (gradient.type.toLowerCase() == "radial") {
+ if ((gradient.type + "").toLowerCase() == "radial") {
fill.focus = "100%";
fill.focusposition = "0.5 0.5";
}
this._ = {
tx: 0,
ty: 0,
- rt: 0,
+ rt: {deg:0},
sx: 1,
sy: 1
};
};
- Element.prototype.rotate = function (deg, isAbsolute) {
- if (deg == undefined) {
- return this._.rt;
+ Element.prototype.rotate = function (deg, cx, cy) {
+ if (deg == null) {
+ return this._.rt.deg;
}
- if (isAbsolute) {
- this._.rt = deg;
+ deg = deg.toString().split(separator);
+ if (deg.length - 1) {
+ cx = parseFloat(deg[1]);
+ cy = parseFloat(deg[2]);
+ }
+ deg = parseFloat(deg[0]);
+ if (cx != null) {
+ this._.rt.deg = deg;
} else {
- this._.rt += deg;
+ this._.rt.deg += deg;
+ }
+ if (cy == null) {
+ cx = null;
}
- this.Group.style.rotation = this._.rt;
+ this._.rt.cx = cx;
+ this._.rt.cy = cy;
+ this.setBox(null, cx, cy);
+ this.Group.style.rotation = this._.rt.deg;
return this;
};
- Element.prototype.setBox = function (params) {
+ Element.prototype.setBox = function (params, cx, cy) {
var gs = this.Group.style,
os = (this.shape && this.shape.style) || this.node.style;
for (var i in params) {
this.attrs[i] = params[i];
}
+ cx = cx || this._.rt.cx;
+ cy = cy || this._.rt.cy;
var attr = this.attrs, x, y, w, h;
switch (this.type) {
- case "circle":
+ case "circle":
x = attr.cx - attr.r;
y = attr.cy - attr.r;
w = h = attr.r * 2;
w = this.vml.width;
h = this.vml.height;
} else {
- var dim = Raphael.pathDimensions(this.attrs.path),
+ var dim = pathDimensions(this.attrs.path),
x = dim.x;
y = dim.y;
w = dim.width;
h = this.vml.height;
break;
}
+ cx = (cx == null) ? x + w / 2 : cx;
+ cy = (cy == null) ? y + h / 2 : cy;
+ var left = cx - this.vml.width / 2,
+ top = cy - this.vml.height / 2;
if (this.type == "path" || this.type == "text") {
- var left = Math.round(this.vml.width / 2 - w / 2 - x),
- top = Math.round(this.vml.height / 2 - h / 2 - y);
- gs.left = - left + "px";
- gs.top = - top + "px";
- this.X = this.type == "text" ? x : left;
- this.Y = this.type == "text" ? y : top;
+ gs.left = left + "px";
+ gs.top = top + "px";
+ this.X = this.type == "text" ? x : -left;
+ this.Y = this.type == "text" ? y : -top;
this.W = w;
this.H = h;
- os.top = top + "px";
- os.left = left + "px";
+ os.left = -left + "px";
+ os.top = -top + "px";
} else {
- var left = this.vml.width / 2 - w / 2,
- top = this.vml.height / 2 - h / 2;
- gs.position = "absolute";
- gs.left = x - left + "px";
- gs.top = y - top + "px";
- this.X = x - left;
- this.Y = y - top;
+ gs.left = left + "px";
+ gs.top = top + "px";
+ this.X = x;
+ this.Y = y;
this.W = w;
this.H = h;
gs.width = this.vml.width + "px";
gs.height = this.vml.height + "px";
- os.position = "absolute";
- os.top = top + "px";
- os.left = left + "px";
+ os.left = x - left + "px";
+ os.top = y - top + "px";
os.width = w + "px";
os.height = h + "px";
+ if (this.type == "rect" && this.attrs.r != params.r) {
+ // We should recplace element with the new one
+ // this.node.arcsize = (params.r || 0) / (Math.min(w, h));
+ }
}
};
Element.prototype.hide = function () {
this.Group.style.display = "block";
return this;
};
- Element.prototype.translate = function (x, y) {
- if (x == undefined && y == undefined) {
- return {x: this._.tx, y: this._.ty};
- }
- this._.tx += +x;
- this._.ty += +y;
+ Element.prototype.getBBox = function () {
if (this.type == "path") {
- var path = this.attrs.path;
- path = Raphael.pathToRelative(path);
- path[0][1] += +x;
- path[0][2] += +y;
- this.attr({path: path.join(" ")});
+ return pathDimensions(this.attr("path"));
}
- this.setBox({x: this._.tx, y: this._.ty});
- return this;
- };
- Element.prototype.getBBox = function () {
return {
- x: this.X,
+ x: this.X + (this.bbx || 0),
y: this.Y,
width: this.W,
height: this.H
}
return this.attrs[arguments[0]];
}
- if (this.attrs && arguments.length == 1 && arguments[0] instanceof Array) {
+ if (this.attrs && arguments.length == 1 && arguments[0] instanceof win.Array) {
var values = {};
for (var i = 0, ii = arguments[0].length; i < ii; i++) {
values[arguments[0][i]] = this.attrs[arguments[0][i]];
};
return values;
}
- if (this[0].tagName.toLowerCase() == "group") {
- var children = this[0].childNodes;
- this.attrs = this.attrs || {};
- if (arguments.length == 2) {
- this.attrs[arguments[0]] = arguments[1];
- } else if (arguments.length == 1 || typeof arguments[0] == "object") {
- for (var j in arguments[0]) {
- this.attrs[j] = arguments[0][j];
- }
- }
- for (var i = 0, ii = children.length; i < ii; i++) {
- this.attr.apply(new item(children[i], this[0], this.vml), arguments);
- }
- } else {
- var params;
- if (arguments.length == 2) {
- params = {};
- params[arguments[0]] = arguments[1];
+ var params;
+ if (arguments.length == 2) {
+ params = {};
+ params[arguments[0]] = arguments[1];
+ }
+ if (arguments.length == 1 && typeof arguments[0] == "object") {
+ params = arguments[0];
+ }
+ if (params) {
+ if (params.gradient) {
+ addGrdientFill(this, params.gradient);
}
- if (arguments.length == 1 && typeof arguments[0] == "object") {
- params = arguments[0];
+ if (params.text && this.type == "text") {
+ this.node.string = params.text;
}
- if (params) {
- if (params.gradient) {
- addGrdientFill(this, params.gradient);
- }
- if (params.text && this.type == "text") {
- this.node.string = params.text;
- }
- if (params.id) {
- this.node.id = params.id;
- }
- setFillAndStroke(this, params);
- this.setBox(params);
+ if (params.id) {
+ this.node.id = params.id;
}
+ setFillAndStroke(this, params);
+ this.setBox(params);
}
return this;
};
element.Group.parentNode.insertBefore(this.Group, element.Group);
return this;
};
- theCircle = function (vml, x, y, r) {
- var g = document.createElement("rvml:group");
- var o = document.createElement("rvml:oval");
+ var theCircle = function (vml, x, y, r) {
+ var g = createNode("group");
+ var o = createNode("oval");
g.appendChild(o);
vml.canvas.appendChild(g);
var res = new Element(o, g, vml);
res.type = "circle";
setFillAndStroke(res, {stroke: "#000", fill: "none"});
- res.setBox({x: x - r, y: y - r, width: r * 2, height: r * 2});
res.attrs.cx = x;
res.attrs.cy = y;
res.attrs.r = r;
+ res.setBox({x: x - r, y: y - r, width: r * 2, height: r * 2});
return res;
};
- theRect = function (vml, x, y, w, h, r) {
- var g = document.createElement("rvml:group");
- var o = document.createElement(r ? "rvml:roundrect" : "rvml:rect");
- if (r) {
- o.arcsize = r / (Math.min(w, h));
- }
+ var theRect = function (vml, x, y, w, h, r) {
+ var g = createNode("group");
+ var o = createNode("roundrect");
+ o.arcsize = (+r || 0) / (Math.min(w, h));
g.appendChild(o);
vml.canvas.appendChild(g);
var res = new Element(o, g, vml);
res.type = "rect";
setFillAndStroke(res, {stroke: "#000"});
- res.setBox({x: x, y: y, width: w, height: h});
res.attrs.x = x;
res.attrs.y = y;
res.attrs.w = w;
res.attrs.h = h;
res.attrs.r = r;
+ res.setBox({x: x, y: y, width: w, height: h});
return res;
};
- theEllipse = function (vml, x, y, rx, ry) {
- var g = document.createElement("rvml:group");
- var o = document.createElement("rvml:oval");
+ var theEllipse = function (vml, x, y, rx, ry) {
+ var g = createNode("group");
+ var o = createNode("oval");
g.appendChild(o);
vml.canvas.appendChild(g);
var res = new Element(o, g, vml);
res.type = "ellipse";
setFillAndStroke(res, {stroke: "#000"});
- res.setBox({x: x - rx, y: y - ry, width: rx * 2, height: ry * 2});
res.attrs.cx = x;
res.attrs.cy = y;
res.attrs.rx = rx;
res.attrs.ry = ry;
+ res.setBox({x: x - rx, y: y - ry, width: rx * 2, height: ry * 2});
return res;
};
- theImage = function (vml, src, x, y, w, h) {
- var g = document.createElement("rvml:group");
- var o = document.createElement("rvml:image");
+ var theImage = function (vml, src, x, y, w, h) {
+ var g = createNode("group");
+ var o = createNode("image");
o.src = src;
g.appendChild(o);
vml.canvas.appendChild(g);
var res = new Element(o, g, vml);
res.type = "image";
- res.setBox({x: x, y: y, width: w, height: h});
res.attrs.x = x;
res.attrs.y = y;
res.attrs.w = w;
res.attrs.h = h;
+ res.setBox({x: x, y: y, width: w, height: h});
return res;
};
- theText = function (vml, x, y, text) {
- var g = document.createElement("rvml:group"), gs = g.style;
- var el = document.createElement("rvml:shape"), ol = el.style;
- var path = document.createElement("rvml:path"), ps = path.style;
+ var theText = function (vml, x, y, text) {
+ var g = createNode("group"), gs = g.style;
+ var el = createNode("shape"), ol = el.style;
+ var path = createNode("path"), ps = path.style;
path.v = ["m", Math.round(x), ", ", Math.round(y - 2), "l", Math.round(x) + 1, ", ", Math.round(y - 2)].join("");
path.textpathok = true;
ol.width = vml.width;
gs.top = 0;
gs.width = vml.width;
gs.height = vml.height;
- var o = document.createElement("rvml:textpath");
+ var o = createNode("textpath");
o.string = text;
o.on = true;
o.coordsize = vml.coordsize;
res.attrs.y = y;
res.attrs.w = 1;
res.attrs.h = 1;
- setFillAndStroke(res, {font: '10px "Arial"', stroke: "none", fill: "#000"});
+ setFillAndStroke(res, {font: availableAttrs.font, stroke: "none", fill: "#000"});
+ res.setBox();
return res;
};
- theGroup = function (vml) {
+ var setSize = function (width, height) {
+ this.width = width || this.width;
+ this.height = height || this.height;
+ this.canvas.style.width = this.width + "px";
+ this.canvas.style.height = this.height + "px";
+ this.canvas.parentNode.style.clip = "rect(0 " + this.width + "px " + this.height + "px 0)";
+ this.canvas.coordsize = this.width + " " + this.height;
return this;
};
- R._create = function () {
- // container, width, height
- // x, y, width, height
- var container, width, height;
- if (typeof arguments[0] == "string") {
- container = document.getElementById(arguments[0]);
- width = arguments[1];
- height = arguments[2];
- }
- if (typeof arguments[0] == "object") {
- container = arguments[0];
- width = arguments[1];
- height = arguments[2];
- }
- if (typeof arguments[0] == "number") {
- container = 1;
- x = arguments[0];
- y = arguments[1];
- width = arguments[2];
- height = arguments[3];
+ doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
+ try {
+ if (!doc.namespaces.rvml) {
+ doc.namespaces.add("rvml","urn:schemas-microsoft-com:vml");
}
+ var createNode = function (tagName) {
+ return doc.createElement('<rvml:' + tagName + ' class="rvml">');
+ };
+ } catch (e) {
+ var createNode = function (tagName) {
+ return doc.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
+ };
+ }
+ var create = function () {
+ var con = getContainer.apply(null, arguments);
+ var container = con.container,
+ x = con.x,
+ y = con.y,
+ width = con.width,
+ height = con.height;
if (!container) {
throw new Error("VML container not found.");
}
- if (!document.namespaces["rvml"]) {
- document.namespaces.add("rvml","urn:schemas-microsoft-com:vml");
- document.createStyleSheet().addRule("rvml\\:*", "behavior:url(#default#VML)");
- }
- var c = document.createElement("div"),
- d = document.createElement("div"),
- r = paper.canvas = document.createElement("rvml:group"),
+ var c = doc.createElement("div"),
+ d = doc.createElement("div"),
+ r = paper.canvas = createNode("group"),
cs = c.style, rs = r.style;
paper.width = width;
paper.height = height;
width = width || "320px";
height = height || "200px";
- cs.clip = "rect(0 " + width + " " + height + " 0)";
+ cs.clip = "rect(0 " + width + "px " + height + "px 0)";
cs.top = "-2px";
cs.left = "-2px";
cs.position = "absolute";
d.style.position = "relative";
rs.width = width;
rs.height = height;
- r.coordsize = (width == "100%" ? width : parseFloat(width)) + " " + (height == "100%" ? height : parseFloat(height));
+ r.coordsize = (/%$/.test(width) ? width : parseFloat(width)) + " " + (/%$/.test(height) ? height : parseFloat(height));
r.coordorigin = "0 0";
- var b = document.createElement("rvml:rect"), bs = b.style;
+ var b = createNode("rect"), bs = b.style;
bs.left = bs.top = 0;
bs.width = rs.width;
bs.height = rs.height;
c.appendChild(r);
d.appendChild(c);
if (container == 1) {
- document.body.appendChild(d);
+ doc.body.appendChild(d);
cs.position = "absolute";
cs.left = x + "px";
cs.top = y + "px";
for (var prop in paper) {
container[prop] = paper[prop];
}
- for (var prop in R.fn) {
- if (!container[prop]) {
- container[prop] = R.fn[prop];
- }
- }
+ plugins(container, container, R.fn);
container.clear = function () {
var todel = [];
for (var i = 0, ii = r.childNodes.length; i < ii; i++) {
// Events
var addEvent = (function () {
- if (document.addEventListener) {
- return function (obj, type, fn) {
- obj.addEventListener(type, fn, false);
+ if (doc.addEventListener) {
+ return function (obj, type, fn, element) {
+ var f = function (e) {
+ return fn.call(element, e);
+ };
+ obj.addEventListener(type, f, false);
+ return function () {
+ obj.removeEventListener(type, f, false);
+ return true;
+ };
};
- } else if (document.attachEvent) {
- return function (obj, type, fn) {
+ } else if (doc.attachEvent) {
+ return function (obj, type, fn, element) {
var f = function (e) {
- fn.call(this, e || window.event);
+ return fn.call(element, e || win.event);
};
obj.attachEvent("on" + type, f);
+ var detacher = function () {
+ obj.detachEvent("on" + type, f);
+ return true;
+ };
+ if (type == "mouseover") {
+ obj.attachEvent("onmouseenter", f);
+ return function () {
+ obj.detachEvent("onmouseenter", f);
+ return detacher();
+ };
+ } else if (type == "mouseout") {
+ obj.attachEvent("onmouseleave", f);
+ return function () {
+ obj.detachEvent("onmouseleave", f);
+ return detacher();
+ };
+ }
+ return detacher;
};
}
})();
- var events = ["click", "dblclick", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup"];
for (var i = events.length; i--;) {
(function (eventName) {
Element.prototype[eventName] = function (fn) {
- addEvent(this.node, eventName, fn);
- return this;
- };
- })(events[i]);
- }
-
- // Set
- var Set = function (itemsArray) {
- this.items = [];
- if (itemsArray && itemsArray.constructor == Array) {
- for (var i = itemsArray.length; i--;) {
- if (itemsArray[i].constructor == Element) {
- this.items[this.items.length] = itemsArray[i];
- }
- }
- }
- };
- Set.prototype.add = function (item) {
- if (item && item.constructor == Element) {
- this.items[this.items.length] = item;
- }
- return this;
- };
- Set.prototype.remove = function (item) {
- if (item && item.constructor == Element) {
- for (var i = this.items.length; i--;) {
- if (this.items[i] == item) {
- this.items.splice(i, 1);
- return this;
- }
- }
- }
- return this;
- };
- for (var method in Element.prototype) {
- Set.prototype[method] = (function (methodname) {
- return function () {
- for (var i = this.items.length; i--;) {
- this.items[i][methodname].apply(this.items[i], arguments);
+ if (typeof fn == "function") {
+ this.events = this.events || {};
+ this.events[eventName] = this.events[eventName] || {};
+ this.events[eventName][fn] = this.events[eventName][fn] || [];
+ this.events[eventName][fn].push(addEvent(this.shape || this.node, eventName, fn, this));
}
return this;
};
- })(method);
- }
- Set.prototype.getBBox = function () {
- var x = [], y = [], w = [], h = [];
- for (var i = this.items.length; i--;) {
- var box = this.items[i].getBBox();
- x.push(box.x);
- y.push(box.y);
- w.push(box.x + box.width);
- h.push(box.y + box.height);
- }
- x = Math.min(x);
- y = Math.min(y);
- return {
- x: x,
- y: y,
- w: Math.max(w) - x,
- h: Math.max(h) - y
- };
- };
+ Element.prototype["un" + eventName] = function (fn) {
+ this.events &&
+ this.events[eventName] &&
+ this.events[eventName][fn] &&
+ this.events[eventName][fn].length &&
+ this.events[eventName][fn].shift()() &&
+ !this.events[eventName][fn].length &&
+ delete this.events[eventName][fn];
+ };
+ })(events[i]);
+ }
paper.circle = function (x, y, r) {
return theCircle(this, x, y, r);
};
};
paper.drawGrid = function (x, y, w, h, wv, hv, color) {
color = color || "#000";
- var p = this.path({stroke: color, "stroke-width": 1})
- .moveTo(x, y).lineTo(x + w, y).lineTo(x + w, y + h).lineTo(x, y + h).lineTo(x, y),
+ 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++) {
- p.moveTo(x, y + i * rowHeight).lineTo(x + w, y + i * rowHeight);
+ path = path.concat(["M", x, y + i * rowHeight, "L", x + w, y + i * rowHeight]);
}
for (var i = 1; i < wv; i++) {
- p.moveTo(x + i * columnWidth, y).lineTo(x + i * columnWidth, y + h);
+ path = path.concat(["M", x + i * columnWidth, y, "L", x + i * columnWidth, y + h]);
}
- return p;
+ return this.path({stroke: color, "stroke-width": 1}, path.join(","));
};
paper.pathfinder = function (p, path) {
var commands = {
}
};
- path = Raphael.pathToAbsolute(path);
+ path = pathToAbsolute(path);
for (var i = 0, ii = path.length; i < ii; i++) {
var b = path[i].shift();
commands[b].apply(p, path[i]);
paper.set = function (itemsArray) {
return new Set(itemsArray);
};
+ paper.setSize = setSize;
Element.prototype.stop = function () {
clearTimeout(this.animation_in_progress);
};
- Element.prototype.scale = function (x, y) {
- if (x == undefined && y == undefined) {
+ Element.prototype.scale = function (x, y, cx, cy) {
+ if (x == null && y == null) {
return {x: this._.sx, y: this._.sy};
}
y = y || x;
- var dx, dy, cx, cy;
- if (x != 0 && !(x == 1 && y == 1)) {
+ !+y && (y = x);
+ var dx, dy, dcx, dcy;
+ if (x != 0) {
+ var bb = this.getBBox(),
+ rcx = bb.x + bb.width / 2,
+ rcy = bb.y + bb.height / 2;
+ cx = cx || rcx;
+ cy = cy || rcy;
var dirx = Math.round(x / Math.abs(x)),
diry = Math.round(y / Math.abs(y)),
- s = this.node.style;
+ s = this.node.style,
+ ncx = cx + (rcx - cx) * x * dirx / this._.sx,
+ ncy = cy + (rcy - cy) * y * diry / this._.sy;
dx = this.attr("x");
dy = this.attr("y");
- cx = this.attr("cx");
- cy = this.attr("cy");
+ dcx = this.attr("cx");
+ dcy = this.attr("cy");
if (dirx != 1 || diry != 1) {
if (this.transformations) {
this.transformations[2] = "scale(" + [dirx, diry] + ")";
this.node.setAttribute("transform", this.transformations.join(" "));
dx = (dirx < 0) ? -this.attr("x") - this.attrs.width * x * dirx / this._.sx : this.attr("x");
dy = (diry < 0) ? -this.attr("y") - this.attrs.height * y * diry / this._.sy : this.attr("y");
- cx = this.attr("cx") * dirx;
- cy = this.attr("cy") * diry;
+ dcx = this.attr("cx") * dirx;
+ dcy = this.attr("cy") * diry;
} else {
this.node.filterMatrix = " progid:DXImageTransform.Microsoft.Matrix(M11=" + dirx +
", M12=0, M21=0, M22=" + diry +
switch (this.type) {
case "rect":
case "image":
+ var neww = this.attrs.width * x * dirx / this._.sx,
+ newh = this.attrs.height * y * diry / this._.sy,
+ newx = ncx - neww / 2,
+ newy = ncy - newh / 2;
this.attr({
- width: this.attrs.width * x * dirx / this._.sx,
- height: this.attrs.height * y * diry / this._.sy,
- x: dx,
- y: dy
+ width: neww,
+ height: newh,
+ x: newx,
+ y: newy
});
break;
case "circle":
this.attr({
rx: this.attrs.rx * x * dirx / this._.sx,
ry: this.attrs.ry * y * diry / this._.sy,
- r: this.attrs.r * x * diry / this._.sx,
- cx: cx,
- cy: cy
+ r: this.attrs.r * x * dirx / this._.sx,
+ cx: ncx,
+ cy: ncy
});
break;
case "path":
- var path = Raphael.pathToRelative(Raphael.parsePathString(this.attr("path"))),
- skip = true,
- dim = Raphael.pathDimensions(this.attrs.path),
- dx = -dim.width * (x - 1) / 2,
- dy = -dim.height * (y - 1) / 2;
+ var path = pathToRelative(R.parsePathString(this.attr("path"))),
+ skip = true;
for (var i = 0, ii = path.length; i < ii; i++) {
if (path[i][0].toUpperCase() == "M" && skip) {
continue;
} else {
skip = false;
}
- if (path[i][0].toUpperCase() == "A") {
+ if (this.svg && path[i][0].toUpperCase() == "A") {
path[i][path[i].length - 2] *= x * dirx;
path[i][path[i].length - 1] *= y * diry;
+ path[i][1] *= x;
+ path[i][2] *= y;
} else {
for (var j = 1, jj = path[i].length; j < jj; j++) {
path[i][j] *= (j % 2) ? x * dirx / this._.sx : y * diry / this._.sy;
}
}
}
- var dim2 = Raphael.pathDimensions(path),
- dx = dim.x + dim.width / 2 - dim2.x - dim2.width / 2,
- dy = dim.y + dim.height / 2 - dim2.y - dim2.height / 2;
- path = Raphael.pathToRelative(path);
+ var dim2 = pathDimensions(path),
+ dx = ncx - dim2.x - dim2.width / 2,
+ dy = ncy - dim2.y - dim2.height / 2;
+ path = pathToRelative(path);
path[0][1] += dx;
path[0][2] += dy;
};
Element.prototype.animate = function (params, ms, callback) {
clearTimeout(this.animation_in_progress);
- var from = {}, to = {}, diff = {}, t = {x: 0, y: 0};
+ var from = {},
+ to = {},
+ diff = {},
+ t = {x: 0, y: 0};
for (var attr in params) {
if (attr in availableAnimAttrs) {
from[attr] = this.attr(attr);
diff[attr] = (to[attr] - from[attr]) / ms;
break;
case "colour":
- from[attr] = Raphael.getRGB(from[attr]);
- var toColour = Raphael.getRGB(to[attr]);
+ from[attr] = getRGB(from[attr]);
+ var toColour = getRGB(to[attr]);
diff[attr] = {
r: (toColour.r - from[attr].r) / ms,
g: (toColour.g - from[attr].g) / ms,
};
break;
case "path":
- var pathes = Raphael.pathEqualiser(from[attr], to[attr]);
+ var pathes = pathEqualiser(from[attr], to[attr]);
from[attr] = pathes[0];
to[attr] = pathes[1];
diff[attr] = [];
}
break;
case "csv":
- var values = params[attr].split(/[, ]+/);
+ var values = params[attr].toString().split(separator),
+ from2 = from[attr].toString().split(separator);
if (attr == "translation") {
from[attr] = [0, 0];
diff[attr] = [values[0] / ms, values[1] / ms];
+ } else if (attr == "rotation") {
+ from[attr] = (from2[1] == values[1] && from2[2] == values[2]) ? from2 : [0, values[1], values[2]];
+ diff[attr] = [(values[0] - from[attr][0]) / ms, 0, 0];
} else {
- from[attr] = from[attr].split(/[, ]+/);
+ from[attr] = (from[attr] + "").split(separator);
diff[attr] = [(values[0] - from[attr][0]) / ms, (values[1] - from[attr][0]) / ms];
}
to[attr] = values;
}
}
}
- var start = new Date(),
+ var start = +new Date,
prev = 0,
that = this;
(function () {
- var time = (new Date()).getTime() - start.getTime(),
+ var time = +new Date - start,
set = {},
now;
if (time < ms) {
t.x += x;
t.y += y;
now = [x, y].join(" ");
+ } else if (attr == "rotation") {
+ now = +from[attr][0] + time * diff[attr][0];
+ from[attr][1] && (now += "," + from[attr][1] + "," + from[attr][2]);
} else {
now = [+from[attr][0] + time * diff[attr][0], +from[attr][1] + time * diff[attr][1]].join(" ");
}
that.animation_in_progress = setTimeout(arguments.callee, 0);
paper.safari();
} else {
- if (t.x || t.y) {
- that.translate(-t.x, -t.y);
- }
+ (t.x || t.y) && that.translate(-t.x, -t.y);
that.attr(params);
clearTimeout(that.animation_in_progress);
paper.safari();
})();
return this;
};
+ Element.prototype.translate = function (x, y) {
+ if (x == null) {
+ return {x: this._.tx, y: this._.ty};
+ }
+ this._.tx += +x;
+ this._.ty += +y;
+ switch (this.type) {
+ case "circle":
+ case "ellipse":
+ this.attr({cx: this.attrs.cx + x, cy: this.attrs.cy + y});
+ break;
+ case "rect":
+ case "image":
+ case "text":
+ this.attr({x: this.attrs.x + (+x), y: this.attrs.y + (+y)});
+ break;
+ case "path":
+ var path = pathToRelative(this.attrs.path);
+ path[0][1] += +x;
+ path[0][2] += +y;
+ this.attr({path: path.join(" ")});
+ break;
+ }
+ return this;
+ };
+ // Set
+ var Set = function (itemsArray) {
+ this.items = [];
+ this.length = (itemsArray && itemsArray.length) || 0;
+ if (itemsArray && itemsArray.constructor == Array) {
+ for (var i = itemsArray.length; i--;) {
+ if (itemsArray[i].constructor == Element) {
+ this.items[this.items.length] = itemsArray[i];
+ }
+ }
+ }
+ };
+ Set.prototype.push = function (item) {
+ if (item && item.constructor == Element) {
+ var len = this.items.length;
+ this.items[len] = item;
+ this[len] = item;
+ this.length++;
+ }
+ return this;
+ };
+ Set.prototype.pull = 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;
+ };
+ for (var method in Element.prototype) {
+ Set.prototype[method] = (function (methodname) {
+ return function () {
+ for (var i = this.items.length; i--;) {
+ this.items[i][methodname].apply(this.items[i], arguments);
+ }
+ return this;
+ };
+ })(method);
+ }
+ Set.prototype.getBBox = function () {
+ var x = [], y = [], w = [], h = [];
+ for (var i = this.items.length; i--;) {
+ var box = this.items[i].getBBox();
+ x.push(box.x);
+ y.push(box.y);
+ w.push(box.x + box.width);
+ h.push(box.y + box.height);
+ }
+ x = Math.min.apply(Math, x);
+ y = Math.min.apply(Math, y);
+ return {
+ x: x,
+ y: y,
+ width: Math.max.apply(Math, w) - x,
+ height: Math.max.apply(Math, h) - y
+ };
+ };
-
-})(Raphael);
\ No newline at end of file
+ R.noConflict = function () {
+ var r = window.Raphael;
+ delete window.Raphael;
+ if (oldRaphael.was) {
+ window.Raphael = oldRaphael.is;
+ }
+ return r;
+ };
+ return R;
+})();
\ No newline at end of file
projects / raphael / blobdiff