/*!
- * Raphael 1.3.0dev - JavaScript Vector Library
+ * Raphael 1.3.2 - JavaScript Vector Library
*
- * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
+ * Copyright (c) 2009 Dmitry Baranovskiy (http://raphaeljs.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
*/
-
-window.Raphael = (function () {
+Raphael = (function () {
var separator = /[, ]+/,
elements = /^(circle|rect|path|ellipse|text|image)$/,
+ proto = "prototype",
+ has = "hasOwnProperty",
doc = document,
win = window,
oldRaphael = {
- was: "Raphael" in win,
+ was: Object[proto][has].call(win, "Raphael"),
is: win.Raphael
},
R = function () {
S = " ",
split = "split",
events = "click dblclick mousedown mousemove mouseout mouseover mouseup"[split](S),
- has = "hasOwnProperty",
join = "join",
length = "length",
- proto = "prototype",
lowerCase = String[proto].toLowerCase,
math = Math,
mmax = math.max,
pow = math.pow,
push = "push",
rg = /^(?=[\da-f]$)/,
- ISURL = /^url\(['"]?([^\)]+)['"]?\)$/i,
+ ISURL = /^url\(['"]?([^\)]+?)['"]?\)$/i,
colourRegExp = /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hs[bl]\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hs[bl]\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i,
round = math.round,
setAttribute = "setAttribute",
toFloat = parseFloat,
toInt = parseInt,
upperCase = String[proto].toUpperCase,
- availableAttrs = {"clip-rect": "0 0 10e9 10e9", cursor: "default", 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 = {along: "along", "clip-rect": "csv", cx: nu, cy: nu, fill: "colour", "fill-opacity": nu, "font-size": nu, height: nu, opacity: nu, path: "path", r: nu, rotation: "csv", rx: nu, ry: nu, scale: "csv", stroke: "colour", "stroke-opacity": nu, "stroke-width": nu, translation: "csv", width: nu, x: nu, y: nu},
+ availableAttrs = {blur: 0, "clip-rect": "0 0 1e9 1e9", cursor: "default", 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 = {along: "along", blur: nu, "clip-rect": "csv", cx: nu, cy: nu, fill: "colour", "fill-opacity": nu, "font-size": nu, height: nu, opacity: nu, path: "path", r: nu, rotation: "csv", rx: nu, ry: nu, scale: "csv", stroke: "colour", "stroke-opacity": nu, "stroke-width": nu, translation: "csv", width: nu, x: nu, y: nu},
rp = "replace";
- R.version = "1.3.0dev";
+ R.version = "1.3.2";
R.type = (win.SVGAngle || doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
if (R.type == "VML") {
- var d = document.createElement("div");
+ var d = doc.createElement("div");
d.innerHTML = '<!--[if vml]><br><br><![endif]-->';
if (d.childNodes[length] != 2) {
- return null;
+ return R.type = null;
}
+ d = null;
}
R.svg = !(R.vml = R.type == "VML");
Paper[proto] = R[proto];
var bod;
color = (color + E)[rp](trim, E);
try {
- var docum = new ActiveXObject("htmlfile");
+ var docum = new win.ActiveXObject("htmlfile");
docum.write("<body>");
docum.close();
bod = docum.body;
} catch(e) {
- bod = createPopup().document.body;
+ bod = win.createPopup().document.body;
}
var range = bod.createTextRange();
try {
}
return toHex(color);
};
+ var hsbtoString = function () {
+ return "hsb(" + [this.h, this.s, this.b] + ")";
+ },
+ rgbtoString = function () {
+ return this.hex;
+ };
R.hsb2rgb = cacher(function (hue, saturation, brightness) {
if (R.is(hue, "object") && "h" in hue && "s" in hue && "b" in hue) {
brightness = hue.b;
red *= 255;
green *= 255;
blue *= 255;
- var rgb = {r: red, g: green, b: blue},
+ var rgb = {r: red, g: green, b: blue, toString: rgbtoString},
r = (~~red)[toString](16),
g = (~~green)[toString](16),
b = (~~blue)[toString](16);
hue < 0 && hue++;
hue > 1 && hue--;
}
- return {h: hue, s: saturation, b: brightness};
+ return {h: hue, s: saturation, b: brightness, toString: hsbtoString};
}, R);
var p2s = /,?([achlmqrstvxz]),?/gi;
R._path2string = function () {
delete this.start;
};
// path utilities
+ var pathCommand = /([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,
+ pathValues = /(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig;
R.parsePathString = cacher(function (pathString) {
if (!pathString) {
return null;
data = pathClone(pathString);
}
if (!data[length]) {
- (pathString + E)[rp](/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig, function (a, b, c) {
+ (pathString + E)[rp](pathCommand, function (a, b, c) {
var params = [],
name = lowerCase.call(b);
- c[rp](/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig, function (a, b) {
+ c[rp](pathValues, function (a, b) {
b && params[push](+b);
});
+ if (name == "m" && params[length] > 2) {
+ data[push]([b][concat](params.splice(0, 2)));
+ name = "l";
+ b = b == "m" ? "l" : "L";
+ }
while (params[length] >= paramCounts[name]) {
data[push]([b][concat](params.splice(0, paramCounts[name])));
if (!paramCounts[name]) {
break;
- };
+ }
}
});
}
sin = math.sin(PI / 180 * angle),
x = (x1 - x2) / 2,
y = (y1 - y2) / 2;
- rx = mmax(rx, math.abs(x));
- ry = mmax(ry, math.abs(y));
+ // rx = mmax(rx, math.abs(x));
+ // ry = mmax(ry, math.abs(y));
+ var h = (x * x) / (rx * rx) + (y * y) / (ry * ry);
+ if (h > 1) {
+ h = math.sqrt(h);
+ rx = h * rx;
+ ry = h * ry;
+ }
var rx2 = rx * rx,
ry2 = ry * ry,
k = (large_arc_flag == sweep_flag ? -1 : 1) *
cy = k * -ry * x / rx + (y1 + y2) / 2,
f1 = math.asin(((y1 - cy) / ry).toFixed(7)),
f2 = math.asin(((y2 - cy) / ry).toFixed(7));
-
+
f1 = x1 < cx ? PI - f1 : f1;
f2 = x2 < cx ? PI - f2 : f2;
f1 < 0 && (f1 = PI * 2 + f1);
for (var i = 0, ii = res[length]; i < ii; i++) {
newres[i] = i % 2 ? rotate(res[i - 1], res[i], rad).y : rotate(res[i], res[i + 1], rad).x;
}
+ // alert(newres);
return newres;
}
},
par[2] && (dot.offset = par[2] + "%");
dots[push](dot);
}
- for (var i = 1, ii = dots[length] - 1; i < ii; i++) {
+ for (i = 1, ii = dots[length] - 1; i < ii; i++) {
if (!dots[i].offset) {
var start = toFloat(dots[i - 1].offset || 0),
end = 0;
}
return dots;
}),
- getContainer = function () {
- var container,
- x,
- y,
- width,
- height;
- if (R.is(arguments[0], "string") || R.is(arguments[0], "object")) {
- if (R.is(arguments[0], "string")) {
- container = doc.getElementById(arguments[0]);
- } else {
- container = arguments[0];
- }
+ getContainer = function (x, y, w, h) {
+ var container;
+ if (R.is(x, "string") || R.is(x, "object")) {
+ container = R.is(x, "string") ? doc.getElementById(x) : x;
if (container.tagName) {
- if (arguments[1] == null) {
+ if (y == 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]};
+ return {container: container, width: y, height: w};
}
}
- } else if (R.is(arguments[0], nu) && arguments[length] > 3) {
- return {container: 1, x: arguments[0], y: arguments[1], width: arguments[2], height: arguments[3]};
+ } else if (R.is(x, nu) && h != null) {
+ return {container: 1, x: x, y: y, width: w, height: h};
}
},
plugins = function (con, add) {
var that = this;
- for (var prop in add) if (add[has](prop) && !(prop in con)) {
- switch (typeof add[prop]) {
- case "function":
- (function (f) {
- con[prop] = con === that ? f : function () { return f[apply](that, arguments); };
- })(add[prop]);
- break;
- case "object":
- con[prop] = con[prop] || {};
- plugins.call(this, con[prop], add[prop]);
- break;
- default:
- con[prop] = add[prop];
- break;
+ for (var prop in add) {
+ if (add[has](prop) && !(prop in con)) {
+ switch (typeof add[prop]) {
+ case "function":
+ (function (f) {
+ con[prop] = con === that ? f : function () { return f[apply](that, arguments); };
+ })(add[prop]);
+ break;
+ case "object":
+ con[prop] = con[prop] || {};
+ plugins.call(this, con[prop], add[prop]);
+ break;
+ default:
+ con[prop] = add[prop];
+ break;
+ }
}
}
},
if (R.svg) {
Paper[proto].svgns = "http://www.w3.org/2000/svg";
Paper[proto].xlink = "http://www.w3.org/1999/xlink";
- var round = function (num) {
+ round = function (num) {
return +num + (~~num === num) * .5;
- },
- roundPath = function (path) {
- for (var i = 0, ii = path[length]; i < ii; i++) {
- if (lowerCase.call(path[i][0]) != "a") {
- for (var j = 1, jj = path[i][length]; j < jj; j++) {
- path[i][j] = round(path[i][j]);
- }
- } else {
- path[i][6] = round(path[i][6]);
- path[i][7] = round(path[i][7]);
+ };
+ var roundPath = function (path) {
+ for (var i = 0, ii = path[length]; i < ii; i++) {
+ if (lowerCase.call(path[i][0]) != "a") {
+ for (var j = 1, jj = path[i][length]; j < jj; j++) {
+ path[i][j] = round(path[i][j]);
}
+ } else {
+ path[i][6] = round(path[i][6]);
+ path[i][7] = round(path[i][7]);
}
- return path;
- },
- $ = function (el, attr) {
- if (attr) {
- for (var key in attr) if (attr[has](key)) {
- el[setAttribute](key, attr[key]);
+ }
+ return path;
+ },
+ $ = function (el, attr) {
+ if (attr) {
+ for (var key in attr) {
+ if (attr[has](key)) {
+ el[setAttribute](key, attr[key] + E);
}
- } else {
- return doc.createElementNS(Paper[proto].svgns, el);
}
- };
+ } else {
+ return doc.createElementNS(Paper[proto].svgns, el);
+ }
+ };
R[toString] = function () {
return "Your browser supports SVG.\nYou are running Rapha\xebl " + this.version;
};
if (!dots) {
return null;
}
+ var id = o.getAttribute("fill");
+ id = id.match(/^url\(#(.*)\)$/);
+ id && SVG.defs.removeChild(doc.getElementById(id[1]));
+
var el = $(type + "Gradient");
el.id = "r" + (R._id++)[toString](36);
$(el, type == "radial" ? {fx: fx, fy: fy} : {x1: vector[0], y1: vector[1], x2: vector[2], y2: vector[3]});
"stop-color": dots[i].color || "#fff"
});
el[appendChild](stop);
- };
+ }
$(o, {
fill: "url(#" + el.id + ")",
opacity: 1,
rotxy[2] = +rotxy[2];
}
toFloat(rot) && o.rotate(0, true);
- for (var att in params) if (params[has](att)) {
- if (!availableAttrs[has](att)) {
- continue;
- }
- var value = params[att];
- attrs[att] = value;
- switch (att) {
- case "rotation":
- o.rotate(value, true);
- break;
- // Hyperlink
- case "href":
- case "title":
- case "target":
- var pn = node.parentNode;
- if (lowerCase.call(pn.tagName) != "a") {
- var hl = $("a");
- pn.insertBefore(hl, node);
- hl[appendChild](node);
- pn = hl;
- }
- pn.setAttributeNS(o.Paper[proto].xlink, att, value);
- break;
- case "cursor":
- node.style.cursor = value;
- break;
- case "clip-rect":
- var rect = (value + E)[split](separator);
- if (rect[length] == 4) {
- o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
- var el = $("clipPath"),
- rc = $("rect");
- el.id = "r" + (R._id++)[toString](36);
- $(rc, {
- x: rect[0],
- y: rect[1],
- width: rect[2],
- height: rect[3]
- });
- el[appendChild](rc);
- o.paper.defs[appendChild](el);
- $(node, {"clip-path": "url(#" + el.id + ")"});
- o.clip = rc;
- }
- if (!value) {
- var clip = doc.getElementById(node.getAttribute("clip-path")[rp](/(^url\(#|\)$)/g, E));
- clip && clip.parentNode.removeChild(clip);
- $(node, {"clip-path": E});
- delete o.clip;
- }
- break;
- case "path":
- if (value && o.type == "path") {
- attrs.path = roundPath(pathToAbsolute(value));
- $(node, {d: attrs.path});
- }
- break;
- case "width":
- node[setAttribute](att, value);
- if (attrs.fx) {
- att = "x";
- value = attrs.x;
- } else {
+ for (var att in params) {
+ if (params[has](att)) {
+ if (!availableAttrs[has](att)) {
+ continue;
+ }
+ var value = params[att];
+ attrs[att] = value;
+ switch (att) {
+ case "blur":
+ o.blur(value);
break;
- }
- case "x":
- if (attrs.fx) {
- value = -attrs.x - (attrs.width || 0);
- }
- case "rx":
- if (att == "rx" && o.type == "rect") {
+ case "rotation":
+ o.rotate(value, true);
break;
- }
- case "cx":
- rotxy && (att == "x" || att == "cx") && (rotxy[1] += value - attrs[att]);
- node[setAttribute](att, round(value));
- o.pattern && updatePosition(o);
- break;
- case "height":
- node[setAttribute](att, value);
- if (attrs.fy) {
- att = "y";
- value = attrs.y;
- } else {
+ // Hyperlink
+ case "href":
+ case "title":
+ case "target":
+ var pn = node.parentNode;
+ if (lowerCase.call(pn.tagName) != "a") {
+ var hl = $("a");
+ pn.insertBefore(hl, node);
+ hl[appendChild](node);
+ pn = hl;
+ }
+ pn.setAttributeNS(o.paper.xlink, att, value);
break;
- }
- case "y":
- if (attrs.fy) {
- value = -attrs.y - (attrs.height || 0);
- }
- case "ry":
- if (att == "ry" && o.type == "rect") {
+ case "cursor":
+ node.style.cursor = value;
break;
- }
- case "cy":
- rotxy && (att == "y" || att == "cy") && (rotxy[2] += value - attrs[att]);
- node[setAttribute](att, round(value));
- o.pattern && updatePosition(o);
+ case "clip-rect":
+ var rect = (value + E)[split](separator);
+ if (rect[length] == 4) {
+ o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
+ var el = $("clipPath"),
+ rc = $("rect");
+ el.id = "r" + (R._id++)[toString](36);
+ $(rc, {
+ x: rect[0],
+ y: rect[1],
+ width: rect[2],
+ height: rect[3]
+ });
+ el[appendChild](rc);
+ o.paper.defs[appendChild](el);
+ $(node, {"clip-path": "url(#" + el.id + ")"});
+ o.clip = rc;
+ }
+ if (!value) {
+ var clip = doc.getElementById(node.getAttribute("clip-path")[rp](/(^url\(#|\)$)/g, E));
+ clip && clip.parentNode.removeChild(clip);
+ $(node, {"clip-path": E});
+ delete o.clip;
+ }
break;
- case "r":
- if (o.type == "rect") {
- $(node, {rx: value, ry: value});
- } else {
+ case "path":
+ if (o.type == "path") {
+ $(node, {d: value ? attrs.path = roundPath(pathToAbsolute(value)) : "M0,0"});
+ }
+ break;
+ case "width":
node[setAttribute](att, value);
- }
- break;
- case "src":
- if (o.type == "image") {
- node.setAttributeNS(o.paper.xlink, "href", value);
- }
- break;
- case "stroke-width":
- node.style.strokeWidth = value;
- // Need following line for Firefox
- node[setAttribute](att, value);
- if (attrs["stroke-dasharray"]) {
- addDashes(o, attrs["stroke-dasharray"]);
- }
- break;
- case "stroke-dasharray":
- addDashes(o, value);
- break;
- case "translation":
- var xy = (value + E)[split](separator);
- xy[0] = +xy[0] || 0;
- xy[1] = +xy[1] || 0;
- if (rotxy) {
- rotxy[1] += xy[0];
- rotxy[2] += xy[1];
- }
- translate.call(o, xy[0], xy[1]);
- break;
- case "scale":
- var xy = (value + E)[split](separator);
- o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, +xy[2] || null, +xy[3] || null);
- break;
- case "fill":
- var isURL = (value + E).match(ISURL);
- if (isURL) {
- var el = $("pattern"),
- ig = $("image");
- el.id = "r" + (R._id++)[toString](36);
- $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
- $(ig, {x: 0, y: 0});
- ig.setAttributeNS(o.paper.xlink, "href", isURL[1]);
- el[appendChild](ig);
-
- var img = doc.createElement("img");
- img.style.cssText = "position:absolute;left:-9999em;top-9999em";
- img.onload = function () {
- $(el, {width: this.offsetWidth, height: this.offsetHeight});
- $(ig, {width: this.offsetWidth, height: this.offsetHeight});
- doc.body.removeChild(this);
- o.paper.safari();
- };
- doc.body[appendChild](img);
- img.src = isURL[1];
- o.paper.defs[appendChild](el);
- node.style.fill = "url(#" + el.id + ")";
- $(node, {fill: "url(#" + el.id + ")"});
- o.pattern = el;
+ if (attrs.fx) {
+ att = "x";
+ value = attrs.x;
+ } else {
+ break;
+ }
+ case "x":
+ if (attrs.fx) {
+ value = -attrs.x - (attrs.width || 0);
+ }
+ case "rx":
+ if (att == "rx" && o.type == "rect") {
+ break;
+ }
+ case "cx":
+ rotxy && (att == "x" || att == "cx") && (rotxy[1] += value - attrs[att]);
+ node[setAttribute](att, round(value));
o.pattern && updatePosition(o);
break;
- }
- if (!R.getRGB(value).error) {
- delete params.gradient;
- delete attrs.gradient;
- !R.is(attrs.opacity, "undefined") &&
- R.is(params.opacity, "undefined") &&
- $(node, {opacity: attrs.opacity});
- !R.is(attrs["fill-opacity"], "undefined") &&
- R.is(params["fill-opacity"], "undefined") &&
- $(node, {"fill-opacity": attrs["fill-opacity"]});
- } else if ((({circle: 1, ellipse: 1})[has](o.type) || (value + E).charAt() != "r") && addGradientFill(node, value, o.paper)) {
- attrs.gradient = value;
- attrs.fill = "none";
+ case "height":
+ node[setAttribute](att, value);
+ if (attrs.fy) {
+ att = "y";
+ value = attrs.y;
+ } else {
+ break;
+ }
+ case "y":
+ if (attrs.fy) {
+ value = -attrs.y - (attrs.height || 0);
+ }
+ case "ry":
+ if (att == "ry" && o.type == "rect") {
+ break;
+ }
+ case "cy":
+ rotxy && (att == "y" || att == "cy") && (rotxy[2] += value - attrs[att]);
+ node[setAttribute](att, round(value));
+ o.pattern && updatePosition(o);
break;
- }
- case "stroke":
- node[setAttribute](att, R.getRGB(value).hex);
- break;
- case "gradient":
- (({circle: 1, ellipse: 1})[has](o.type) || (value + E).charAt() != "r") && addGradientFill(node, value, o.paper);
- break;
- case "opacity":
- case "fill-opacity":
- if (attrs.gradient) {
- var gradient = doc.getElementById(node.getAttribute("fill")[rp](/^url\(#|\)$/g, E));
- if (gradient) {
- var stops = gradient.getElementsByTagName("stop");
- stops[stops[length] - 1][setAttribute]("stop-opacity", value);
+ case "r":
+ if (o.type == "rect") {
+ $(node, {rx: value, ry: value});
+ } else {
+ node[setAttribute](att, value);
}
break;
- }
- default:
- att == "font-size" && (value = toInt(value, 10) + "px");
- var cssrule = att[rp](/(\-.)/g, function (w) {
- return upperCase.call(w.substring(1));
- });
- node.style[cssrule] = value;
- // Need following line for Firefox
- node[setAttribute](att, value);
- break;
+ case "src":
+ if (o.type == "image") {
+ node.setAttributeNS(o.paper.xlink, "href", value);
+ }
+ break;
+ case "stroke-width":
+ node.style.strokeWidth = value;
+ // Need following line for Firefox
+ node[setAttribute](att, value);
+ if (attrs["stroke-dasharray"]) {
+ addDashes(o, attrs["stroke-dasharray"]);
+ }
+ break;
+ case "stroke-dasharray":
+ addDashes(o, value);
+ break;
+ case "translation":
+ var xy = (value + E)[split](separator);
+ xy[0] = +xy[0] || 0;
+ xy[1] = +xy[1] || 0;
+ if (rotxy) {
+ rotxy[1] += xy[0];
+ rotxy[2] += xy[1];
+ }
+ translate.call(o, xy[0], xy[1]);
+ break;
+ case "scale":
+ xy = (value + E)[split](separator);
+ o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, isNaN(toFloat(xy[2])) ? null : +xy[2], isNaN(toFloat(xy[3])) ? null : +xy[3]);
+ break;
+ case "fill":
+ var isURL = (value + E).match(ISURL);
+ if (isURL) {
+ el = $("pattern");
+ var ig = $("image");
+ el.id = "r" + (R._id++)[toString](36);
+ $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
+ $(ig, {x: 0, y: 0});
+ ig.setAttributeNS(o.paper.xlink, "href", isURL[1]);
+ el[appendChild](ig);
+
+ var img = doc.createElement("img");
+ img.style.cssText = "position:absolute;left:-9999em;top-9999em";
+ img.onload = function () {
+ $(el, {width: this.offsetWidth, height: this.offsetHeight});
+ $(ig, {width: this.offsetWidth, height: this.offsetHeight});
+ doc.body.removeChild(this);
+ o.paper.safari();
+ };
+ doc.body[appendChild](img);
+ img.src = isURL[1];
+ o.paper.defs[appendChild](el);
+ node.style.fill = "url(#" + el.id + ")";
+ $(node, {fill: "url(#" + el.id + ")"});
+ o.pattern = el;
+ o.pattern && updatePosition(o);
+ break;
+ }
+ if (!R.getRGB(value).error) {
+ delete params.gradient;
+ delete attrs.gradient;
+ !R.is(attrs.opacity, "undefined") &&
+ R.is(params.opacity, "undefined") &&
+ $(node, {opacity: attrs.opacity});
+ !R.is(attrs["fill-opacity"], "undefined") &&
+ R.is(params["fill-opacity"], "undefined") &&
+ $(node, {"fill-opacity": attrs["fill-opacity"]});
+ } else if ((({circle: 1, ellipse: 1})[has](o.type) || (value + E).charAt() != "r") && addGradientFill(node, value, o.paper)) {
+ attrs.gradient = value;
+ attrs.fill = "none";
+ break;
+ }
+ case "stroke":
+ node[setAttribute](att, R.getRGB(value).hex);
+ break;
+ case "gradient":
+ (({circle: 1, ellipse: 1})[has](o.type) || (value + E).charAt() != "r") && addGradientFill(node, value, o.paper);
+ break;
+ case "opacity":
+ case "fill-opacity":
+ if (attrs.gradient) {
+ var gradient = doc.getElementById(node.getAttribute("fill")[rp](/^url\(#|\)$/g, E));
+ if (gradient) {
+ var stops = gradient.getElementsByTagName("stop");
+ stops[stops[length] - 1][setAttribute]("stop-opacity", value);
+ }
+ break;
+ }
+ default:
+ att == "font-size" && (value = toInt(value, 10) + "px");
+ var cssrule = att[rp](/(\-.)/g, function (w) {
+ return upperCase.call(w.substring(1));
+ });
+ node.style[cssrule] = value;
+ // Need following line for Firefox
+ node[setAttribute](att, value);
+ break;
+ }
}
}
toFloat(rot) && o.rotate(rot, true);
}
};
- var leading = 1.2;
- var tuneText = function (el, params) {
+ var leading = 1.2,
+ tuneText = function (el, params) {
if (el.type != "text" || !(params[has]("text") || params[has]("font") || params[has]("font-size") || params[has]("x") || params[has]("y"))) {
return;
}
node[appendChild](tspan);
}
} else {
- var texts = node.getElementsByTagName("tspan");
- for (var i = 0, ii = texts[length]; i < ii; i++) {
+ texts = node.getElementsByTagName("tspan");
+ for (i = 0, ii = texts[length]; i < ii; i++) {
i && $(texts[i], {dy: fontSize * leading, x: a.x});
}
}
var bb = el.getBBox(),
dif = a.y - (bb.y + bb.height / 2);
dif && isFinite(dif) && $(node, {y: a.y + dif});
- };
- var Element = function (node, svg) {
+ },
+ Element = function (node, svg) {
var X = 0,
Y = 0;
this[0] = node;
hide && this.hide();
return bbox;
};
- Element[proto].attr = function () {
+ Element[proto].attr = function (name, value) {
if (this.removed) {
return this;
}
- if (arguments[length] == 0) {
+ if (name == null) {
var res = {};
for (var i in this.attrs) if (this.attrs[has](i)) {
res[i] = this.attrs[i];
res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
return res;
}
- if (arguments[length] == 1 && R.is(arguments[0], "string")) {
- if (arguments[0] == "translation") {
+ if (value == null && R.is(name, "string")) {
+ if (name == "translation") {
return translate.call(this);
}
- if (arguments[0] == "rotation") {
+ if (name == "rotation") {
return this.rotate();
}
- if (arguments[0] == "scale") {
+ if (name == "scale") {
return this.scale();
}
- if (arguments[0] == "fill" && this.attrs.fill == "none" && this.attrs.gradient) {
+ if (name == "fill" && this.attrs.fill == "none" && this.attrs.gradient) {
return this.attrs.gradient;
}
- return this.attrs[arguments[0]];
+ return this.attrs[name];
}
- if (arguments[length] == 1 && R.is(arguments[0], "array")) {
+ if (value == null && R.is(name, "array")) {
var values = {};
- for (var j in arguments[0]) if (arguments[0][has](j)) {
- values[arguments[0][j]] = this.attrs[arguments[0][j]];
+ for (var j = 0, jj = name.length; j < jj; j++) {
+ values[name[j]] = this.attr(name[j]);
}
return values;
}
- if (arguments[length] == 2) {
+ if (value != null) {
var params = {};
- params[arguments[0]] = arguments[1];
+ params[name] = value;
setFillAndStroke(this, params);
- } else if (arguments[length] == 1 && R.is(arguments[0], "object")) {
- setFillAndStroke(this, arguments[0]);
+ } else if (name != null && R.is(name, "object")) {
+ setFillAndStroke(this, name);
}
return this;
};
insertbefore(this, element, this.paper);
return this;
};
+ Element[proto].blur = function (size) {
+ // Experimental. No Safari support. Use it on your own risk.
+ var t = this;
+ if (+size !== 0) {
+ var fltr = $("filter"),
+ blur = $("feGaussianBlur");
+ t.attrs.blur = size;
+ fltr.id = "r" + (R._id++)[toString](36);
+ $(blur, {stdDeviation: +size || 1.5});
+ fltr.appendChild(blur);
+ t.paper.defs.appendChild(fltr);
+ t._blur = fltr;
+ $(t.node, {filter: "url(#" + fltr.id + ")"});
+ } else {
+ if (t._blur) {
+ t._blur.parentNode.removeChild(t._blur);
+ delete t._blur;
+ delete t.attrs.blur;
+ }
+ t.node.removeAttribute("filter");
+ }
+ };
var theCircle = function (svg, x, y, r) {
x = round(x);
y = round(y);
return this;
};
var create = function () {
- var con = getContainer[apply](null, arguments),
+ var con = getContainer[apply](0, arguments),
container = con && con.container,
x = con.x,
y = con.y,
}
};
}
-
+
// VML
if (R.vml) {
- var path2vml = function (path) {
- var total = /[ahqtv]/ig,
- command = pathToAbsolute;
- (path + E).match(total) && (command = path2curve);
- total = /[clmz]/g;
- if (command == pathToAbsolute && !(path + E).match(total)) {
- var map = {M: "m", L: "l", C: "c", Z: "x", m: "t", l: "r", c: "v", z: "x"},
- bites = /([clmz]),?([^clmz]*)/gi,
- val = /-?[^,\s-]+/g;
- var res = (path + E)[rp](bites, function (all, command, args) {
- var vals = [];
- args[rp](val, function (value) {
- vals[push](round(value));
+ var map = {M: "m", L: "l", C: "c", Z: "x", m: "t", l: "r", c: "v", z: "x"},
+ bites = /([clmz]),?([^clmz]*)/gi,
+ val = /-?[^,\s-]+/g,
+ coordsize = 1e3 + S + 1e3,
+ zoom = 10,
+ path2vml = function (path) {
+ var total = /[ahqstv]/ig,
+ command = pathToAbsolute;
+ (path + E).match(total) && (command = path2curve);
+ total = /[clmz]/g;
+ if (command == pathToAbsolute && !(path + E).match(total)) {
+ var res = (path + E)[rp](bites, function (all, command, args) {
+ var vals = [],
+ isMove = lowerCase.call(command) == "m",
+ res = map[command];
+ args[rp](val, function (value) {
+ if (isMove && vals[length] == 2) {
+ res += vals + map[command == "m" ? "l" : "L"];
+ vals = [];
+ }
+ vals[push](round(value * zoom));
+ });
+ return res + vals;
});
- return map[command] + vals;
- });
- return res;
- }
- var pa = command(path), p, res = [], r;
- for (var i = 0, ii = pa[length]; i < ii; i++) {
- p = pa[i];
- r = lowerCase.call(pa[i][0]);
- r == "z" && (r = "x");
- for (var j = 1, jj = p[length]; j < jj; j++) {
- r += round(p[j]) + (j != jj - 1 ? "," : E);
+ return res;
+ }
+ var pa = command(path), p, r;
+ res = [];
+ for (var i = 0, ii = pa[length]; i < ii; i++) {
+ p = pa[i];
+ r = lowerCase.call(pa[i][0]);
+ r == "z" && (r = "x");
+ for (var j = 1, jj = p[length]; j < jj; j++) {
+ r += round(p[j] * zoom) + (j != jj - 1 ? "," : E);
+ }
+ res[push](r);
}
- res[push](r);
- }
- return res[join](S);
- };
+ return res[join](S);
+ };
R[toString] = function () {
return "Your browser doesn\u2019t support SVG. Falling down to VML.\nYou are running Rapha\xebl " + this.version;
};
- var thePath = function (pathString, VML) {
+ thePath = function (pathString, vml) {
var g = createNode("group");
- g.style.cssText = "position:absolute;left:0;top:0;width:" + VML.width + "px;height:" + VML.height + "px";
- g.coordsize = VML.coordsize;
- g.coordorigin = VML.coordorigin;
+ g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
+ g.coordsize = vml.coordsize;
+ g.coordorigin = vml.coordorigin;
var el = createNode("shape"), ol = el.style;
- ol.width = VML.width + "px";
- ol.height = VML.height + "px";
- el.coordsize = this.coordsize;
- el.coordorigin = this.coordorigin;
+ ol.width = vml.width + "px";
+ ol.height = vml.height + "px";
+ el.coordsize = coordsize;
+ el.coordorigin = vml.coordorigin;
g[appendChild](el);
- var p = new Element(el, g, VML);
+ var p = new Element(el, g, vml),
+ attr = {fill: "none", stroke: "#000"};
+ pathString && (attr.path = pathString);
p.isAbsolute = true;
p.type = "path";
p.path = [];
p.Path = E;
- pathString && setFillAndStroke(p, {fill: "none", stroke: "#000", path: pathString});
- VML.canvas[appendChild](g);
+ setFillAndStroke(p, attr);
+ vml.canvas[appendChild](g);
return p;
};
- var setFillAndStroke = function (o, params) {
+ setFillAndStroke = function (o, params) {
o.attrs = o.attrs || {};
var node = o.node,
a = o.attrs,
params.title && (node.title = params.title);
params.target && (node.target = params.target);
params.cursor && (s.cursor = params.cursor);
+ "blur" in params && o.blur(params.blur);
if (params.path && o.type == "path") {
a.path = params.path;
node.path = path2vml(a.path);
}
(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),
- width = (toFloat(params["stroke-width"]) || 1) * .75;
+ opacity = ((+a["stroke-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1);
+ var width = (toFloat(params["stroke-width"]) || 1) * .75;
opacity < 0 && (opacity = 0);
opacity > 1 && (opacity = 1);
params["stroke-width"] == null && (width = a["stroke-width"]);
newstroke && node[appendChild](stroke);
}
if (res.type == "text") {
- var s = res.paper.span.style;
+ s = res.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"]);
}
}
};
- var addGradientFill = function (o, gradient) {
+ addGradientFill = function (o, gradient) {
o.attrs = o.attrs || {};
var attrs = o.attrs,
fill = o.node.getElementsByTagName("fill"),
}
return 1;
};
- var Element = function (node, group, vml) {
+ Element = function (node, group, vml) {
var Rotation = 0,
RotX = 0,
RotY = 0,
cx = (cx == null) ? x + w / 2 : cx;
cy = (cy == null) ? y + h / 2 : cy;
var left = cx - this.paper.width / 2,
- top = cy - this.paper.height / 2;
- if (this.type == "path" || this.type == "text") {
- (gs.left != left + "px") && (gs.left = left + "px");
- (gs.top != top + "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.left != -left + "px") && (os.left = -left + "px");
- (os.top != -top + "px") && (os.top = -top + "px");
+ top = cy - this.paper.height / 2, t;
+ gs.left != (t = left + "px") && (gs.left = t);
+ gs.top != (t = top + "px") && (gs.top = t);
+ this.X = this.type == "path" ? -left : x;
+ this.Y = this.type == "path" ? -top : y;
+ this.W = w;
+ this.H = h;
+ if (this.type == "path") {
+ os.left != (t = -left * zoom + "px") && (os.left = t);
+ os.top != (t = -top * zoom + "px") && (os.top = t);
+ } else if (this.type == "text") {
+ os.left != (t = -left + "px") && (os.left = t);
+ os.top != (t = -top + "px") && (os.top = t);
} else {
- (gs.left != left + "px") && (gs.left = left + "px");
- (gs.top != top + "px") && (gs.top = top + "px");
- this.X = x;
- this.Y = y;
- this.W = w;
- this.H = h;
- (gs.width != this.paper.width + "px") && (gs.width = this.paper.width + "px");
- (gs.height != this.paper.height + "px") && (gs.height = this.paper.height + "px");
- (os.left != x - left + "px") && (os.left = x - left + "px");
- (os.top != y - top + "px") && (os.top = y - top + "px");
- (os.width != w + "px") && (os.width = w + "px");
- (os.height != h + "px") && (os.height = h + "px");
+ gs.width != (t = this.paper.width + "px") && (gs.width = t);
+ gs.height != (t = this.paper.height + "px") && (gs.height = t);
+ os.left != (t = x - left + "px") && (os.left = t);
+ os.top != (t = y - top + "px") && (os.top = t);
+ os.width != (t = w + "px") && (os.width = t);
+ os.height != (t = h + "px") && (os.height = t);
var arcsize = (+params.r || 0) / mmin(w, h);
if (this.type == "rect" && this.arcsize.toFixed(4) != arcsize.toFixed(4) && (arcsize || this.arcsize)) {
// We should replace element with the new one
var o = createNode("roundrect"),
a = {},
- i = 0,
ii = this.events && this.events[length];
+ i = 0;
o.arcsize = arcsize;
o.raphael = this;
this.Group[appendChild](o);
this.Group.removeChild(this.node);
this[0] = this.node = o;
this.arcsize = arcsize;
- for (var i in attr) {
+ for (i in attr) {
a[i] = attr[i];
}
delete a.scale;
}
this.removed = true;
};
- Element[proto].attr = function () {
+ Element[proto].attr = function (name, value) {
if (this.removed) {
return this;
}
- if (arguments[length] == 0) {
+ if (name == null) {
var res = {};
for (var i in this.attrs) if (this.attrs[has](i)) {
res[i] = this.attrs[i];
res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
return res;
}
- if (arguments[length] == 1 && R.is(arguments[0], "string")) {
- if (arguments[0] == "translation") {
+ if (value == null && R.is(name, "string")) {
+ if (name == "translation") {
return translate.call(this);
}
- if (arguments[0] == "rotation") {
+ if (name == "rotation") {
return this.rotate();
}
- if (arguments[0] == "scale") {
+ if (name == "scale") {
return this.scale();
}
- if (arguments[0] == "fill" && this.attrs.fill == "none" && this.attrs.gradient) {
+ if (name == "fill" && this.attrs.fill == "none" && this.attrs.gradient) {
return this.attrs.gradient;
}
- return this.attrs[arguments[0]];
+ return this.attrs[name];
}
- if (this.attrs && arguments[length] == 1 && R.is(arguments[0], "array")) {
- var values = {};
- for (var i = 0, ii = arguments[0][length]; i < ii; i++) {
- values[arguments[0][i]] = this.attrs[arguments[0][i]];
- };
+ if (this.attrs && value == null && R.is(name, "array")) {
+ var ii, values = {};
+ for (i = 0, ii = name[length]; i < ii; i++) {
+ values[name[i]] = this.attr(name[i]);
+ }
return values;
}
var params;
- if (arguments[length] == 2) {
+ if (value != null) {
params = {};
- params[arguments[0]] = arguments[1];
+ params[name] = value;
}
- arguments[length] == 1 && R.is(arguments[0], "object") && (params = arguments[0]);
+ value == null && R.is(name, "object") && (params = name);
if (params) {
if (params.text && this.type == "text") {
this.node.string = params.text;
insertbefore(this, element, this.paper);
return this;
};
+ var blurregexp = / progid:\S+Blur\([^\)]+\)/g;
+ Element[proto].blur = function (size) {
+ var s = this.node.style,
+ f = s.filter;
+ f = f.replace(blurregexp, "");
+ if (+size !== 0) {
+ this.attrs.blur = size;
+ s.filter = f + " progid:DXImageTransform.Microsoft.Blur(pixelradius=" + (+size || 1.5) + ")";
+ s.margin = Raphael.format("-{0}px 0 0 -{0}px", Math.round(+size || 1.5));
+ } else {
+ s.filter = f;
+ s.margin = 0;
+ delete this.attrs.blur;
+ }
+ };
- var theCircle = function (vml, x, y, r) {
+ theCircle = function (vml, x, y, r) {
var g = createNode("group"),
o = createNode("oval"),
ol = o.style;
g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
- g.coordsize = vml.coordsize;
+ g.coordsize = coordsize;
g.coordorigin = vml.coordorigin;
g[appendChild](o);
var res = new Element(o, g, vml);
res.setBox({x: x - r, y: y - r, width: r * 2, height: r * 2});
vml.canvas[appendChild](g);
return res;
- },
+ };
theRect = function (vml, x, y, w, h, r) {
var g = createNode("group"),
o = createNode("roundrect"),
arcsize = (+r || 0) / (mmin(w, h));
g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
- g.coordsize = vml.coordsize;
+ g.coordsize = coordsize;
g.coordorigin = vml.coordorigin;
g[appendChild](o);
o.arcsize = arcsize;
res.setBox({x: x, y: y, width: w, height: h, r: r});
vml.canvas[appendChild](g);
return res;
- },
+ };
theEllipse = function (vml, x, y, rx, ry) {
var g = createNode("group"),
o = createNode("oval"),
ol = o.style;
g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
- g.coordsize = vml.coordsize;
+ g.coordsize = coordsize;
g.coordorigin = vml.coordorigin;
g[appendChild](o);
var res = new Element(o, g, vml);
res.setBox({x: x - rx, y: y - ry, width: rx * 2, height: ry * 2});
vml.canvas[appendChild](g);
return res;
- },
+ };
theImage = function (vml, src, x, y, w, h) {
var g = createNode("group"),
o = createNode("image"),
ol = o.style;
g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
- g.coordsize = vml.coordsize;
+ g.coordsize = coordsize;
g.coordorigin = vml.coordorigin;
o.src = src;
g[appendChild](o);
res.setBox({x: x, y: y, width: w, height: h});
vml.canvas[appendChild](g);
return res;
- },
+ };
theText = function (vml, x, y, text) {
var g = createNode("group"),
el = createNode("shape"),
ps = path.style,
o = createNode("textpath");
g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
- g.coordsize = vml.coordsize;
+ g.coordsize = coordsize;
g.coordorigin = vml.coordorigin;
- path.v = R.format("m{0},{1}l{2},{1}", round(x), round(y), round(x) + 1);
+ path.v = R.format("m{0},{1}l{2},{1}", round(x * 10), round(y * 10), round(x * 10) + 1);
path.textpathok = true;
ol.width = vml.width;
ol.height = vml.height;
res.setBox();
vml.canvas[appendChild](g);
return res;
- },
+ };
setSize = function (width, height) {
var cs = this.canvas.style;
width == +width && (width += "px");
cs.height = height;
cs.clip = "rect(0 " + width + " " + height + " 0)";
return this;
- },
- createNode;
+ };
+ var createNode;
doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
try {
!doc.namespaces.rvml && doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
return doc.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
};
}
- var create = function () {
- var con = getContainer[apply](null, arguments),
+ create = function () {
+ var con = getContainer[apply](0, arguments),
container = con.container,
height = con.height,
s,
height == +height && (height += "px");
res.width = 1e3;
res.height = 1e3;
- res.coordsize = "1000 1000";
+ res.coordsize = zoom * 1e3 + S + zoom * 1e3;
res.coordorigin = "0 0";
res.span = doc.createElement("span");
- res.span.style.cssText = "position:absolute;left:-9999px;top:-9999px;padding:0;margin:0;line-height:1;display:inline;";
+ res.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
c[appendChild](res.span);
cs.cssText = R.format("width:{0};height:{1};position:absolute;clip:rect(0 {0} {1} 0);overflow:hidden", width, height);
if (container == 1) {
Paper[proto].clear = function () {
this.canvas.innerHTML = E;
this.span = doc.createElement("span");
- this.span.style.cssText = "position:absolute;left:-9999px;top:-9999px;padding:0;margin:0;line-height:1;display:inline;";
+ this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
this.canvas[appendChild](this.span);
this.bottom = this.top = null;
};
for (var i in this) {
this[i] = removed(i);
}
+ return true;
};
}
// rest
// Safari or Chrome (WebKit) rendering bug workaround method
- if ((/^Apple|^Google/).test(navigator.vendor) && !(navigator.userAgent.indexOf("Version/4.0") + 1)) {
+ if ((/^Apple|^Google/).test(win.navigator.vendor) && !(win.navigator.userAgent.indexOf("Version/4.0") + 1)) {
Paper[proto].safari = function () {
var rect = this.rect(-99, -99, this.width + 99, this.height + 99);
- setTimeout(function () {rect.remove();});
+ win.setTimeout(function () {rect.remove();});
};
} else {
Paper[proto].safari = function () {};
Paper[proto].raphael = R;
function x_y() {
return this.x + S + this.y;
- };
+ }
Element[proto].scale = function (x, y, cx, cy) {
if (x == null && y == null) {
return {
skip = true;
for (var i = 0, ii = path[length]; i < ii; i++) {
var p = path[i],
- j,
P0 = upperCase.call(p[0]);
if (P0 == "M" && skip) {
continue;
p[path[i][length] - 1] *= ky;
p[1] *= dirx * kx;
p[2] *= diry * ky;
- p[5] = +(dirx + diry ? !!+p[5] : !+p[5]);
+ p[5] = +!(dirx + diry ? !+p[5] : +p[5]);
} else if (P0 == "H") {
- for (j = 1, jj = p[length]; j < jj; j++) {
+ for (var j = 1, jj = p[length]; j < jj; j++) {
p[j] *= kx;
}
} else if (P0 == "V") {
}
}
}
- var dim2 = pathDimensions(path),
- dx = ncx - dim2.x - dim2.width / 2,
- dy = ncy - dim2.y - dim2.height / 2;
+ var dim2 = pathDimensions(path);
+ dx = ncx - dim2.x - dim2.width / 2;
+ dy = ncy - dim2.y - dim2.height / 2;
path[0][1] += dx;
path[0][2] += dy;
this.attr({path: path});
delete attr.translation;
return this.paper[this.type]().attr(attr);
};
- var getLengthFactory = function (istotal, subpath) {
- return function (length) {
- if (this.type != "path") {
- return -1;
+ var getPointAtSegmentLength = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) {
+ var len = 0,
+ old;
+ for (var i = 0; i < 1.001; i+=.001) {
+ var dot = R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, i);
+ i && (len += pow(pow(old.x - dot.x, 2) + pow(old.y - dot.y, 2), .5));
+ if (len >= length) {
+ return dot;
}
- var path = path2curve(this.attrs.path), x, y, p, l, sp = "", subpaths = {},
+ old = dot;
+ }
+ }),
+ getLengthFactory = function (istotal, subpath) {
+ return function (path, length, onlystart) {
+ path = path2curve(path);
+ var x, y, p, l, sp = "", subpaths = {}, point,
len = 0;
for (var i = 0, ii = path.length; i < ii; i++) {
p = path[i];
l = segmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
if (len + l > length) {
if (subpath && !subpaths.start) {
- var point = R.findDotsAtSegment(x, y, p[1], p[2], p[3], p[4], p[5], p[6], (length - len) / l);
+ point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
sp += ["C", point.start.x, point.start.y, point.m.x, point.m.y, point.x, point.y];
+ if (onlystart) {return sp;}
subpaths.start = sp;
- sp = ["M", point.x, point.y, "C", point.n.x, point.n.y, point.end.x, point.end.y, p[5], p[6]][join]();
+ sp = ["M", point.x, point.y + "C", point.n.x, point.n.y, point.end.x, point.end.y, p[5], p[6]][join]();
len += l;
x = +p[5];
y = +p[6];
continue;
}
if (!istotal && !subpath) {
- return R.findDotsAtSegment(x, y, p[1], p[2], p[3], p[4], p[5], p[6], (length - len) / l);
+ point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
+ return {x: point.x, y: point.y, alpha: point.alpha};
}
}
len += l;
sp += p;
}
subpaths.end = sp;
- return istotal ? len : subpath ? subpaths : R.findDotsAtSegment(x, y, p[1], p[2], p[3], p[4], p[5], p[6], 1);
+ point = istotal ? len : subpath ? subpaths : R.findDotsAtSegment(x, y, p[1], p[2], p[3], p[4], p[5], p[6], 1);
+ point.alpha && (point = {x: point.x, y: point.y, alpha: point.alpha});
+ return point;
};
},
segmentLength = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
len = 0;
for (var i = 0; i < 1.01; i+=.01) {
var dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, i);
- i && (len += math.sqrt(pow(old.x - dot.x, 2) + pow(old.y - dot.y, 2)));
+ i && (len += pow(pow(old.x - dot.x, 2) + pow(old.y - dot.y, 2), .5));
old = dot;
}
return len;
});
- Element[proto].getTotalLength = getLengthFactory(1);
- Element[proto].getPointAtLength = getLengthFactory();
- Element[proto].getSubpathToLength = getLengthFactory(0, 1);
+ var getTotalLength = getLengthFactory(1),
+ getPointAtLength = getLengthFactory(),
+ getSubpathsAtLength = getLengthFactory(0, 1);
+ Element[proto].getTotalLength = function () {
+ if (this.type != "path") {return;}
+ return getTotalLength(this.attrs.path);
+ };
+ Element[proto].getPointAtLength = function (length) {
+ if (this.type != "path") {return;}
+ return getPointAtLength(this.attrs.path, length);
+ };
+ Element[proto].getSubpath = function (from, to) {
+ if (this.type != "path") {return;}
+ if (math.abs(this.getTotalLength() - to) < 1e-6) {
+ return getSubpathsAtLength(this.attrs.path, from).end;
+ }
+ var a = getSubpathsAtLength(this.attrs.path, to, 1);
+ return from ? getSubpathsAtLength(a, from).end : a;
+ };
// animation easing formulas
R.easing_formulas = {
var Now = +new Date;
for (var l in animationElements) if (l != "length" && animationElements[has](l)) {
var e = animationElements[l];
- if (e.stop) {
+ if (e.stop || e.el.removed) {
delete animationElements[l];
animationElements[length]--;
continue;
switch (availableAnimAttrs[attr]) {
case "along":
now = pos * ms * diff[attr];
- var point = to[attr].getPointAtLength(now);
+ to.back && (now = to.len - now);
+ var point = getPointAtLength(to[attr], now);
that.translate(diff.sx - diff.x || 0, diff.sy - diff.y || 0);
diff.x = point.x;
diff.y = point.y;
break;
case "clip-rect":
now = [];
- var i = 4;
+ i = 4;
while (i--) {
now[i] = +from[attr][i] + pos * ms * diff[attr][i];
}
that._run && that._run.call(that);
} else {
if (to.along) {
- var point = to.along.getPointAtLength(to.along.getTotalLength());
+ point = getPointAtLength(to.along, to.len * !to.back);
that.translate(diff.sx - (diff.x || 0) + point.x - diff.sx, diff.sy - (diff.y || 0) + point.y - diff.sy);
to.rot && that.rotate(diff.r + point.alpha, point.x, point.y);
}
e.prev = time;
}
R.svg && that && that.paper.safari();
- animationElements[length] && setTimeout(animation);
+ animationElements[length] && win.setTimeout(animation);
},
upto255 = function (color) {
return color > 255 ? 255 : (color < 0 ? 0 : color);
animationElements[element.id] && (params.start = animationElements[element.id].start);
return this.animate(params, ms, easing, callback);
};
- Element[proto].animateAlong = function (path, ms, rotate, callback) {
- var params = {};
- R.is(rotate, "function") ? (callback = rotate) : (params.rot = rotate);
- if (R.is(path, "string") && path.constructor != Element) {
- path = r.path(path).attr({stroke: "none"});
- var f = function () {
- path.remove();
- };
- callback = R.is(callback, "function") ? function () { f(); callback.call(this); } : f;
- }
- path.constructor == Element && (params.along = path);
- return this.animate(params, ms, callback);
- };
+ Element[proto].animateAlong = along();
+ Element[proto].animateAlongBack = along(1);
+ function along(isBack) {
+ return function (path, ms, rotate, callback) {
+ var params = {back: isBack};
+ R.is(rotate, "function") ? (callback = rotate) : (params.rot = rotate);
+ path && path.constructor == Element && (path = path.attrs.path);
+ path && (params.along = path);
+ return this.animate(params, ms, callback);
+ };
+ }
Element[proto].onAnimation = function (f) {
this._run = f || 0;
return this;
to[attr] = params[attr];
switch (availableAnimAttrs[attr]) {
case "along":
- var point = params[attr].getPointAtLength(0),
+ var len = getTotalLength(params[attr]),
+ point = getPointAtLength(params[attr], len * !!params.back),
bb = this.getBBox();
- diff[attr] = params[attr].getTotalLength() / ms;
+ diff[attr] = len / ms;
diff.tx = bb.x;
diff.ty = bb.y;
diff.sx = point.x;
diff.sy = point.y;
to.rot = params.rot;
- params.rot && (diff.r = toFloat(this.rotate()));
+ to.back = params.back;
+ to.len = len;
+ params.rot && (diff.r = toFloat(this.rotate()) || 0);
break;
case "number":
diff[attr] = (to[attr] - from[attr]) / ms;
case "clip-rect":
from[attr] = (from[attr] + E)[split](separator);
diff[attr] = [];
- var i = 4;
+ i = 4;
while (i--) {
diff[attr][i] = (values[i] - from[attr][i]) / ms;
}
}
} else {
for (var i = 0, ii = this.items[length]; i < ii; i++) {
- this.items[i].attr[apply](this.items[i], arguments);
+ this.items[i].attr(name, value);
}
}
return this;
height: mmax[apply](0, h) - y
};
};
-
+ Set[proto].clone = function (s) {
+ s = new Set;
+ for (var i = 0, ii = this.items[length]; i < ii; i++) {
+ s[push](this.items[i].clone());
+ }
+ return s;
+ };
+
R.registerFont = function (font) {
if (!font.face) {
return font;
}
return out;
};
-
- R.format = function (token) {
- var args = R.is(arguments[1], "array") ? [0][concat](arguments[1]) : arguments,
- rg = /\{(\d+)\}/g;
- token && R.is(token, "string") && args[length] - 1 && (token = token[rp](rg, function (str, i) {
+
+ var formatrg = /\{(\d+)\}/g;
+ R.format = function (token, array) {
+ var args = R.is(array, "array") ? [0][concat](array) : arguments;
+ token && R.is(token, "string") && args[length] - 1 && (token = token[rp](formatrg, function (str, i) {
return args[++i] == null ? E : args[i];
}));
return token || E;
};
R.ninja = function () {
- var r = win.Raphael, u;
- if (oldRaphael.was) {
- win.Raphael = oldRaphael.is;
- } else {
- try {
- delete win.Raphael;
- } catch (e) {
- win.Raphael = u;
- }
- }
- return r;
+ oldRaphael.was ? (Raphael = oldRaphael.is) : delete Raphael;
+ return R;
};
R.el = Element[proto];
return R;
projects / raphael / blobdiff