Skip to content

殷洪（管理员） / raphael

Go to a project
Commit 7ba1a825 by Dmitry Baranovskiy
Options

2.1.0. Look history.md for list of changes

parent 2b0c5a21
Showing with 1070 additions and 257 deletions
history.md
2.0.2 * 2012-02-08 2.1.0 • 2012-03-14
------------------
* Put all Eve events into “raphael.” namespace
* Refactored path caching
* Added x2 and y2 to returning bounding box values
* Fixed bug with matrix.f in animation
* Method [Paper.print](http://raphaeljs.com/reference.html#Paper.print) now returns all letters as one path without any transformations applied and supports multiline text
* New methods
* [Element.isPointInside](http://raphaeljs.com/reference.html#Element.isPointInside)
* [Paper.getElementsByPoint](http://raphaeljs.com/reference.html#Paper.getElementsByPoint)
* [Raphael.bezierBBox](http://raphaeljs.com/reference.html#Raphael.bezierBBox)
* [Raphael.isBBoxIntersect](http://raphaeljs.com/reference.html#Raphael.isBBoxIntersect)
* [Raphael.isPointInsideBBox](http://raphaeljs.com/reference.html#Raphael.isPointInsideBBox)
* [Raphael.isPointInsidePath](http://raphaeljs.com/reference.html#Raphael.isPointInsidePath)
* [Raphael.pathBBox](http://raphaeljs.com/reference.html#Raphael.pathBBox)
* [Raphael.pathIntersection](http://raphaeljs.com/reference.html#Raphael.pathIntersection)
* [Raphael.toMatrix](http://raphaeljs.com/reference.html#Raphael.toMatrix)
* [Raphael.transformPath](http://raphaeljs.com/reference.html#Raphael.transformPath)
2.0.2 • 2012-02-08
------------------ ------------------
* Removing of linked element now removes `<a>` as well * Removing of linked element now removes `<a>` as well
...@@ -10,7 +30,7 @@ ...@@ -10,7 +30,7 @@
* Fixed bug with changing fill from image to solid colour * Fixed bug with changing fill from image to solid colour
* fixed renderfix method * fixed renderfix method
2.0.1 * 2011-11-18 2.0.1 • 2011-11-18
------------------ ------------------
* Global variables leakage fix * Global variables leakage fix
...@@ -25,7 +45,7 @@ ...@@ -25,7 +45,7 @@
* Fix for `clip-path` * Fix for `clip-path`
* Doc update * Doc update
2.0.0 * 2011-10-03 2.0.0 • 2011-10-03
------------------ ------------------
* Completely changed transformation handling: * Completely changed transformation handling:
......
raphael-min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
raphael.core.js
// ┌─────────────────────────────────────────────────────────────────────┐ \\ // ┌─────────────────────────────────────────────────────────────────────┐ \\
// │ "Raphaël 2.0.2" - JavaScript Vector Library │ \\ // │ "Raphaël 2.1.0" - JavaScript Vector Library │ \\
// ├─────────────────────────────────────────────────────────────────────┤ \\ // ├─────────────────────────────────────────────────────────────────────┤ \\
// │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com) │ \\ // │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com) │ \\
// │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com) │ \\ // │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com) │ \\
...@@ -58,14 +58,14 @@ ...@@ -58,14 +58,14 @@
\*/ \*/
function R(first) { function R(first) {
if (R.is(first, "function")) { if (R.is(first, "function")) {
return loaded ? first() : eve.on("DOMload", first); return loaded ? first() : eve.on("raphael.DOMload", first);
} else if (R.is(first, array)) { } else if (R.is(first, array)) {
return R._engine.create[apply](R, first.splice(0, 3 + R.is(first[0], nu))).add(first); return R._engine.create[apply](R, first.splice(0, 3 + R.is(first[0], nu))).add(first);
} else { } else {
var args = Array.prototype.slice.call(arguments, 0); var args = Array.prototype.slice.call(arguments, 0);
if (R.is(args[args.length - 1], "function")) { if (R.is(args[args.length - 1], "function")) {
var f = args.pop(); var f = args.pop();
return loaded ? f.call(R._engine.create[apply](R, args)) : eve.on("DOMload", function () { return loaded ? f.call(R._engine.create[apply](R, args)) : eve.on("raphael.DOMload", function () {
f.call(R._engine.create[apply](R, args)); f.call(R._engine.create[apply](R, args));
}); });
} else { } else {
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
} }
} }
} }
R.version = "2.0.2"; R.version = "2.1.0";
R.eve = eve; R.eve = eve;
var loaded, var loaded,
separator = /[, ]+/, separator = /[, ]+/,
...@@ -281,6 +281,16 @@ ...@@ -281,6 +281,16 @@
return rectPath(bbox.x, bbox.y, bbox.width, bbox.height); return rectPath(bbox.x, bbox.y, bbox.width, bbox.height);
} }
}, },
/*\
* Raphael.mapPath
[ method ]
**
* Transform the path string with given matrix.
> Parameters
- path (string) path string
- matrix (object) see @Matrix
= (string) transformed path string
\*/
mapPath = R.mapPath = function (path, matrix) { mapPath = R.mapPath = function (path, matrix) {
if (!matrix) { if (!matrix) {
return path; return path;
...@@ -385,6 +395,18 @@ ...@@ -385,6 +395,18 @@
(type == "array" && Array.isArray && Array.isArray(o)) || (type == "array" && Array.isArray && Array.isArray(o)) ||
objectToString.call(o).slice(8, -1).toLowerCase() == type; objectToString.call(o).slice(8, -1).toLowerCase() == type;
}; };
function clone(obj) {
if (Object(obj) !== obj) {
return obj;
}
var res = new obj.constructor;
for (var key in obj) if (obj[has](key)) {
res[key] = clone(obj[key]);
}
return res;
}
/*\ /*\
* Raphael.angle * Raphael.angle
[ method ] [ method ]
...@@ -491,7 +513,7 @@ ...@@ -491,7 +513,7 @@
- newwin (window) new window object - newwin (window) new window object
\*/ \*/
R.setWindow = function (newwin) { R.setWindow = function (newwin) {
eve("setWindow", R, g.win, newwin); eve("raphael.setWindow", R, g.win, newwin);
g.win = newwin; g.win = newwin;
g.doc = g.win.document; g.doc = g.win.document;
if (R._engine.initWin) { if (R._engine.initWin) {
...@@ -1031,8 +1053,8 @@ ...@@ -1031,8 +1053,8 @@
]); ]);
} }
return d; return d;
} }
/*\ /*\
* Raphael.parsePathString * Raphael.parsePathString
[ method ] [ method ]
...@@ -1044,10 +1066,15 @@ ...@@ -1044,10 +1066,15 @@
- pathString (string|array) path string or array of segments (in the last case it will be returned straight away) - pathString (string|array) path string or array of segments (in the last case it will be returned straight away)
= (array) array of segments. = (array) array of segments.
\*/ \*/
R.parsePathString = cacher(function (pathString) { R.parsePathString = function (pathString) {
if (!pathString) { if (!pathString) {
return null; return null;
} }
var pth = paths(pathString);
if (pth.arr) {
return pathClone(pth.arr);
}
var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0}, var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0},
data = []; data = [];
if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
...@@ -1076,8 +1103,9 @@ ...@@ -1076,8 +1103,9 @@
}); });
} }
data.toString = R._path2string; data.toString = R._path2string;
pth.arr = pathClone(data);
return data; return data;
}); };
/*\ /*\
* Raphael.parseTransformString * Raphael.parseTransformString
[ method ] [ method ]
...@@ -1111,6 +1139,24 @@ ...@@ -1111,6 +1139,24 @@
data.toString = R._path2string; data.toString = R._path2string;
return data; return data;
}); });
// PATHS
var paths = function (ps) {
var p = paths.ps = paths.ps || {};
if (p[ps]) {
p[ps].sleep = 100;
} else {
p[ps] = {
sleep: 100
};
}
setTimeout(function () {
for (var key in p) if (p[has](key) && key != ps) {
p[key].sleep--;
!p[key].sleep && delete p[key];
}
});
return p[ps];
};
/*\ /*\
* Raphael.findDotsAtSegment * Raphael.findDotsAtSegment
[ method ] [ method ]
...@@ -1179,14 +1225,359 @@ ...@@ -1179,14 +1225,359 @@
alpha: alpha alpha: alpha
}; };
}; };
/*\
* Raphael.bezierBBox
[ method ]
**
* Utility method
**
* Return bounding box of a given cubic bezier curve
> Parameters
- p1x (number) x of the first point of the curve
- p1y (number) y of the first point of the curve
- c1x (number) x of the first anchor of the curve
- c1y (number) y of the first anchor of the curve
- c2x (number) x of the second anchor of the curve
- c2y (number) y of the second anchor of the curve
- p2x (number) x of the second point of the curve
- p2y (number) y of the second point of the curve
* or
- bez (array) array of six points for bezier curve
= (object) point information in format:
o {
o min: {
o x: (number) x coordinate of the left point
o y: (number) y coordinate of the top point
o }
o max: {
o x: (number) x coordinate of the right point
o y: (number) y coordinate of the bottom point
o }
o }
\*/
R.bezierBBox = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
if (!R.is(p1x, "array")) {
p1x = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y];
}
var bbox = curveDim.apply(null, p1x);
return {
x: bbox.min.x,
y: bbox.min.y,
x2: bbox.max.x,
y2: bbox.max.y,
width: bbox.max.x - bbox.min.x,
height: bbox.max.y - bbox.min.y
};
};
/*\
* Raphael.isPointInsideBBox
[ method ]
**
* Utility method
**
* Returns `true` if given point is inside bounding boxes.
> Parameters
- bbox (string) bounding box
- x (string) x coordinate of the point
- y (string) y coordinate of the point
= (boolean) `true` if point inside
\*/
R.isPointInsideBBox = function (bbox, x, y) {
return x >= bbox.x && x <= bbox.x2 && y >= bbox.y && y <= bbox.y2;
};
/*\
* Raphael.isBBoxIntersect
[ method ]
**
* Utility method
**
* Returns `true` if two bounding boxes intersect
> Parameters
- bbox1 (string) first bounding box
- bbox2 (string) second bounding box
= (boolean) `true` if they intersect
\*/
R.isBBoxIntersect = function (bbox1, bbox2) {
var i = R.isPointInsideBBox;
return i(bbox2, bbox1.x, bbox1.y)
|| i(bbox2, bbox1.x2, bbox1.y)
|| i(bbox2, bbox1.x, bbox1.y2)
|| i(bbox2, bbox1.x2, bbox1.y2)
|| i(bbox1, bbox2.x, bbox2.y)
|| i(bbox1, bbox2.x2, bbox2.y)
|| i(bbox1, bbox2.x, bbox2.y2)
|| i(bbox1, bbox2.x2, bbox2.y2)
|| (bbox1.x < bbox2.x2 && bbox1.x > bbox2.x || bbox2.x < bbox1.x2 && bbox2.x > bbox1.x)
&& (bbox1.y < bbox2.y2 && bbox1.y > bbox2.y || bbox2.y < bbox1.y2 && bbox2.y > bbox1.y);
};
function base3(t, p1, p2, p3, p4) {
var t1 = -3 * p1 + 9 * p2 - 9 * p3 + 3 * p4,
t2 = t * t1 + 6 * p1 - 12 * p2 + 6 * p3;
return t * t2 - 3 * p1 + 3 * p2;
}
function bezlen(x1, y1, x2, y2, x3, y3, x4, y4, z) {
if (z == null) {
z = 1;
}
z = z > 1 ? 1 : z < 0 ? 0 : z;
var z2 = z / 2,
n = 12,
Tvalues = [-0.1252,0.1252,-0.3678,0.3678,-0.5873,0.5873,-0.7699,0.7699,-0.9041,0.9041,-0.9816,0.9816],
Cvalues = [0.2491,0.2491,0.2335,0.2335,0.2032,0.2032,0.1601,0.1601,0.1069,0.1069,0.0472,0.0472],
sum = 0;
for (var i = 0; i < n; i++) {
var ct = z2 * Tvalues[i] + z2,
xbase = base3(ct, x1, x2, x3, x4),
ybase = base3(ct, y1, y2, y3, y4),
comb = xbase * xbase + ybase * ybase;
sum += Cvalues[i] * math.sqrt(comb);
}
return z2 * sum;
}
function getTatLen(x1, y1, x2, y2, x3, y3, x4, y4, ll) {
if (ll < 0 || bezlen(x1, y1, x2, y2, x3, y3, x4, y4) < ll) {
return;
}
var t = 1,
step = t / 2,
t2 = t - step,
l,
e = .01;
l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
while (abs(l - ll) > e) {
step /= 2;
t2 += (l < ll ? 1 : -1) * step;
l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
}
return t2;
}
function intersect(x1, y1, x2, y2, x3, y3, x4, y4) {
if (
mmax(x1, x2) < mmin(x3, x4) ||
mmin(x1, x2) > mmax(x3, x4) ||
mmax(y1, y2) < mmin(y3, y4) ||
mmin(y1, y2) > mmax(y3, y4)
) {
return;
}
var nx = (x1 * y2 - y1 * x2) * (x3 - x4) - (x1 - x2) * (x3 * y4 - y3 * x4),
ny = (x1 * y2 - y1 * x2) * (y3 - y4) - (y1 - y2) * (x3 * y4 - y3 * x4),
denominator = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
if (!denominator) {
return;
}
var px = nx / denominator,
py = ny / denominator,
px2 = +px.toFixed(2),
py2 = +py.toFixed(2);
if (
px2 < +mmin(x1, x2).toFixed(2) ||
px2 > +mmax(x1, x2).toFixed(2) ||
px2 < +mmin(x3, x4).toFixed(2) ||
px2 > +mmax(x3, x4).toFixed(2) ||
py2 < +mmin(y1, y2).toFixed(2) ||
py2 > +mmax(y1, y2).toFixed(2) ||
py2 < +mmin(y3, y4).toFixed(2) ||
py2 > +mmax(y3, y4).toFixed(2)
) {
return;
}
return {x: px, y: py};
}
function inter(bez1, bez2) {
return interHelper(bez1, bez2);
}
function interCount(bez1, bez2) {
return interHelper(bez1, bez2, 1);
}
function interHelper(bez1, bez2, justCount) {
var bbox1 = R.bezierBBox(bez1),
bbox2 = R.bezierBBox(bez2);
if (!R.isBBoxIntersect(bbox1, bbox2)) {
return justCount ? 0 : [];
}
var l1 = bezlen.apply(0, bez1),
l2 = bezlen.apply(0, bez2),
n1 = ~~(l1 / 5),
n2 = ~~(l2 / 5),
dots1 = [],
dots2 = [],
xy = {},
res = justCount ? 0 : [];
for (var i = 0; i < n1 + 1; i++) {
var p = R.findDotsAtSegment.apply(R, bez1.concat(i / n1));
dots1.push({x: p.x, y: p.y, t: i / n1});
}
for (i = 0; i < n2 + 1; i++) {
p = R.findDotsAtSegment.apply(R, bez2.concat(i / n2));
dots2.push({x: p.x, y: p.y, t: i / n2});
}
for (i = 0; i < n1; i++) {
for (var j = 0; j < n2; j++) {
var di = dots1[i],
di1 = dots1[i + 1],
dj = dots2[j],
dj1 = dots2[j + 1],
ci = abs(di1.x - di.x) < .001 ? "y" : "x",
cj = abs(dj1.x - dj.x) < .001 ? "y" : "x",
is = intersect(di.x, di.y, di1.x, di1.y, dj.x, dj.y, dj1.x, dj1.y);
if (is) {
if (xy[is.x.toFixed(4)] == is.y.toFixed(4)) {
continue;
}
xy[is.x.toFixed(4)] = is.y.toFixed(4);
var t1 = di.t + abs((is[ci] - di[ci]) / (di1[ci] - di[ci])) * (di1.t - di.t),
t2 = dj.t + abs((is[cj] - dj[cj]) / (dj1[cj] - dj[cj])) * (dj1.t - dj.t);
if (t1 >= 0 && t1 <= 1 && t2 >= 0 && t2 <= 1) {
if (justCount) {
res++;
} else {
res.push({
x: is.x,
y: is.y,
t1: t1,
t2: t2
});
}
}
}
}
}
return res;
}
/*\
* Raphael.pathIntersection
[ method ]
**
* Utility method
**
* Finds intersections of two paths
> Parameters
- path1 (string) path string
- path2 (string) path string
= (array) dots of intersection
o [
o {
o x: (number) x coordinate of the point
o y: (number) y coordinate of the point
o t1: (number) t value for segment of path1
o t2: (number) t value for segment of path2
o segment1: (number) order number for segment of path1
o segment2: (number) order number for segment of path2
o bez1: (array) eight coordinates representing beziér curve for the segment of path1
o bez2: (array) eight coordinates representing beziér curve for the segment of path2
o }
o ]
\*/
R.pathIntersection = function (path1, path2) {
return interPathHelper(path1, path2);
};
R.pathIntersectionNumber = function (path1, path2) {
return interPathHelper(path1, path2, 1);
};
function interPathHelper(path1, path2, justCount) {
path1 = R._path2curve(path1);
path2 = R._path2curve(path2);
var x1, y1, x2, y2, x1m, y1m, x2m, y2m, bez1, bez2,
res = justCount ? 0 : [];
for (var i = 0, ii = path1.length; i < ii; i++) {
var pi = path1[i];
if (pi[0] == "M") {
x1 = x1m = pi[1];
y1 = y1m = pi[2];
} else {
if (pi[0] == "C") {
bez1 = [x1, y1].concat(pi.slice(1));
x1 = bez1[6];
y1 = bez1[7];
} else {
bez1 = [x1, y1, x1, y1, x1m, y1m, x1m, y1m];
x1 = x1m;
y1 = y1m;
}
for (var j = 0, jj = path2.length; j < jj; j++) {
var pj = path2[j];
if (pj[0] == "M") {
x2 = x2m = pj[1];
y2 = y2m = pj[2];
} else {
if (pj[0] == "C") {
bez2 = [x2, y2].concat(pj.slice(1));
x2 = bez2[6];
y2 = bez2[7];
} else {
bez2 = [x2, y2, x2, y2, x2m, y2m, x2m, y2m];
x2 = x2m;
y2 = y2m;
}
var intr = interHelper(bez1, bez2, justCount);
if (justCount) {
res += intr;
} else {
for (var k = 0, kk = intr.length; k < kk; k++) {
intr[k].segment1 = i;
intr[k].segment2 = j;
intr[k].bez1 = bez1;
intr[k].bez2 = bez2;
}
res = res.concat(intr);
}
}
}
}
}
return res;
}
/*\
* Raphael.isPointInsidePath
[ method ]
**
* Utility method
**
* Returns `true` if given point is inside a given closed path.
> Parameters
- path (string) path string
- x (number) x of the point
- y (number) y of the point
= (boolean) true, if point is inside the path
\*/
R.isPointInsidePath = function (path, x, y) {
var bbox = R.pathBBox(path);
return R.isPointInsideBBox(bbox, x, y) &&
interPathHelper(path, [["M", x, y], ["H", bbox.x2 + 10]], 1) % 2 == 1;
};
R._removedFactory = function (methodname) { R._removedFactory = function (methodname) {
return function () { return function () {
throw new Error("Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object"); eve("raphael.log", null, "Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object", methodname);
}; };
}; };
var pathDimensions = cacher(function (path) { /*\
* Raphael.pathBBox
[ method ]
**
* Utility method
**
* Return bounding box of a given path
> Parameters
- path (string) path string
= (object) bounding box
o {
o x: (number) x coordinate of the left top point of the box
o y: (number) y coordinate of the left top point of the box
o x2: (number) x coordinate of the right bottom point of the box
o y2: (number) y coordinate of the right bottom point of the box
o width: (number) width of the box
o height: (number) height of the box
o }
\*/
var pathDimensions = R.pathBBox = function (path) {
var pth = paths(path);
if (pth.bbox) {
return pth.bbox;
}
if (!path) { if (!path) {
return {x: 0, y: 0, width: 0, height: 0}; return {x: 0, y: 0, width: 0, height: 0, x2: 0, y2: 0};
} }
path = path2curve(path); path = path2curve(path);
var x = 0, var x = 0,
...@@ -1210,36 +1601,30 @@ ...@@ -1210,36 +1601,30 @@
} }
} }
var xmin = mmin[apply](0, X), var xmin = mmin[apply](0, X),
ymin = mmin[apply](0, Y); ymin = mmin[apply](0, Y),
return { xmax = mmax[apply](0, X),
x: xmin, ymax = mmax[apply](0, Y),
y: ymin, bb = {
width: mmax[apply](0, X) - xmin, x: xmin,
height: mmax[apply](0, Y) - ymin y: ymin,
}; x2: xmax,
}, null, function (o) { y2: ymax,
return { width: xmax - xmin,
x: o.x, height: ymax - ymin
y: o.y, };
width: o.width, pth.bbox = clone(bb);
height: o.height return bb;
}; },
}),
pathClone = function (pathArray) { pathClone = function (pathArray) {
var res = []; var res = clone(pathArray);
if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
pathArray = R.parsePathString(pathArray);
}
for (var i = 0, ii = pathArray.length; i < ii; i++) {
res[i] = [];
for (var j = 0, jj = pathArray[i].length; j < jj; j++) {
res[i][j] = pathArray[i][j];
}
}
res.toString = R._path2string; res.toString = R._path2string;
return res; return res;
}, },
pathToRelative = R._pathToRelative = cacher(function (pathArray) { pathToRelative = R._pathToRelative = function (pathArray) {
var pth = paths(pathArray);
if (pth.rel) {
return pathClone(pth.rel);
}
if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
pathArray = R.parsePathString(pathArray); pathArray = R.parsePathString(pathArray);
} }
...@@ -1311,9 +1696,14 @@ ...@@ -1311,9 +1696,14 @@
} }
} }
res.toString = R._path2string; res.toString = R._path2string;
pth.rel = pathClone(res);
return res; return res;
}, 0, pathClone), },
pathToAbsolute = R._pathToAbsolute = cacher(function (pathArray) { pathToAbsolute = R._pathToAbsolute = function (pathArray) {
var pth = paths(pathArray);
if (pth.abs) {
return pathClone(pth.abs);
}
if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
pathArray = R.parsePathString(pathArray); pathArray = R.parsePathString(pathArray);
} }
...@@ -1403,8 +1793,9 @@ ...@@ -1403,8 +1793,9 @@
} }
} }
res.toString = R._path2string; res.toString = R._path2string;
pth.abs = pathClone(res);
return res; return res;
}, null, pathClone), },
l2c = function (x1, y1, x2, y2) { l2c = function (x1, y1, x2, y2) {
return [x1, y1, x2, y2, x2, y2]; return [x1, y1, x2, y2, x2, y2];
}, },
...@@ -1560,6 +1951,10 @@ ...@@ -1560,6 +1951,10 @@
}; };
}), }),
path2curve = R._path2curve = cacher(function (path, path2) { path2curve = R._path2curve = cacher(function (path, path2) {
var pth = !path2 && paths(path);
if (!path2 && pth.curve) {
return pathClone(pth.curve);
}
var p = pathToAbsolute(path), var p = pathToAbsolute(path),
p2 = path2 && pathToAbsolute(path2), p2 = path2 && pathToAbsolute(path2),
attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null}, attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
...@@ -1649,6 +2044,9 @@ ...@@ -1649,6 +2044,9 @@
attrs2.x = p2 && seg2[seg2len - 2]; attrs2.x = p2 && seg2[seg2len - 2];
attrs2.y = p2 && seg2[seg2len - 1]; attrs2.y = p2 && seg2[seg2len - 1];
} }
if (!p2) {
pth.curve = pathClone(p);
}
return p2 ? [p, p2] : p; return p2 ? [p, p2] : p;
}, null, pathClone), }, null, pathClone),
parseDots = R._parseDots = cacher(function (gradient) { parseDots = R._parseDots = cacher(function (gradient) {
...@@ -1730,6 +2128,46 @@ ...@@ -1730,6 +2128,46 @@
el2.prev = el; el2.prev = el;
el.next = el2; el.next = el2;
}, },
/*\
* Raphael.toMatrix
[ method ]
**
* Utility method
**
* Returns matrix of transformations applied to a given path
> Parameters
- path (string) path string
- transform (string|array) transformation string
= (object) @Matrix
\*/
toMatrix = R.toMatrix = function (path, transform) {
var bb = pathDimensions(path),
el = {
_: {
transform: E
},
getBBox: function () {
return bb;
}
};
extractTransform(el, transform);
return el.matrix;
},
/*\
* Raphael.transformPath
[ method ]
**
* Utility method
**
* Returns path transformed by a given transformation
> Parameters
- path (string) path string
- transform (string|array) transformation string
= (string) path
\*/
transformPath = R.transformPath = function (path, transform) {
return mapPath(path, toMatrix(path, transform));
},
extractTransform = R._extractTransform = function (el, tstr) { extractTransform = R._extractTransform = function (el, tstr) {
if (tstr == null) { if (tstr == null) {
return el._.transform; return el._.transform;
...@@ -1806,6 +2244,12 @@ ...@@ -1806,6 +2244,12 @@
} }
} }
/*\
* Element.matrix
[ property (object) ]
**
* Keeps @Matrix object, which represents element transformation
\*/
el.matrix = m; el.matrix = m;
_.sx = sx; _.sx = sx;
...@@ -2310,10 +2754,10 @@ ...@@ -2310,10 +2754,10 @@
o = dragi.el.paper.getElementByPoint(x, y); o = dragi.el.paper.getElementByPoint(x, y);
node.style.display = display; node.style.display = display;
g.win.opera && (next ? parent.insertBefore(node, next) : parent.appendChild(node)); g.win.opera && (next ? parent.insertBefore(node, next) : parent.appendChild(node));
o && eve("drag.over." + dragi.el.id, dragi.el, o); o && eve("raphael.drag.over." + dragi.el.id, dragi.el, o);
x += scrollX; x += scrollX;
y += scrollY; y += scrollY;
eve("drag.move." + dragi.el.id, dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e); eve("raphael.drag.move." + dragi.el.id, dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e);
} }
}, },
dragUp = function (e) { dragUp = function (e) {
...@@ -2323,7 +2767,7 @@ ...@@ -2323,7 +2767,7 @@
while (i--) { while (i--) {
dragi = drag[i]; dragi = drag[i];
dragi.el._drag = {}; dragi.el._drag = {};
eve("drag.end." + dragi.el.id, dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e); eve("raphael.drag.end." + dragi.el.id, dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e);
} }
drag = []; drag = [];
}, },
...@@ -2605,11 +3049,11 @@ ...@@ -2605,11 +3049,11 @@
} }
return this; return this;
} }
eve("data.get." + this.id, this, data[key], key); eve("raphael.data.get." + this.id, this, data[key], key);
return data[key]; return data[key];
} }
data[key] = value; data[key] = value;
eve("data.set." + this.id, this, value, key); eve("raphael.data.set." + this.id, this, value, key);
return this; return this;
}; };
/*\ /*\
...@@ -2699,10 +3143,10 @@ ...@@ -2699,10 +3143,10 @@
this._drag.id = e.identifier; this._drag.id = e.identifier;
!drag.length && R.mousemove(dragMove).mouseup(dragUp); !drag.length && R.mousemove(dragMove).mouseup(dragUp);
drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope}); drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
onstart && eve.on("drag.start." + this.id, onstart); onstart && eve.on("raphael.drag.start." + this.id, onstart);
onmove && eve.on("drag.move." + this.id, onmove); onmove && eve.on("raphael.drag.move." + this.id, onmove);
onend && eve.on("drag.end." + this.id, onend); onend && eve.on("raphael.drag.end." + this.id, onend);
eve("drag.start." + this.id, start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e); eve("raphael.drag.start." + this.id, start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e);
} }
this._drag = {}; this._drag = {};
draggable.push({el: this, start: start}); draggable.push({el: this, start: start});
...@@ -2718,7 +3162,7 @@ ...@@ -2718,7 +3162,7 @@
- f (function) handler for event, first argument would be the element you are dragging over - f (function) handler for event, first argument would be the element you are dragging over
\*/ \*/
elproto.onDragOver = function (f) { elproto.onDragOver = function (f) {
f ? eve.on("drag.over." + this.id, f) : eve.unbind("drag.over." + this.id); f ? eve.on("raphael.drag.over." + this.id, f) : eve.unbind("raphael.drag.over." + this.id);
}; };
/*\ /*\
* Element.undrag * Element.undrag
...@@ -2731,7 +3175,7 @@ ...@@ -2731,7 +3175,7 @@
while (i--) if (draggable[i].el == this) { while (i--) if (draggable[i].el == this) {
this.unmousedown(draggable[i].start); this.unmousedown(draggable[i].start);
draggable.splice(i, 1); draggable.splice(i, 1);
eve.unbind("drag.*." + this.id); eve.unbind("raphael.drag.*." + this.id);
} }
!draggable.length && R.unmousemove(dragMove).unmouseup(dragUp); !draggable.length && R.unmousemove(dragMove).unmouseup(dragUp);
}; };
...@@ -3092,6 +3536,27 @@ ...@@ -3092,6 +3536,27 @@
} }
return this; return this;
}; };
/*\
* Paper.getElementsByPoint
[ method ]
**
* Returns set of elements that have common point inside
**
> Parameters
**
- x (number) x coordinate of the point
- y (number) y coordinate of the point
= (object) @Set
\*/
paperproto.getElementsByPoint = function (x, y) {
var set = this.set();
this.forEach(function (el) {
if (el.isPointInside(x, y)) {
set.push(el);
}
});
return set;
};
function x_y() { function x_y() {
return this.x + S + this.y; return this.x + S + this.y;
} }
...@@ -3099,6 +3564,22 @@ ...@@ -3099,6 +3564,22 @@
return this.x + S + this.y + S + this.width + " \xd7 " + this.height; return this.x + S + this.y + S + this.width + " \xd7 " + this.height;
} }
/*\ /*\
* Element.isPointInside
[ method ]
**
* Determine if given point is inside this element’s shape
**
> Parameters
**
- x (number) x coordinate of the point
- y (number) y coordinate of the point
= (boolean) `true` if point inside the shape
\*/
elproto.isPointInside = function (x, y) {
var rp = this.realPath = this.realPath || getPath[this.type](this);
return R.isPointInsidePath(rp, x, y);
};
/*\
* Element.getBBox * Element.getBBox
[ method ] [ method ]
** **
...@@ -3111,6 +3592,8 @@ ...@@ -3111,6 +3592,8 @@
o { o {
o x: (number) top left corner x o x: (number) top left corner x
o y: (number) top left corner y o y: (number) top left corner y
o x2: (number) bottom right corner x
o y2: (number) bottom right corner y
o width: (number) width o width: (number) width
o height: (number) height o height: (number) height
o } o }
...@@ -3208,35 +3691,10 @@ ...@@ -3208,35 +3691,10 @@
}; };
var curveslengths = {}, var curveslengths = {},
getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) { getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) {
var len = 0,
precision = 100,
name = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y].join(),
cache = curveslengths[name],
old, dot;
!cache && (curveslengths[name] = cache = {data: []});
cache.timer && clearTimeout(cache.timer);
cache.timer = setTimeout(function () {delete curveslengths[name];}, 2e3);
if (length != null && !cache.precision) {
var total = getPointAtSegmentLength(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
cache.precision = ~~total * 10;
cache.data = [];
}
precision = cache.precision || precision;
for (var i = 0; i < precision + 1; i++) {
if (cache.data[i * precision]) {
dot = cache.data[i * precision];
} else {
dot = R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, i / precision);
cache.data[i * precision] = dot;
}
i && (len += pow(pow(old.x - dot.x, 2) + pow(old.y - dot.y, 2), .5));
if (length != null && len >= length) {
return dot;
}
old = dot;
}
if (length == null) { if (length == null) {
return len; return bezlen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
} else {
return R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, getTatLen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length));
} }
}, },
getLengthFactory = function (istotal, subpath) { getLengthFactory = function (istotal, subpath) {
...@@ -3574,14 +4032,14 @@ ...@@ -3574,14 +4032,14 @@
that.attr(set); that.attr(set);
(function (id, that, anim) { (function (id, that, anim) {
setTimeout(function () { setTimeout(function () {
eve("anim.frame." + id, that, anim); eve("raphael.anim.frame." + id, that, anim);
}); });
})(that.id, that, e.anim); })(that.id, that, e.anim);
} else { } else {
(function(f, el, a) { (function(f, el, a) {
setTimeout(function() { setTimeout(function() {
eve("anim.frame." + el.id, el, a); eve("raphael.anim.frame." + el.id, el, a);
eve("anim.finish." + el.id, el, a); eve("raphael.anim.finish." + el.id, el, a);
R.is(f, "function") && f.call(el); R.is(f, "function") && f.call(el);
}); });
})(e.callback, that, e.anim); })(e.callback, that, e.anim);
...@@ -3701,7 +4159,7 @@ ...@@ -3701,7 +4159,7 @@
return solve(t, 1 / (200 * duration)); return solve(t, 1 / (200 * duration));
} }
elproto.onAnimation = function (f) { elproto.onAnimation = function (f) {
f ? eve.on("anim.frame." + this.id, f) : eve.unbind("anim.frame." + this.id); f ? eve.on("raphael.anim.frame." + this.id, f) : eve.unbind("raphael.anim.frame." + this.id);
return this; return this;
}; };
function Animation(anim, ms) { function Animation(anim, ms) {
...@@ -3873,7 +4331,7 @@ ...@@ -3873,7 +4331,7 @@
(to2.matrix.c - m.c) / ms, (to2.matrix.c - m.c) / ms,
(to2.matrix.d - m.d) / ms, (to2.matrix.d - m.d) / ms,
(to2.matrix.e - m.e) / ms, (to2.matrix.e - m.e) / ms,
(to2.matrix.e - m.f) / ms (to2.matrix.f - m.f) / ms
]; ];
// from[attr] = [_.sx, _.sy, _.deg, _.dx, _.dy]; // from[attr] = [_.sx, _.sy, _.deg, _.dx, _.dy];
// var to2 = {_:{}, getBBox: function () { return element.getBBox(); }}; // var to2 = {_:{}, getBBox: function () { return element.getBBox(); }};
...@@ -3963,7 +4421,7 @@ ...@@ -3963,7 +4421,7 @@
isInAnim.initstatus = status; isInAnim.initstatus = status;
isInAnim.start = new Date - isInAnim.ms * status; isInAnim.start = new Date - isInAnim.ms * status;
} }
eve("anim.start." + element.id, element, anim); eve("raphael.anim.start." + element.id, element, anim);
} }
/*\ /*\
* Raphael.animation * Raphael.animation
...@@ -4118,7 +4576,7 @@ ...@@ -4118,7 +4576,7 @@
\*/ \*/
elproto.pause = function (anim) { elproto.pause = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
if (eve("anim.pause." + this.id, this, animationElements[i].anim) !== false) { if (eve("raphael.anim.pause." + this.id, this, animationElements[i].anim) !== false) {
animationElements[i].paused = true; animationElements[i].paused = true;
} }
} }
...@@ -4139,7 +4597,7 @@ ...@@ -4139,7 +4597,7 @@
elproto.resume = function (anim) { elproto.resume = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
var e = animationElements[i]; var e = animationElements[i];
if (eve("anim.resume." + this.id, this, e.anim) !== false) { if (eve("raphael.anim.resume." + this.id, this, e.anim) !== false) {
delete e.paused; delete e.paused;
this.status(e.anim, e.status); this.status(e.anim, e.status);
} }
...@@ -4160,12 +4618,19 @@ ...@@ -4160,12 +4618,19 @@
\*/ \*/
elproto.stop = function (anim) { elproto.stop = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
if (eve("anim.stop." + this.id, this, animationElements[i].anim) !== false) { if (eve("raphael.anim.stop." + this.id, this, animationElements[i].anim) !== false) {
animationElements.splice(i--, 1); animationElements.splice(i--, 1);
} }
} }
return this; return this;
}; };
function stopAnimation(paper) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.paper == paper) {
animationElements.splice(i--, 1);
}
}
eve.on("raphael.remove", stopAnimation);
eve.on("raphael.clear", stopAnimation);
elproto.toString = function () { elproto.toString = function () {
return "Rapha\xebl\u2019s object"; return "Rapha\xebl\u2019s object";
}; };
...@@ -4358,22 +4823,26 @@ ...@@ -4358,22 +4823,26 @@
setproto.getBBox = function () { setproto.getBBox = function () {
var x = [], var x = [],
y = [], y = [],
w = [], x2 = [],
h = []; y2 = [];
for (var i = this.items.length; i--;) if (!this.items[i].removed) { for (var i = this.items.length; i--;) if (!this.items[i].removed) {
var box = this.items[i].getBBox(); var box = this.items[i].getBBox();
x.push(box.x); x.push(box.x);
y.push(box.y); y.push(box.y);
w.push(box.x + box.width); x2.push(box.x + box.width);
h.push(box.y + box.height); y2.push(box.y + box.height);
} }
x = mmin[apply](0, x); x = mmin[apply](0, x);
y = mmin[apply](0, y); y = mmin[apply](0, y);
x2 = mmax[apply](0, x2);
y2 = mmax[apply](0, y2);
return { return {
x: x, x: x,
y: y, y: y,
width: mmax[apply](0, w) - x, x2: x2,
height: mmax[apply](0, h) - y y2: y2,
width: x2 - x,
height: y2 - y
}; };
}; };
setproto.clone = function (s) { setproto.clone = function (s) {
...@@ -4489,30 +4958,28 @@ ...@@ -4489,30 +4958,28 @@
* Paper.print * Paper.print
[ method ] [ method ]
** **
* Creates set of shapes to represent given font at given position with given size. * Creates path that represent given text written using given font at given position with given size.
* Result of the method is set object (see @Paper.set) which contains each letter as separate path object. * Result of the method is path element that contains whole text as a separate path.
** **
> Parameters > Parameters
** **
- x (number) x position of the text - x (number) x position of the text
- y (number) y position of the text - y (number) y position of the text
- text (string) text to print - string (string) text to print
- font (object) font object, see @Paper.getFont - font (object) font object, see @Paper.getFont
- size (number) #optional size of the font, default is `16` - size (number) #optional size of the font, default is `16`
- origin (string) #optional could be `"baseline"` or `"middle"`, default is `"middle"` - origin (string) #optional could be `"baseline"` or `"middle"`, default is `"middle"`
- letter_spacing (number) #optional number in range `-1..1`, default is `0` - letter_spacing (number) #optional number in range `-1..1`, default is `0`
= (object) resulting set of letters = (object) resulting path element, which consist of all letters
> Usage > Usage
| var txt = r.print(10, 50, "print", r.getFont("Museo"), 30).attr({fill: "#fff"}); | var txt = r.print(10, 50, "print", r.getFont("Museo"), 30).attr({fill: "#fff"});
| // following line will paint first letter in red
| txt[0].attr({fill: "#f00"});
\*/ \*/
paperproto.print = function (x, y, string, font, size, origin, letter_spacing) { paperproto.print = function (x, y, string, font, size, origin, letter_spacing) {
origin = origin || "middle"; // baseline|middle origin = origin || "middle"; // baseline|middle
letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1); letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1);
var out = this.set(), var letters = Str(string)[split](E),
letters = Str(string)[split](E),
shift = 0, shift = 0,
notfirst = 0,
path = E, path = E,
scale; scale;
R.is(font, string) && (font = this.getFont(font)); R.is(font, string) && (font = this.getFont(font));
...@@ -4520,20 +4987,30 @@ ...@@ -4520,20 +4987,30 @@
scale = (size || 16) / font.face["units-per-em"]; scale = (size || 16) / font.face["units-per-em"];
var bb = font.face.bbox[split](separator), var bb = font.face.bbox[split](separator),
top = +bb[0], top = +bb[0],
height = +bb[1] + (origin == "baseline" ? bb[3] - bb[1] + (+font.face.descent) : (bb[3] - bb[1]) / 2); lineHeight = bb[3] - bb[1],
shifty = 0,
height = +bb[1] + (origin == "baseline" ? lineHeight + (+font.face.descent) : lineHeight / 2);
for (var i = 0, ii = letters.length; i < ii; i++) { for (var i = 0, ii = letters.length; i < ii; i++) {
var prev = i && font.glyphs[letters[i - 1]] || {}, if (letters[i] == "\n") {
curr = font.glyphs[letters[i]]; shift = 0;
shift += i ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0; curr = 0;
curr && curr.d && out.push(this.path(curr.d).attr({ notfirst = 0;
fill: "#000", shifty += lineHeight;
stroke: "none", } else {
transform: [["t", shift * scale, 0]] var prev = notfirst && font.glyphs[letters[i - 1]] || {},
})); curr = font.glyphs[letters[i]];
shift += notfirst ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0;
notfirst = 1;
}
if (curr && curr.d) {
path += R.transformPath(curr.d, ["t", shift * scale, shifty * scale, "s", scale, scale, top, height, "t", (x - top) / scale, (y - height) / scale]);
}
} }
out.transform(["...s", scale, scale, top, height, "t", (x - top) / scale, (y - height) / scale]);
} }
return out; return this.path(path).attr({
fill: "#000",
stroke: "none"
});
}; };
/*\ /*\
...@@ -4617,7 +5094,7 @@ ...@@ -4617,7 +5094,7 @@
= (string) formated string = (string) formated string
> Usage > Usage
| // this will draw a rectangular shape equivalent to "M10,20h40v50h-40z" | // this will draw a rectangular shape equivalent to "M10,20h40v50h-40z"
| paper.path(Raphael.format("M{x},{y}h{dim.width}v{dim.height}h{dim['negative width']}z", { | paper.path(Raphael.fullfill("M{x},{y}h{dim.width}v{dim.height}h{dim['negative width']}z", {
| x: 10, | x: 10,
| y: 20, | y: 20,
| dim: { | dim: {
...@@ -4699,14 +5176,14 @@ ...@@ -4699,14 +5176,14 @@
doc.readyState = "loading"; doc.readyState = "loading";
} }
function isLoaded() { function isLoaded() {
(/in/).test(doc.readyState) ? setTimeout(isLoaded, 9) : R.eve("DOMload"); (/in/).test(doc.readyState) ? setTimeout(isLoaded, 9) : R.eve("raphael.DOMload");
} }
isLoaded(); isLoaded();
})(document, "DOMContentLoaded"); })(document, "DOMContentLoaded");
oldRaphael.was ? (g.win.Raphael = R) : (Raphael = R); oldRaphael.was ? (g.win.Raphael = R) : (Raphael = R);
eve.on("DOMload", function () { eve.on("raphael.DOMload", function () {
loaded = true; loaded = true;
}); });
})(); })();
raphael.js
// ┌────────────────────────────────────────────────────────────────────┐ \\ // ┌────────────────────────────────────────────────────────────────────┐ \\
// │ Raphaël 2.0.2 - JavaScript Vector Library │ \\ // │ Raphaël 2.1.0 - JavaScript Vector Library │ \\
// ├────────────────────────────────────────────────────────────────────┤ \\ // ├────────────────────────────────────────────────────────────────────┤ \\
// │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com) │ \\ // │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com) │ \\
// │ Copyright © 2008-2012 Sencha Labs (http://sencha.com) │ \\ // │ Copyright © 2008-2012 Sencha Labs (http://sencha.com) │ \\
// ├────────────────────────────────────────────────────────────────────┤ \\ // ├────────────────────────────────────────────────────────────────────┤ \\
// │ Licensed under the MIT (http://raphaeljs.com/license.html) license.│ \\ // │ Licensed under the MIT (http://raphaeljs.com/license.html) license.│ \\
// └────────────────────────────────────────────────────────────────────┘ \\ // └────────────────────────────────────────────────────────────────────┘ \\
// ┌──────────────────────────────────────────────────────────────────────────────────────┐ \\ // ┌──────────────────────────────────────────────────────────────────────────────────────┐ \\
// │ Eve 0.3.4 - JavaScript Events Library │ \\ // │ Eve 0.3.4 - JavaScript Events Library │ \\
// ├──────────────────────────────────────────────────────────────────────────────────────┤ \\ // ├──────────────────────────────────────────────────────────────────────────────────────┤ \\
...@@ -223,7 +224,7 @@ ...@@ -223,7 +224,7 @@
// ┌─────────────────────────────────────────────────────────────────────┐ \\ // ┌─────────────────────────────────────────────────────────────────────┐ \\
// │ "Raphaël 2.0.2" - JavaScript Vector Library │ \\ // │ "Raphaël 2.1.0" - JavaScript Vector Library │ \\
// ├─────────────────────────────────────────────────────────────────────┤ \\ // ├─────────────────────────────────────────────────────────────────────┤ \\
// │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com) │ \\ // │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com) │ \\
// │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com) │ \\ // │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com) │ \\
...@@ -233,14 +234,14 @@ ...@@ -233,14 +234,14 @@
function R(first) { function R(first) {
if (R.is(first, "function")) { if (R.is(first, "function")) {
return loaded ? first() : eve.on("DOMload", first); return loaded ? first() : eve.on("raphael.DOMload", first);
} else if (R.is(first, array)) { } else if (R.is(first, array)) {
return R._engine.create[apply](R, first.splice(0, 3 + R.is(first[0], nu))).add(first); return R._engine.create[apply](R, first.splice(0, 3 + R.is(first[0], nu))).add(first);
} else { } else {
var args = Array.prototype.slice.call(arguments, 0); var args = Array.prototype.slice.call(arguments, 0);
if (R.is(args[args.length - 1], "function")) { if (R.is(args[args.length - 1], "function")) {
var f = args.pop(); var f = args.pop();
return loaded ? f.call(R._engine.create[apply](R, args)) : eve.on("DOMload", function () { return loaded ? f.call(R._engine.create[apply](R, args)) : eve.on("raphael.DOMload", function () {
f.call(R._engine.create[apply](R, args)); f.call(R._engine.create[apply](R, args));
}); });
} else { } else {
...@@ -248,7 +249,7 @@ ...@@ -248,7 +249,7 @@
} }
} }
} }
R.version = "2.0.2"; R.version = "2.1.0";
R.eve = eve; R.eve = eve;
var loaded, var loaded,
separator = /[, ]+/, separator = /[, ]+/,
...@@ -426,6 +427,7 @@ ...@@ -426,6 +427,7 @@
return rectPath(bbox.x, bbox.y, bbox.width, bbox.height); return rectPath(bbox.x, bbox.y, bbox.width, bbox.height);
} }
}, },
mapPath = R.mapPath = function (path, matrix) { mapPath = R.mapPath = function (path, matrix) {
if (!matrix) { if (!matrix) {
return path; return path;
...@@ -481,6 +483,18 @@ ...@@ -481,6 +483,18 @@
(type == "array" && Array.isArray && Array.isArray(o)) || (type == "array" && Array.isArray && Array.isArray(o)) ||
objectToString.call(o).slice(8, -1).toLowerCase() == type; objectToString.call(o).slice(8, -1).toLowerCase() == type;
}; };
function clone(obj) {
if (Object(obj) !== obj) {
return obj;
}
var res = new obj.constructor;
for (var key in obj) if (obj[has](key)) {
res[key] = clone(obj[key]);
}
return res;
}
R.angle = function (x1, y1, x2, y2, x3, y3) { R.angle = function (x1, y1, x2, y2, x3, y3) {
if (x3 == null) { if (x3 == null) {
...@@ -536,7 +550,7 @@ ...@@ -536,7 +550,7 @@
R.setWindow = function (newwin) { R.setWindow = function (newwin) {
eve("setWindow", R, g.win, newwin); eve("raphael.setWindow", R, g.win, newwin);
g.win = newwin; g.win = newwin;
g.doc = g.win.document; g.doc = g.win.document;
if (R._engine.initWin) { if (R._engine.initWin) {
...@@ -926,13 +940,18 @@ ...@@ -926,13 +940,18 @@
]); ]);
} }
return d; return d;
} }
R.parsePathString = cacher(function (pathString) { R.parsePathString = function (pathString) {
if (!pathString) { if (!pathString) {
return null; return null;
} }
var pth = paths(pathString);
if (pth.arr) {
return pathClone(pth.arr);
}
var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0}, var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0},
data = []; data = [];
if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
...@@ -961,8 +980,9 @@ ...@@ -961,8 +980,9 @@
}); });
} }
data.toString = R._path2string; data.toString = R._path2string;
pth.arr = pathClone(data);
return data; return data;
}); };
R.parseTransformString = cacher(function (TString) { R.parseTransformString = cacher(function (TString) {
if (!TString) { if (!TString) {
...@@ -986,6 +1006,24 @@ ...@@ -986,6 +1006,24 @@
data.toString = R._path2string; data.toString = R._path2string;
return data; return data;
}); });
// PATHS
var paths = function (ps) {
var p = paths.ps = paths.ps || {};
if (p[ps]) {
p[ps].sleep = 100;
} else {
p[ps] = {
sleep: 100
};
}
setTimeout(function () {
for (var key in p) if (p[has](key) && key != ps) {
p[key].sleep--;
!p[key].sleep && delete p[key];
}
});
return p[ps];
};
R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) { R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
var t1 = 1 - t, var t1 = 1 - t,
...@@ -1015,14 +1053,254 @@ ...@@ -1015,14 +1053,254 @@
alpha: alpha alpha: alpha
}; };
}; };
R.bezierBBox = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
if (!R.is(p1x, "array")) {
p1x = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y];
}
var bbox = curveDim.apply(null, p1x);
return {
x: bbox.min.x,
y: bbox.min.y,
x2: bbox.max.x,
y2: bbox.max.y,
width: bbox.max.x - bbox.min.x,
height: bbox.max.y - bbox.min.y
};
};
R.isPointInsideBBox = function (bbox, x, y) {
return x >= bbox.x && x <= bbox.x2 && y >= bbox.y && y <= bbox.y2;
};
R.isBBoxIntersect = function (bbox1, bbox2) {
var i = R.isPointInsideBBox;
return i(bbox2, bbox1.x, bbox1.y)
|| i(bbox2, bbox1.x2, bbox1.y)
|| i(bbox2, bbox1.x, bbox1.y2)
|| i(bbox2, bbox1.x2, bbox1.y2)
|| i(bbox1, bbox2.x, bbox2.y)
|| i(bbox1, bbox2.x2, bbox2.y)
|| i(bbox1, bbox2.x, bbox2.y2)
|| i(bbox1, bbox2.x2, bbox2.y2)
|| (bbox1.x < bbox2.x2 && bbox1.x > bbox2.x || bbox2.x < bbox1.x2 && bbox2.x > bbox1.x)
&& (bbox1.y < bbox2.y2 && bbox1.y > bbox2.y || bbox2.y < bbox1.y2 && bbox2.y > bbox1.y);
};
function base3(t, p1, p2, p3, p4) {
var t1 = -3 * p1 + 9 * p2 - 9 * p3 + 3 * p4,
t2 = t * t1 + 6 * p1 - 12 * p2 + 6 * p3;
return t * t2 - 3 * p1 + 3 * p2;
}
function bezlen(x1, y1, x2, y2, x3, y3, x4, y4, z) {
if (z == null) {
z = 1;
}
z = z > 1 ? 1 : z < 0 ? 0 : z;
var z2 = z / 2,
n = 12,
Tvalues = [-0.1252,0.1252,-0.3678,0.3678,-0.5873,0.5873,-0.7699,0.7699,-0.9041,0.9041,-0.9816,0.9816],
Cvalues = [0.2491,0.2491,0.2335,0.2335,0.2032,0.2032,0.1601,0.1601,0.1069,0.1069,0.0472,0.0472],
sum = 0;
for (var i = 0; i < n; i++) {
var ct = z2 * Tvalues[i] + z2,
xbase = base3(ct, x1, x2, x3, x4),
ybase = base3(ct, y1, y2, y3, y4),
comb = xbase * xbase + ybase * ybase;
sum += Cvalues[i] * math.sqrt(comb);
}
return z2 * sum;
}
function getTatLen(x1, y1, x2, y2, x3, y3, x4, y4, ll) {
if (ll < 0 || bezlen(x1, y1, x2, y2, x3, y3, x4, y4) < ll) {
return;
}
var t = 1,
step = t / 2,
t2 = t - step,
l,
e = .01;
l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
while (abs(l - ll) > e) {
step /= 2;
t2 += (l < ll ? 1 : -1) * step;
l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
}
return t2;
}
function intersect(x1, y1, x2, y2, x3, y3, x4, y4) {
if (
mmax(x1, x2) < mmin(x3, x4) ||
mmin(x1, x2) > mmax(x3, x4) ||
mmax(y1, y2) < mmin(y3, y4) ||
mmin(y1, y2) > mmax(y3, y4)
) {
return;
}
var nx = (x1 * y2 - y1 * x2) * (x3 - x4) - (x1 - x2) * (x3 * y4 - y3 * x4),
ny = (x1 * y2 - y1 * x2) * (y3 - y4) - (y1 - y2) * (x3 * y4 - y3 * x4),
denominator = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
if (!denominator) {
return;
}
var px = nx / denominator,
py = ny / denominator,
px2 = +px.toFixed(2),
py2 = +py.toFixed(2);
if (
px2 < +mmin(x1, x2).toFixed(2) ||
px2 > +mmax(x1, x2).toFixed(2) ||
px2 < +mmin(x3, x4).toFixed(2) ||
px2 > +mmax(x3, x4).toFixed(2) ||
py2 < +mmin(y1, y2).toFixed(2) ||
py2 > +mmax(y1, y2).toFixed(2) ||
py2 < +mmin(y3, y4).toFixed(2) ||
py2 > +mmax(y3, y4).toFixed(2)
) {
return;
}
return {x: px, y: py};
}
function inter(bez1, bez2) {
return interHelper(bez1, bez2);
}
function interCount(bez1, bez2) {
return interHelper(bez1, bez2, 1);
}
function interHelper(bez1, bez2, justCount) {
var bbox1 = R.bezierBBox(bez1),
bbox2 = R.bezierBBox(bez2);
if (!R.isBBoxIntersect(bbox1, bbox2)) {
return justCount ? 0 : [];
}
var l1 = bezlen.apply(0, bez1),
l2 = bezlen.apply(0, bez2),
n1 = ~~(l1 / 5),
n2 = ~~(l2 / 5),
dots1 = [],
dots2 = [],
xy = {},
res = justCount ? 0 : [];
for (var i = 0; i < n1 + 1; i++) {
var p = R.findDotsAtSegment.apply(R, bez1.concat(i / n1));
dots1.push({x: p.x, y: p.y, t: i / n1});
}
for (i = 0; i < n2 + 1; i++) {
p = R.findDotsAtSegment.apply(R, bez2.concat(i / n2));
dots2.push({x: p.x, y: p.y, t: i / n2});
}
for (i = 0; i < n1; i++) {
for (var j = 0; j < n2; j++) {
var di = dots1[i],
di1 = dots1[i + 1],
dj = dots2[j],
dj1 = dots2[j + 1],
ci = abs(di1.x - di.x) < .001 ? "y" : "x",
cj = abs(dj1.x - dj.x) < .001 ? "y" : "x",
is = intersect(di.x, di.y, di1.x, di1.y, dj.x, dj.y, dj1.x, dj1.y);
if (is) {
if (xy[is.x.toFixed(4)] == is.y.toFixed(4)) {
continue;
}
xy[is.x.toFixed(4)] = is.y.toFixed(4);
var t1 = di.t + abs((is[ci] - di[ci]) / (di1[ci] - di[ci])) * (di1.t - di.t),
t2 = dj.t + abs((is[cj] - dj[cj]) / (dj1[cj] - dj[cj])) * (dj1.t - dj.t);
if (t1 >= 0 && t1 <= 1 && t2 >= 0 && t2 <= 1) {
if (justCount) {
res++;
} else {
res.push({
x: is.x,
y: is.y,
t1: t1,
t2: t2
});
}
}
}
}
}
return res;
}
R.pathIntersection = function (path1, path2) {
return interPathHelper(path1, path2);
};
R.pathIntersectionNumber = function (path1, path2) {
return interPathHelper(path1, path2, 1);
};
function interPathHelper(path1, path2, justCount) {
path1 = R._path2curve(path1);
path2 = R._path2curve(path2);
var x1, y1, x2, y2, x1m, y1m, x2m, y2m, bez1, bez2,
res = justCount ? 0 : [];
for (var i = 0, ii = path1.length; i < ii; i++) {
var pi = path1[i];
if (pi[0] == "M") {
x1 = x1m = pi[1];
y1 = y1m = pi[2];
} else {
if (pi[0] == "C") {
bez1 = [x1, y1].concat(pi.slice(1));
x1 = bez1[6];
y1 = bez1[7];
} else {
bez1 = [x1, y1, x1, y1, x1m, y1m, x1m, y1m];
x1 = x1m;
y1 = y1m;
}
for (var j = 0, jj = path2.length; j < jj; j++) {
var pj = path2[j];
if (pj[0] == "M") {
x2 = x2m = pj[1];
y2 = y2m = pj[2];
} else {
if (pj[0] == "C") {
bez2 = [x2, y2].concat(pj.slice(1));
x2 = bez2[6];
y2 = bez2[7];
} else {
bez2 = [x2, y2, x2, y2, x2m, y2m, x2m, y2m];
x2 = x2m;
y2 = y2m;
}
var intr = interHelper(bez1, bez2, justCount);
if (justCount) {
res += intr;
} else {
for (var k = 0, kk = intr.length; k < kk; k++) {
intr[k].segment1 = i;
intr[k].segment2 = j;
intr[k].bez1 = bez1;
intr[k].bez2 = bez2;
}
res = res.concat(intr);
}
}
}
}
}
return res;
}
R.isPointInsidePath = function (path, x, y) {
var bbox = R.pathBBox(path);
return R.isPointInsideBBox(bbox, x, y) &&
interPathHelper(path, [["M", x, y], ["H", bbox.x2 + 10]], 1) % 2 == 1;
};
R._removedFactory = function (methodname) { R._removedFactory = function (methodname) {
return function () { return function () {
throw new Error("Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object"); eve("raphael.log", null, "Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object", methodname);
}; };
}; };
var pathDimensions = cacher(function (path) {
var pathDimensions = R.pathBBox = function (path) {
var pth = paths(path);
if (pth.bbox) {
return pth.bbox;
}
if (!path) { if (!path) {
return {x: 0, y: 0, width: 0, height: 0}; return {x: 0, y: 0, width: 0, height: 0, x2: 0, y2: 0};
} }
path = path2curve(path); path = path2curve(path);
var x = 0, var x = 0,
...@@ -1046,36 +1324,30 @@ ...@@ -1046,36 +1324,30 @@
} }
} }
var xmin = mmin[apply](0, X), var xmin = mmin[apply](0, X),
ymin = mmin[apply](0, Y); ymin = mmin[apply](0, Y),
return { xmax = mmax[apply](0, X),
x: xmin, ymax = mmax[apply](0, Y),
y: ymin, bb = {
width: mmax[apply](0, X) - xmin, x: xmin,
height: mmax[apply](0, Y) - ymin y: ymin,
}; x2: xmax,
}, null, function (o) { y2: ymax,
return { width: xmax - xmin,
x: o.x, height: ymax - ymin
y: o.y, };
width: o.width, pth.bbox = clone(bb);
height: o.height return bb;
}; },
}),
pathClone = function (pathArray) { pathClone = function (pathArray) {
var res = []; var res = clone(pathArray);
if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
pathArray = R.parsePathString(pathArray);
}
for (var i = 0, ii = pathArray.length; i < ii; i++) {
res[i] = [];
for (var j = 0, jj = pathArray[i].length; j < jj; j++) {
res[i][j] = pathArray[i][j];
}
}
res.toString = R._path2string; res.toString = R._path2string;
return res; return res;
}, },
pathToRelative = R._pathToRelative = cacher(function (pathArray) { pathToRelative = R._pathToRelative = function (pathArray) {
var pth = paths(pathArray);
if (pth.rel) {
return pathClone(pth.rel);
}
if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
pathArray = R.parsePathString(pathArray); pathArray = R.parsePathString(pathArray);
} }
...@@ -1147,9 +1419,14 @@ ...@@ -1147,9 +1419,14 @@
} }
} }
res.toString = R._path2string; res.toString = R._path2string;
pth.rel = pathClone(res);
return res; return res;
}, 0, pathClone), },
pathToAbsolute = R._pathToAbsolute = cacher(function (pathArray) { pathToAbsolute = R._pathToAbsolute = function (pathArray) {
var pth = paths(pathArray);
if (pth.abs) {
return pathClone(pth.abs);
}
if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
pathArray = R.parsePathString(pathArray); pathArray = R.parsePathString(pathArray);
} }
...@@ -1239,8 +1516,9 @@ ...@@ -1239,8 +1516,9 @@
} }
} }
res.toString = R._path2string; res.toString = R._path2string;
pth.abs = pathClone(res);
return res; return res;
}, null, pathClone), },
l2c = function (x1, y1, x2, y2) { l2c = function (x1, y1, x2, y2) {
return [x1, y1, x2, y2, x2, y2]; return [x1, y1, x2, y2, x2, y2];
}, },
...@@ -1396,6 +1674,10 @@ ...@@ -1396,6 +1674,10 @@
}; };
}), }),
path2curve = R._path2curve = cacher(function (path, path2) { path2curve = R._path2curve = cacher(function (path, path2) {
var pth = !path2 && paths(path);
if (!path2 && pth.curve) {
return pathClone(pth.curve);
}
var p = pathToAbsolute(path), var p = pathToAbsolute(path),
p2 = path2 && pathToAbsolute(path2), p2 = path2 && pathToAbsolute(path2),
attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null}, attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
...@@ -1485,6 +1767,9 @@ ...@@ -1485,6 +1767,9 @@
attrs2.x = p2 && seg2[seg2len - 2]; attrs2.x = p2 && seg2[seg2len - 2];
attrs2.y = p2 && seg2[seg2len - 1]; attrs2.y = p2 && seg2[seg2len - 1];
} }
if (!p2) {
pth.curve = pathClone(p);
}
return p2 ? [p, p2] : p; return p2 ? [p, p2] : p;
}, null, pathClone), }, null, pathClone),
parseDots = R._parseDots = cacher(function (gradient) { parseDots = R._parseDots = cacher(function (gradient) {
...@@ -1566,6 +1851,24 @@ ...@@ -1566,6 +1851,24 @@
el2.prev = el; el2.prev = el;
el.next = el2; el.next = el2;
}, },
toMatrix = R.toMatrix = function (path, transform) {
var bb = pathDimensions(path),
el = {
_: {
transform: E
},
getBBox: function () {
return bb;
}
};
extractTransform(el, transform);
return el.matrix;
},
transformPath = R.transformPath = function (path, transform) {
return mapPath(path, toMatrix(path, transform));
},
extractTransform = R._extractTransform = function (el, tstr) { extractTransform = R._extractTransform = function (el, tstr) {
if (tstr == null) { if (tstr == null) {
return el._.transform; return el._.transform;
...@@ -1642,6 +1945,7 @@ ...@@ -1642,6 +1945,7 @@
} }
} }
el.matrix = m; el.matrix = m;
_.sx = sx; _.sx = sx;
...@@ -2014,10 +2318,10 @@ ...@@ -2014,10 +2318,10 @@
o = dragi.el.paper.getElementByPoint(x, y); o = dragi.el.paper.getElementByPoint(x, y);
node.style.display = display; node.style.display = display;
g.win.opera && (next ? parent.insertBefore(node, next) : parent.appendChild(node)); g.win.opera && (next ? parent.insertBefore(node, next) : parent.appendChild(node));
o && eve("drag.over." + dragi.el.id, dragi.el, o); o && eve("raphael.drag.over." + dragi.el.id, dragi.el, o);
x += scrollX; x += scrollX;
y += scrollY; y += scrollY;
eve("drag.move." + dragi.el.id, dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e); eve("raphael.drag.move." + dragi.el.id, dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e);
} }
}, },
dragUp = function (e) { dragUp = function (e) {
...@@ -2027,7 +2331,7 @@ ...@@ -2027,7 +2331,7 @@
while (i--) { while (i--) {
dragi = drag[i]; dragi = drag[i];
dragi.el._drag = {}; dragi.el._drag = {};
eve("drag.end." + dragi.el.id, dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e); eve("raphael.drag.end." + dragi.el.id, dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e);
} }
drag = []; drag = [];
}, },
...@@ -2098,11 +2402,11 @@ ...@@ -2098,11 +2402,11 @@
} }
return this; return this;
} }
eve("data.get." + this.id, this, data[key], key); eve("raphael.data.get." + this.id, this, data[key], key);
return data[key]; return data[key];
} }
data[key] = value; data[key] = value;
eve("data.set." + this.id, this, value, key); eve("raphael.data.set." + this.id, this, value, key);
return this; return this;
}; };
...@@ -2134,10 +2438,10 @@ ...@@ -2134,10 +2438,10 @@
this._drag.id = e.identifier; this._drag.id = e.identifier;
!drag.length && R.mousemove(dragMove).mouseup(dragUp); !drag.length && R.mousemove(dragMove).mouseup(dragUp);
drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope}); drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
onstart && eve.on("drag.start." + this.id, onstart); onstart && eve.on("raphael.drag.start." + this.id, onstart);
onmove && eve.on("drag.move." + this.id, onmove); onmove && eve.on("raphael.drag.move." + this.id, onmove);
onend && eve.on("drag.end." + this.id, onend); onend && eve.on("raphael.drag.end." + this.id, onend);
eve("drag.start." + this.id, start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e); eve("raphael.drag.start." + this.id, start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e);
} }
this._drag = {}; this._drag = {};
draggable.push({el: this, start: start}); draggable.push({el: this, start: start});
...@@ -2146,7 +2450,7 @@ ...@@ -2146,7 +2450,7 @@
}; };
elproto.onDragOver = function (f) { elproto.onDragOver = function (f) {
f ? eve.on("drag.over." + this.id, f) : eve.unbind("drag.over." + this.id); f ? eve.on("raphael.drag.over." + this.id, f) : eve.unbind("raphael.drag.over." + this.id);
}; };
elproto.undrag = function () { elproto.undrag = function () {
...@@ -2154,7 +2458,7 @@ ...@@ -2154,7 +2458,7 @@
while (i--) if (draggable[i].el == this) { while (i--) if (draggable[i].el == this) {
this.unmousedown(draggable[i].start); this.unmousedown(draggable[i].start);
draggable.splice(i, 1); draggable.splice(i, 1);
eve.unbind("drag.*." + this.id); eve.unbind("raphael.drag.*." + this.id);
} }
!draggable.length && R.unmousemove(dragMove).unmouseup(dragUp); !draggable.length && R.unmousemove(dragMove).unmouseup(dragUp);
}; };
...@@ -2286,6 +2590,16 @@ ...@@ -2286,6 +2590,16 @@
} }
return this; return this;
}; };
paperproto.getElementsByPoint = function (x, y) {
var set = this.set();
this.forEach(function (el) {
if (el.isPointInside(x, y)) {
set.push(el);
}
});
return set;
};
function x_y() { function x_y() {
return this.x + S + this.y; return this.x + S + this.y;
} }
...@@ -2293,6 +2607,11 @@ ...@@ -2293,6 +2607,11 @@
return this.x + S + this.y + S + this.width + " \xd7 " + this.height; return this.x + S + this.y + S + this.width + " \xd7 " + this.height;
} }
elproto.isPointInside = function (x, y) {
var rp = this.realPath = this.realPath || getPath[this.type](this);
return R.isPointInsidePath(rp, x, y);
};
elproto.getBBox = function (isWithoutTransform) { elproto.getBBox = function (isWithoutTransform) {
if (this.removed) { if (this.removed) {
return {}; return {};
...@@ -2360,35 +2679,10 @@ ...@@ -2360,35 +2679,10 @@
}; };
var curveslengths = {}, var curveslengths = {},
getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) { getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) {
var len = 0,
precision = 100,
name = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y].join(),
cache = curveslengths[name],
old, dot;
!cache && (curveslengths[name] = cache = {data: []});
cache.timer && clearTimeout(cache.timer);
cache.timer = setTimeout(function () {delete curveslengths[name];}, 2e3);
if (length != null && !cache.precision) {
var total = getPointAtSegmentLength(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
cache.precision = ~~total * 10;
cache.data = [];
}
precision = cache.precision || precision;
for (var i = 0; i < precision + 1; i++) {
if (cache.data[i * precision]) {
dot = cache.data[i * precision];
} else {
dot = R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, i / precision);
cache.data[i * precision] = dot;
}
i && (len += pow(pow(old.x - dot.x, 2) + pow(old.y - dot.y, 2), .5));
if (length != null && len >= length) {
return dot;
}
old = dot;
}
if (length == null) { if (length == null) {
return len; return bezlen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
} else {
return R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, getTatLen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length));
} }
}, },
getLengthFactory = function (istotal, subpath) { getLengthFactory = function (istotal, subpath) {
...@@ -2635,14 +2929,14 @@ ...@@ -2635,14 +2929,14 @@
that.attr(set); that.attr(set);
(function (id, that, anim) { (function (id, that, anim) {
setTimeout(function () { setTimeout(function () {
eve("anim.frame." + id, that, anim); eve("raphael.anim.frame." + id, that, anim);
}); });
})(that.id, that, e.anim); })(that.id, that, e.anim);
} else { } else {
(function(f, el, a) { (function(f, el, a) {
setTimeout(function() { setTimeout(function() {
eve("anim.frame." + el.id, el, a); eve("raphael.anim.frame." + el.id, el, a);
eve("anim.finish." + el.id, el, a); eve("raphael.anim.finish." + el.id, el, a);
R.is(f, "function") && f.call(el); R.is(f, "function") && f.call(el);
}); });
})(e.callback, that, e.anim); })(e.callback, that, e.anim);
...@@ -2742,7 +3036,7 @@ ...@@ -2742,7 +3036,7 @@
return solve(t, 1 / (200 * duration)); return solve(t, 1 / (200 * duration));
} }
elproto.onAnimation = function (f) { elproto.onAnimation = function (f) {
f ? eve.on("anim.frame." + this.id, f) : eve.unbind("anim.frame." + this.id); f ? eve.on("raphael.anim.frame." + this.id, f) : eve.unbind("raphael.anim.frame." + this.id);
return this; return this;
}; };
function Animation(anim, ms) { function Animation(anim, ms) {
...@@ -2889,7 +3183,7 @@ ...@@ -2889,7 +3183,7 @@
(to2.matrix.c - m.c) / ms, (to2.matrix.c - m.c) / ms,
(to2.matrix.d - m.d) / ms, (to2.matrix.d - m.d) / ms,
(to2.matrix.e - m.e) / ms, (to2.matrix.e - m.e) / ms,
(to2.matrix.e - m.f) / ms (to2.matrix.f - m.f) / ms
]; ];
// from[attr] = [_.sx, _.sy, _.deg, _.dx, _.dy]; // from[attr] = [_.sx, _.sy, _.deg, _.dx, _.dy];
// var to2 = {_:{}, getBBox: function () { return element.getBBox(); }}; // var to2 = {_:{}, getBBox: function () { return element.getBBox(); }};
...@@ -2979,7 +3273,7 @@ ...@@ -2979,7 +3273,7 @@
isInAnim.initstatus = status; isInAnim.initstatus = status;
isInAnim.start = new Date - isInAnim.ms * status; isInAnim.start = new Date - isInAnim.ms * status;
} }
eve("anim.start." + element.id, element, anim); eve("raphael.anim.start." + element.id, element, anim);
} }
R.animation = function (params, ms, easing, callback) { R.animation = function (params, ms, easing, callback) {
...@@ -3057,7 +3351,7 @@ ...@@ -3057,7 +3351,7 @@
elproto.pause = function (anim) { elproto.pause = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
if (eve("anim.pause." + this.id, this, animationElements[i].anim) !== false) { if (eve("raphael.anim.pause." + this.id, this, animationElements[i].anim) !== false) {
animationElements[i].paused = true; animationElements[i].paused = true;
} }
} }
...@@ -3067,7 +3361,7 @@ ...@@ -3067,7 +3361,7 @@
elproto.resume = function (anim) { elproto.resume = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
var e = animationElements[i]; var e = animationElements[i];
if (eve("anim.resume." + this.id, this, e.anim) !== false) { if (eve("raphael.anim.resume." + this.id, this, e.anim) !== false) {
delete e.paused; delete e.paused;
this.status(e.anim, e.status); this.status(e.anim, e.status);
} }
...@@ -3077,12 +3371,19 @@ ...@@ -3077,12 +3371,19 @@
elproto.stop = function (anim) { elproto.stop = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
if (eve("anim.stop." + this.id, this, animationElements[i].anim) !== false) { if (eve("raphael.anim.stop." + this.id, this, animationElements[i].anim) !== false) {
animationElements.splice(i--, 1); animationElements.splice(i--, 1);
} }
} }
return this; return this;
}; };
function stopAnimation(paper) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.paper == paper) {
animationElements.splice(i--, 1);
}
}
eve.on("raphael.remove", stopAnimation);
eve.on("raphael.clear", stopAnimation);
elproto.toString = function () { elproto.toString = function () {
return "Rapha\xebl\u2019s object"; return "Rapha\xebl\u2019s object";
}; };
...@@ -3223,22 +3524,26 @@ ...@@ -3223,22 +3524,26 @@
setproto.getBBox = function () { setproto.getBBox = function () {
var x = [], var x = [],
y = [], y = [],
w = [], x2 = [],
h = []; y2 = [];
for (var i = this.items.length; i--;) if (!this.items[i].removed) { for (var i = this.items.length; i--;) if (!this.items[i].removed) {
var box = this.items[i].getBBox(); var box = this.items[i].getBBox();
x.push(box.x); x.push(box.x);
y.push(box.y); y.push(box.y);
w.push(box.x + box.width); x2.push(box.x + box.width);
h.push(box.y + box.height); y2.push(box.y + box.height);
} }
x = mmin[apply](0, x); x = mmin[apply](0, x);
y = mmin[apply](0, y); y = mmin[apply](0, y);
x2 = mmax[apply](0, x2);
y2 = mmax[apply](0, y2);
return { return {
x: x, x: x,
y: y, y: y,
width: mmax[apply](0, w) - x, x2: x2,
height: mmax[apply](0, h) - y y2: y2,
width: x2 - x,
height: y2 - y
}; };
}; };
setproto.clone = function (s) { setproto.clone = function (s) {
...@@ -3325,9 +3630,9 @@ ...@@ -3325,9 +3630,9 @@
paperproto.print = function (x, y, string, font, size, origin, letter_spacing) { paperproto.print = function (x, y, string, font, size, origin, letter_spacing) {
origin = origin || "middle"; // baseline|middle origin = origin || "middle"; // baseline|middle
letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1); letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1);
var out = this.set(), var letters = Str(string)[split](E),
letters = Str(string)[split](E),
shift = 0, shift = 0,
notfirst = 0,
path = E, path = E,
scale; scale;
R.is(font, string) && (font = this.getFont(font)); R.is(font, string) && (font = this.getFont(font));
...@@ -3335,20 +3640,30 @@ ...@@ -3335,20 +3640,30 @@
scale = (size || 16) / font.face["units-per-em"]; scale = (size || 16) / font.face["units-per-em"];
var bb = font.face.bbox[split](separator), var bb = font.face.bbox[split](separator),
top = +bb[0], top = +bb[0],
height = +bb[1] + (origin == "baseline" ? bb[3] - bb[1] + (+font.face.descent) : (bb[3] - bb[1]) / 2); lineHeight = bb[3] - bb[1],
shifty = 0,
height = +bb[1] + (origin == "baseline" ? lineHeight + (+font.face.descent) : lineHeight / 2);
for (var i = 0, ii = letters.length; i < ii; i++) { for (var i = 0, ii = letters.length; i < ii; i++) {
var prev = i && font.glyphs[letters[i - 1]] || {}, if (letters[i] == "\n") {
curr = font.glyphs[letters[i]]; shift = 0;
shift += i ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0; curr = 0;
curr && curr.d && out.push(this.path(curr.d).attr({ notfirst = 0;
fill: "#000", shifty += lineHeight;
stroke: "none", } else {
transform: [["t", shift * scale, 0]] var prev = notfirst && font.glyphs[letters[i - 1]] || {},
})); curr = font.glyphs[letters[i]];
shift += notfirst ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0;
notfirst = 1;
}
if (curr && curr.d) {
path += R.transformPath(curr.d, ["t", shift * scale, shifty * scale, "s", scale, scale, top, height, "t", (x - top) / scale, (y - height) / scale]);
}
} }
out.transform(["...s", scale, scale, top, height, "t", (x - top) / scale, (y - height) / scale]);
} }
return out; return this.path(path).attr({
fill: "#000",
stroke: "none"
});
}; };
...@@ -3415,14 +3730,14 @@ ...@@ -3415,14 +3730,14 @@
doc.readyState = "loading"; doc.readyState = "loading";
} }
function isLoaded() { function isLoaded() {
(/in/).test(doc.readyState) ? setTimeout(isLoaded, 9) : R.eve("DOMload"); (/in/).test(doc.readyState) ? setTimeout(isLoaded, 9) : R.eve("raphael.DOMload");
} }
isLoaded(); isLoaded();
})(document, "DOMContentLoaded"); })(document, "DOMContentLoaded");
oldRaphael.was ? (g.win.Raphael = R) : (Raphael = R); oldRaphael.was ? (g.win.Raphael = R) : (Raphael = R);
eve.on("DOMload", function () { eve.on("raphael.DOMload", function () {
loaded = true; loaded = true;
}); });
})(); })();
...@@ -4157,12 +4472,12 @@ window.Raphael.svg && function (R) { ...@@ -4157,12 +4472,12 @@ window.Raphael.svg && function (R) {
}; };
elproto.remove = function () { elproto.remove = function () {
if (this.removed) { if (this.removed || !this.node.parentNode) {
return; return;
} }
var paper = this.paper; var paper = this.paper;
paper.__set__ && paper.__set__.exclude(this); paper.__set__ && paper.__set__.exclude(this);
eve.unbind("*.*." + this.id); eve.unbind("raphael.*.*." + this.id);
if (this.gradient) { if (this.gradient) {
paper.defs.removeChild(this.gradient); paper.defs.removeChild(this.gradient);
} }
...@@ -4242,7 +4557,7 @@ window.Raphael.svg && function (R) { ...@@ -4242,7 +4557,7 @@ window.Raphael.svg && function (R) {
params = name; params = name;
} }
for (var key in params) { for (var key in params) {
eve("attr." + key + "." + this.id, this, params[key]); eve("raphael.attr." + key + "." + this.id, this, params[key]);
} }
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
var par = this.paper.customAttributes[key].apply(this, [].concat(params[key])); var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
...@@ -4439,7 +4754,7 @@ window.Raphael.svg && function (R) { ...@@ -4439,7 +4754,7 @@ window.Raphael.svg && function (R) {
return container; return container;
}; };
R._engine.setViewBox = function (x, y, w, h, fit) { R._engine.setViewBox = function (x, y, w, h, fit) {
eve("setViewBox", this, this._viewBox, [x, y, w, h, fit]); eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
var size = mmax(w / this.width, h / this.height), var size = mmax(w / this.width, h / this.height),
top = this.top, top = this.top,
aspectRatio = fit ? "meet" : "xMinYMin", aspectRatio = fit ? "meet" : "xMinYMin",
...@@ -4494,7 +4809,7 @@ window.Raphael.svg && function (R) { ...@@ -4494,7 +4809,7 @@ window.Raphael.svg && function (R) {
}; };
R.prototype.clear = function () { R.prototype.clear = function () {
R.eve("clear", this); R.eve("raphael.clear", this);
var c = this.canvas; var c = this.canvas;
while (c.firstChild) { while (c.firstChild) {
c.removeChild(c.firstChild); c.removeChild(c.firstChild);
...@@ -4506,7 +4821,7 @@ window.Raphael.svg && function (R) { ...@@ -4506,7 +4821,7 @@ window.Raphael.svg && function (R) {
}; };
R.prototype.remove = function () { R.prototype.remove = function () {
eve("remove", this); eve("raphael.remove", this);
this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas); this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
for (var i in this) { for (var i in this) {
this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null; this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
...@@ -5109,11 +5424,11 @@ window.Raphael.vml && function (R) { ...@@ -5109,11 +5424,11 @@ window.Raphael.vml && function (R) {
}; };
}; };
elproto.remove = function () { elproto.remove = function () {
if (this.removed) { if (this.removed || !this.node.parentNode) {
return; return;
} }
this.paper.__set__ && this.paper.__set__.exclude(this); this.paper.__set__ && this.paper.__set__.exclude(this);
R.eve.unbind("*.*." + this.id); R.eve.unbind("raphael.*.*." + this.id);
R._tear(this, this.paper); R._tear(this, this.paper);
this.node.parentNode.removeChild(this.node); this.node.parentNode.removeChild(this.node);
this.shape && this.shape.parentNode.removeChild(this.shape); this.shape && this.shape.parentNode.removeChild(this.shape);
...@@ -5167,7 +5482,7 @@ window.Raphael.vml && function (R) { ...@@ -5167,7 +5482,7 @@ window.Raphael.vml && function (R) {
} }
value == null && R.is(name, "object") && (params = name); value == null && R.is(name, "object") && (params = name);
for (var key in params) { for (var key in params) {
eve("attr." + key + "." + this.id, this, params[key]); eve("raphael.attr." + key + "." + this.id, this, params[key]);
} }
if (params) { if (params) {
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
...@@ -5384,7 +5699,7 @@ window.Raphael.vml && function (R) { ...@@ -5384,7 +5699,7 @@ window.Raphael.vml && function (R) {
return this; return this;
}; };
R._engine.setViewBox = function (x, y, w, h, fit) { R._engine.setViewBox = function (x, y, w, h, fit) {
R.eve("setViewBox", this, this._viewBox, [x, y, w, h, fit]); R.eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
var width = this.width, var width = this.width,
height = this.height, height = this.height,
size = 1 / mmax(w / width, h / height), size = 1 / mmax(w / width, h / height),
...@@ -5466,12 +5781,11 @@ window.Raphael.vml && function (R) { ...@@ -5466,12 +5781,11 @@ window.Raphael.vml && function (R) {
container.appendChild(c); container.appendChild(c);
} }
} }
// plugins.call(res, res, R.fn);
res.renderfix = function () {}; res.renderfix = function () {};
return res; return res;
}; };
R.prototype.clear = function () { R.prototype.clear = function () {
R.eve("clear", this); R.eve("raphael.clear", this);
this.canvas.innerHTML = E; this.canvas.innerHTML = E;
this.span = R._g.doc.createElement("span"); this.span = R._g.doc.createElement("span");
this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;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;";
...@@ -5479,7 +5793,7 @@ window.Raphael.vml && function (R) { ...@@ -5479,7 +5793,7 @@ window.Raphael.vml && function (R) {
this.bottom = this.top = null; this.bottom = this.top = null;
}; };
R.prototype.remove = function () { R.prototype.remove = function () {
R.eve("remove", this); R.eve("raphael.remove", this);
this.canvas.parentNode.removeChild(this.canvas); this.canvas.parentNode.removeChild(this.canvas);
for (var i in this) { for (var i in this) {
this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null; this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
......
raphael.svg.js
...@@ -695,6 +695,7 @@ window.Raphael.svg && function (R) { ...@@ -695,6 +695,7 @@ window.Raphael.svg && function (R) {
* Element.rotate * Element.rotate
[ method ] [ method ]
** **
* Deprecated! Use @Element.transform instead.
* Adds rotation by given angle around given point to the list of * Adds rotation by given angle around given point to the list of
* transformations of the element. * transformations of the element.
> Parameters > Parameters
...@@ -727,6 +728,7 @@ window.Raphael.svg && function (R) { ...@@ -727,6 +728,7 @@ window.Raphael.svg && function (R) {
* Element.scale * Element.scale
[ method ] [ method ]
** **
* Deprecated! Use @Element.transform instead.
* Adds scale by given amount relative to given point to the list of * Adds scale by given amount relative to given point to the list of
* transformations of the element. * transformations of the element.
> Parameters > Parameters
...@@ -762,6 +764,7 @@ window.Raphael.svg && function (R) { ...@@ -762,6 +764,7 @@ window.Raphael.svg && function (R) {
* Element.translate * Element.translate
[ method ] [ method ]
** **
* Deprecated! Use @Element.transform instead.
* Adds translation by given amount to the list of transformations of the element. * Adds translation by given amount to the list of transformations of the element.
> Parameters > Parameters
- dx (number) horisontal shift - dx (number) horisontal shift
...@@ -865,12 +868,12 @@ window.Raphael.svg && function (R) { ...@@ -865,12 +868,12 @@ window.Raphael.svg && function (R) {
* Removes element form the paper. * Removes element form the paper.
\*/ \*/
elproto.remove = function () { elproto.remove = function () {
if (this.removed) { if (this.removed || !this.node.parentNode) {
return; return;
} }
var paper = this.paper; var paper = this.paper;
paper.__set__ && paper.__set__.exclude(this); paper.__set__ && paper.__set__.exclude(this);
eve.unbind("*.*." + this.id); eve.unbind("raphael.*.*." + this.id);
if (this.gradient) { if (this.gradient) {
paper.defs.removeChild(this.gradient); paper.defs.removeChild(this.gradient);
} }
...@@ -1030,7 +1033,7 @@ window.Raphael.svg && function (R) { ...@@ -1030,7 +1033,7 @@ window.Raphael.svg && function (R) {
params = name; params = name;
} }
for (var key in params) { for (var key in params) {
eve("attr." + key + "." + this.id, this, params[key]); eve("raphael.attr." + key + "." + this.id, this, params[key]);
} }
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
var par = this.paper.customAttributes[key].apply(this, [].concat(params[key])); var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
...@@ -1251,7 +1254,7 @@ window.Raphael.svg && function (R) { ...@@ -1251,7 +1254,7 @@ window.Raphael.svg && function (R) {
return container; return container;
}; };
R._engine.setViewBox = function (x, y, w, h, fit) { R._engine.setViewBox = function (x, y, w, h, fit) {
eve("setViewBox", this, this._viewBox, [x, y, w, h, fit]); eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
var size = mmax(w / this.width, h / this.height), var size = mmax(w / this.width, h / this.height),
top = this.top, top = this.top,
aspectRatio = fit ? "meet" : "xMinYMin", aspectRatio = fit ? "meet" : "xMinYMin",
...@@ -1320,7 +1323,7 @@ window.Raphael.svg && function (R) { ...@@ -1320,7 +1323,7 @@ window.Raphael.svg && function (R) {
* Clears the paper, i.e. removes all the elements. * Clears the paper, i.e. removes all the elements.
\*/ \*/
R.prototype.clear = function () { R.prototype.clear = function () {
R.eve("clear", this); R.eve("raphael.clear", this);
var c = this.canvas; var c = this.canvas;
while (c.firstChild) { while (c.firstChild) {
c.removeChild(c.firstChild); c.removeChild(c.firstChild);
...@@ -1337,7 +1340,7 @@ window.Raphael.svg && function (R) { ...@@ -1337,7 +1340,7 @@ window.Raphael.svg && function (R) {
* Removes the paper from the DOM. * Removes the paper from the DOM.
\*/ \*/
R.prototype.remove = function () { R.prototype.remove = function () {
eve("remove", this); eve("raphael.remove", this);
this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas); this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
for (var i in this) { for (var i in this) {
this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null; this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
......
raphael.vml.js
...@@ -582,11 +582,11 @@ window.Raphael.vml && function (R) { ...@@ -582,11 +582,11 @@ window.Raphael.vml && function (R) {
}; };
}; };
elproto.remove = function () { elproto.remove = function () {
if (this.removed) { if (this.removed || !this.node.parentNode) {
return; return;
} }
this.paper.__set__ && this.paper.__set__.exclude(this); this.paper.__set__ && this.paper.__set__.exclude(this);
R.eve.unbind("*.*." + this.id); R.eve.unbind("raphael.*.*." + this.id);
R._tear(this, this.paper); R._tear(this, this.paper);
this.node.parentNode.removeChild(this.node); this.node.parentNode.removeChild(this.node);
this.shape && this.shape.parentNode.removeChild(this.shape); this.shape && this.shape.parentNode.removeChild(this.shape);
...@@ -640,7 +640,7 @@ window.Raphael.vml && function (R) { ...@@ -640,7 +640,7 @@ window.Raphael.vml && function (R) {
} }
value == null && R.is(name, "object") && (params = name); value == null && R.is(name, "object") && (params = name);
for (var key in params) { for (var key in params) {
eve("attr." + key + "." + this.id, this, params[key]); eve("raphael.attr." + key + "." + this.id, this, params[key]);
} }
if (params) { if (params) {
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
...@@ -857,7 +857,7 @@ window.Raphael.vml && function (R) { ...@@ -857,7 +857,7 @@ window.Raphael.vml && function (R) {
return this; return this;
}; };
R._engine.setViewBox = function (x, y, w, h, fit) { R._engine.setViewBox = function (x, y, w, h, fit) {
R.eve("setViewBox", this, this._viewBox, [x, y, w, h, fit]); R.eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
var width = this.width, var width = this.width,
height = this.height, height = this.height,
size = 1 / mmax(w / width, h / height), size = 1 / mmax(w / width, h / height),
...@@ -939,12 +939,11 @@ window.Raphael.vml && function (R) { ...@@ -939,12 +939,11 @@ window.Raphael.vml && function (R) {
container.appendChild(c); container.appendChild(c);
} }
} }
// plugins.call(res, res, R.fn);
res.renderfix = function () {}; res.renderfix = function () {};
return res; return res;
}; };
R.prototype.clear = function () { R.prototype.clear = function () {
R.eve("clear", this); R.eve("raphael.clear", this);
this.canvas.innerHTML = E; this.canvas.innerHTML = E;
this.span = R._g.doc.createElement("span"); this.span = R._g.doc.createElement("span");
this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;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;";
...@@ -952,7 +951,7 @@ window.Raphael.vml && function (R) { ...@@ -952,7 +951,7 @@ window.Raphael.vml && function (R) {
this.bottom = this.top = null; this.bottom = this.top = null;
}; };
R.prototype.remove = function () { R.prototype.remove = function () {
R.eve("remove", this); R.eve("raphael.remove", this);
this.canvas.parentNode.removeChild(this.canvas); this.canvas.parentNode.removeChild(this.canvas);
for (var i in this) { for (var i in this) {
this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null; this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
......
reference.html
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment