Skip to content

殷洪（管理员） / raphael

Go to a project
Commit c472a261 by Dmitry Baranovskiy
Options

2.0.2

parent 300aa589
Showing with 253 additions and 120 deletions
history.md
2.0.2 * 2011-11-18
------------------
* Removing of linked element now removes `<a>` as well
* Fixed white space recognition in passed strings
* Added special case for path that has only one Catmull-Rom curve
* Fixed toTransformString method
* Fixed animateWith method
* Fixed “target” attribute clearing
* Fixed bug with changing fill from image to solid colour
* fixed renderfix method
2.0.1 * 2011-11-18 2.0.1 * 2011-11-18
------------------ ------------------
......
make 0 → 100755
#!/usr/bin/env node
var setup = {
input: {
core: "raphael.core.js",
svg: "raphael.svg.js",
vml: "raphael.vml.js",
eve: "../mywork/eve/eve.js",
copy: "copy.js"
},
output: {
"raphael-min.js": function () {
return this.copy + "\n" + minify(this.eve + this.core + this.svg + this.vml);
},
"raphael.js": function () {
return this.copy + "\n" + this.eve + "\n\n" + this.core + "\n\n" + this.svg + "\n\n" + this.vml;
},
"raphael.pro-min.js": function () {
return this.copy + "\n" + minify(this.eve + this.core + this.svg);
},
"raphael.pro.js": function () {
return this.copy + "\n" + this.eve + "\n\n" + this.core + "\n\n" + this.svg ;
},
}
},
ujs = require("/Users/dmitry/Sites/UglifyJS/uglify-js.js"),
jsp = ujs.parser,
pro = ujs.uglify,
fs = require("fs"),
rxdr = /\/\*\\[\s\S]+?\\\*\//g;
function minify(code) {
return pro.gen_code(pro.ast_squeeze(pro.ast_mangle(jsp.parse(code))));
}
var files = {};
for (var file in setup.input) {
files[file] = String(fs.readFileSync(setup.input[file], "utf8")).replace(rxdr, "");
}
for (file in setup.output) {
(function (file) {
fs.writeFile(file, setup.output[file].call(files), function () {
console.log("Saved to \033[32m" + file + "\033[0m\n");
});
})(file);
}
\ No newline at end of file
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.1" - JavaScript Vector Library │ \\ // │ "Raphaël 2.0.2" - 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) │ \\
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
} }
} }
} }
R.version = "2.0.1"; R.version = "2.0.2";
R.eve = eve; R.eve = eve;
var loaded, var loaded,
separator = /[, ]+/, separator = /[, ]+/,
...@@ -225,13 +225,14 @@ ...@@ -225,13 +225,14 @@
x: nu, x: nu,
y: nu y: nu
}, },
commaSpaces = /\s*,\s*/, whitespace = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]/g,
commaSpaces = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/,
hsrg = {hs: 1, rg: 1}, hsrg = {hs: 1, rg: 1},
p2s = /,?([achlmqrstvxz]),?/gi, p2s = /,?([achlmqrstvxz]),?/gi,
pathCommand = /([achlmrqstvz])[\s,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?\s*,?\s*)+)/ig, pathCommand = /([achlmrqstvz])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
tCommand = /([rstm])[\s,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?\s*,?\s*)+)/ig, tCommand = /([rstm])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
pathValues = /(-?\d*\.?\d*(?:e[\-+]?\d+)?)\s*,?\s*/ig, pathValues = /(-?\d*\.?\d*(?:e[\-+]?\d+)?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/ig,
radial_gradient = R._radial_gradient = /^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/, radial_gradient = R._radial_gradient = /^r(?:\(([^,]+?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*([^\)]+?)\))?/,
eldata = {}, eldata = {},
sortByKey = function (a, b) { sortByKey = function (a, b) {
return a.key - b.key; return a.key - b.key;
...@@ -995,31 +996,43 @@ ...@@ -995,31 +996,43 @@
}; };
// http://schepers.cc/getting-to-the-point // http://schepers.cc/getting-to-the-point
function catmullRom2bezier(crp) { function catmullRom2bezier(crp, z) {
var d = []; var d = [];
for (var i = 0, iLen = crp.length; iLen - 2 > i; i += 2) { for (var i = 0, iLen = crp.length; iLen - 2 * !z > i; i += 2) {
var p = [{x: +crp[i], y: +crp[i + 1]}, var p = [
{x: +crp[i], y: +crp[i + 1]}, {x: +crp[i - 2], y: +crp[i - 1]},
{x: +crp[i + 2], y: +crp[i + 3]}, {x: +crp[i], y: +crp[i + 1]},
{x: +crp[i + 4], y: +crp[i + 5]}]; {x: +crp[i + 2], y: +crp[i + 3]},
if (iLen - 4 == i) { {x: +crp[i + 4], y: +crp[i + 5]}
p[0] = {x: +crp[i - 2], y: +crp[i - 1]}; ];
p[3] = p[2]; if (z) {
} else if (i) { if (!i) {
p[0] = {x: +crp[i - 2], y: +crp[i - 1]}; p[0] = {x: +crp[iLen - 2], y: +crp[iLen - 1]};
} else if (iLen - 4 == i) {
p[3] = {x: +crp[0], y: +crp[1]};
} else if (iLen - 2 == i) {
p[2] = {x: +crp[0], y: +crp[1]};
p[3] = {x: +crp[2], y: +crp[3]};
}
} else {
if (iLen - 4 == i) {
p[3] = p[2];
} else if (!i) {
p[0] = {x: +crp[i], y: +crp[i + 1]};
}
} }
d.push(["C", d.push(["C",
(-p[0].x + 6 * p[1].x + p[2].x) / 6, (-p[0].x + 6 * p[1].x + p[2].x) / 6,
(-p[0].y + 6 * p[1].y + p[2].y) / 6, (-p[0].y + 6 * p[1].y + p[2].y) / 6,
(p[1].x + 6 * p[2].x - p[3].x) / 6, (p[1].x + 6 * p[2].x - p[3].x) / 6,
(p[1].y + 6*p[2].y - p[3].y) / 6, (p[1].y + 6*p[2].y - p[3].y) / 6,
p[2].x, p[2].x,
p[2].y p[2].y
]); ]);
} }
return d; return d;
} }
/*\ /*\
* Raphael.parsePathString * Raphael.parsePathString
[ method ] [ method ]
...@@ -1321,6 +1334,7 @@ ...@@ -1321,6 +1334,7 @@
start++; start++;
res[0] = ["M", x, y]; res[0] = ["M", x, y];
} }
var crz = pathArray.length == 3 && pathArray[0][0] == "M" && pathArray[1][0].toUpperCase() == "R" && pathArray[2][0].toUpperCase() == "Z";
for (var r, pa, i = start, ii = pathArray.length; i < ii; i++) { for (var r, pa, i = start, ii = pathArray.length; i < ii; i++) {
res.push(r = []); res.push(r = []);
pa = pathArray[i]; pa = pathArray[i];
...@@ -1349,7 +1363,7 @@ ...@@ -1349,7 +1363,7 @@
dots[++j] = +dots[j] + y; dots[++j] = +dots[j] + y;
} }
res.pop(); res.pop();
res = res[concat](catmullRom2bezier(dots)); res = res[concat](catmullRom2bezier(dots, crz));
break; break;
case "M": case "M":
mx = +pa[1] + x; mx = +pa[1] + x;
...@@ -1362,7 +1376,7 @@ ...@@ -1362,7 +1376,7 @@
} else if (pa[0] == "R") { } else if (pa[0] == "R") {
dots = [x, y][concat](pa.slice(1)); dots = [x, y][concat](pa.slice(1));
res.pop(); res.pop();
res = res[concat](catmullRom2bezier(dots)); res = res[concat](catmullRom2bezier(dots, crz));
r = ["R"][concat](pa.slice(-2)); r = ["R"][concat](pa.slice(-2));
} else { } else {
for (var k = 0, kk = pa.length; k < kk; k++) { for (var k = 0, kk = pa.length; k < kk; k++) {
...@@ -2170,7 +2184,7 @@ ...@@ -2170,7 +2184,7 @@
s.scalex = +s.scalex.toFixed(4); s.scalex = +s.scalex.toFixed(4);
s.scaley = +s.scaley.toFixed(4); s.scaley = +s.scaley.toFixed(4);
s.rotate = +s.rotate.toFixed(4); s.rotate = +s.rotate.toFixed(4);
return (s.dx && s.dy ? "t" + [s.dx, s.dy] : E) + return (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) +
(s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) + (s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) +
(s.rotate ? "r" + [s.rotate, 0, 0] : E); (s.rotate ? "r" + [s.rotate, 0, 0] : E);
} else { } else {
...@@ -2546,7 +2560,7 @@ ...@@ -2546,7 +2560,7 @@
return this; return this;
}; };
R["un" + eventName] = elproto["un" + eventName] = function (fn) { R["un" + eventName] = elproto["un" + eventName] = function (fn) {
var events = this.events, var events = this.events || [],
l = events.length; l = events.length;
while (l--) if (events[l].name == eventName && events[l].f == fn) { while (l--) if (events[l].name == eventName && events[l].f == fn) {
events[l].unbind(); events[l].unbind();
...@@ -2815,10 +2829,12 @@ ...@@ -2815,10 +2829,12 @@
# <tr><td>A</td><td>elliptical arc</td><td>(rx ry x-axis-rotation large-arc-flag sweep-flag x y)+</td></tr> # <tr><td>A</td><td>elliptical arc</td><td>(rx ry x-axis-rotation large-arc-flag sweep-flag x y)+</td></tr>
# <tr><td>R</td><td><a href="http://en.wikipedia.org/wiki/Catmull–Rom_spline#Catmull.E2.80.93Rom_spline">Catmull-Rom curveto</a>*</td><td>x1 y1 (x y)+</td></tr></tbody></table> # <tr><td>R</td><td><a href="http://en.wikipedia.org/wiki/Catmull–Rom_spline#Catmull.E2.80.93Rom_spline">Catmull-Rom curveto</a>*</td><td>x1 y1 (x y)+</td></tr></tbody></table>
* * “Catmull-Rom curveto” is a not standard SVG command and added in 2.0 to make life easier. * * “Catmull-Rom curveto” is a not standard SVG command and added in 2.0 to make life easier.
* Note: there is a special case when path consist of just three commands: “M10,10R…z”. In this case path will smoothly connects to its beginning.
> Usage > Usage
| var c = paper.path("M10 10L90 90"); | var c = paper.path("M10 10L90 90");
| // draw a diagonal line: | // draw a diagonal line:
| // move to 10,10, line to 90,90 | // move to 10,10, line to 90,90
* For example of path strings, check out these icons: http://raphaeljs.com/icons/
\*/ \*/
paperproto.path = function (pathString) { paperproto.path = function (pathString) {
pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E); pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E);
...@@ -2933,13 +2949,6 @@ ...@@ -2933,13 +2949,6 @@
** **
- width (number) new width of the canvas - width (number) new width of the canvas
- height (number) new height of the canvas - height (number) new height of the canvas
> Usage
| var st = paper.set();
| st.push(
| paper.circle(10, 10, 5),
| paper.circle(30, 10, 5)
| );
| st.attr({fill: "red"});
\*/ \*/
paperproto.setSize = function (width, height) { paperproto.setSize = function (width, height) {
return R._engine.setSize.call(this, width, height); return R._engine.setSize.call(this, width, height);
...@@ -3068,6 +3077,10 @@ ...@@ -3068,6 +3077,10 @@
- callback (function) function to run - callback (function) function to run
- thisArg (object) context object for the callback - thisArg (object) context object for the callback
= (object) Paper object = (object) Paper object
> Usage
| paper.forEach(function (el) {
| el.attr({ stroke: "blue" });
| });
\*/ \*/
paperproto.forEach = function (callback, thisArg) { paperproto.forEach = function (callback, thisArg) {
var bot = this.bottom; var bot = this.bottom;
...@@ -3600,7 +3613,7 @@ ...@@ -3600,7 +3613,7 @@
** **
> Parameters > Parameters
** **
- element (object) element to sync with - el (object) element to sync with
- anim (object) animation to sync with - anim (object) animation to sync with
- params (object) #optional final attributes for the element, see also @Element.attr - params (object) #optional final attributes for the element, see also @Element.attr
- ms (number) #optional number of milliseconds for animation to run - ms (number) #optional number of milliseconds for animation to run
...@@ -3613,10 +3626,27 @@ ...@@ -3613,10 +3626,27 @@
** **
= (object) original element = (object) original element
\*/ \*/
elproto.animateWith = function (element, anim, params, ms, easing, callback) { elproto.animateWith = function (el, anim, params, ms, easing, callback) {
var a = params ? R.animation(params, ms, easing, callback) : anim, var element = this;
status = element.status(anim); if (element.removed) {
return this.animate(a).status(a, status * anim.ms / a.ms); callback && callback.call(element);
return element;
}
var a = params instanceof Animation ? params : R.animation(params, ms, easing, callback),
x, y;
runAnimation(a, element, a.percents[0], null, element.attr());
for (var i = 0, ii = animationElements.length; i < ii; i++) {
if (animationElements[i].anim == anim && animationElements[i].el == el) {
animationElements[ii - 1].start = animationElements[i].start;
break;
}
}
return element;
//
//
// var a = params ? R.animation(params, ms, easing, callback) : anim,
// status = element.status(anim);
// return this.animate(a).status(a, status * anim.ms / a.ms);
}; };
function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) { function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) {
var cx = 3 * p1x, var cx = 3 * p1x,
...@@ -4314,7 +4344,7 @@ ...@@ -4314,7 +4344,7 @@
var anim = R.animation(params, ms, easing, collector); var anim = R.animation(params, ms, easing, collector);
item = this.items[--i].animate(anim); item = this.items[--i].animate(anim);
while (i--) { while (i--) {
this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, anim); this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, anim, anim);
} }
return this; return this;
}; };
...@@ -4517,7 +4547,7 @@ ...@@ -4517,7 +4547,7 @@
- json (array) - json (array)
= (object) resulting set of imported elements = (object) resulting set of imported elements
> Usage > Usage
| paper.import([ | paper.add([
| { | {
| type: "circle", | type: "circle",
| cx: 10, | cx: 10,
...@@ -4651,8 +4681,8 @@ ...@@ -4651,8 +4681,8 @@
| this.attr({fill: "#f00"}); | this.attr({fill: "#f00"});
| }; | };
| Raphael.st.red = function () { | Raphael.st.red = function () {
| this.forEach(function () { | this.forEach(function (el) {
| this.red(); | el.red();
| }); | });
| }; | };
| // then use it | // then use it
......
raphael.js
// ┌─────────────────────────────────────────────────────────────────────┐ \\ // ┌────────────────────────────────────────────────────────────────────┐ \\
// │ Raphaël 2.0.1 - JavaScript Vector Library │ \\ // │ Raphaël 2.0.2 - JavaScript Vector Library │ \\
// ├─────────────────────────────────────────────────────────────────────┤ \\ // ├────────────────────────────────────────────────────────────────────┤ \\
// │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com) │ \\ // │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com) │ \\
// │ Copyright (c) 2008-2011 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.4.0 - JavaScript Events Library │ \\ // │ Eve 0.3.4 - JavaScript Events Library │ \\
// ├──────────────────────────────────────────────────────────────────────────────────────┤ \\ // ├──────────────────────────────────────────────────────────────────────────────────────┤ \\
// │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://dmitry.baranovskiy.com/) │ \\ // │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://dmitry.baranovskiy.com/) │ \\
// │ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. │ \\ // │ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. │ \\
// └──────────────────────────────────────────────────────────────────────────────────────┘ \\ // └──────────────────────────────────────────────────────────────────────────────────────┘ \\
(function (glob) { (function (glob) {
var version = "0.4.0", var version = "0.3.4",
has = "hasOwnProperty", has = "hasOwnProperty",
separator = /[\.\/]/, separator = /[\.\/]/,
wildcard = "*", wildcard = "*",
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
indexed = [], indexed = [],
queue = {}, queue = {},
out = [], out = [],
ce = current_event,
errors = []; errors = [];
current_event = name; current_event = name;
stop = 0; stop = 0;
...@@ -61,16 +62,14 @@ ...@@ -61,16 +62,14 @@
if (l.zIndex == indexed[z]) { if (l.zIndex == indexed[z]) {
out.push(l.apply(scope, args)); out.push(l.apply(scope, args));
if (stop) { if (stop) {
stop = oldstop; break;
return out;
} }
do { do {
z++; z++;
l = queue[indexed[z]]; l = queue[indexed[z]];
l && out.push(l.apply(scope, args)); l && out.push(l.apply(scope, args));
if (stop) { if (stop) {
stop = oldstop; break;
return out;
} }
} while (l) } while (l)
} else { } else {
...@@ -79,12 +78,12 @@ ...@@ -79,12 +78,12 @@
} else { } else {
out.push(l.apply(scope, args)); out.push(l.apply(scope, args));
if (stop) { if (stop) {
stop = oldstop; break;
return out;
} }
} }
} }
stop = oldstop; stop = oldstop;
current_event = ce;
return out.length ? out : null; return out.length ? out : null;
}; };
...@@ -152,7 +151,8 @@ ...@@ -152,7 +151,8 @@
return current_event; return current_event;
}; };
eve.unbind = function (name, f) {
eve.off = eve.unbind = function (name, f) {
var names = name.split(separator), var names = name.split(separator),
e, e,
key, key,
...@@ -207,8 +207,9 @@ ...@@ -207,8 +207,9 @@
eve.once = function (name, f) { eve.once = function (name, f) {
var f2 = function () { var f2 = function () {
f.apply(this, arguments); var res = f.apply(this, arguments);
eve.unbind(name, f2); eve.unbind(name, f2);
return res;
}; };
return eve.on(name, f2); return eve.on(name, f2);
}; };
...@@ -217,11 +218,12 @@ ...@@ -217,11 +218,12 @@
eve.toString = function () { eve.toString = function () {
return "You are running Eve " + version; return "You are running Eve " + version;
}; };
(typeof module != "undefined" && module.exports) ? (module.exports = eve) : (glob.eve = eve); (typeof module != "undefined" && module.exports) ? (module.exports = eve) : (typeof define != "undefined" ? (define("eve", [], function() { return eve; })) : (glob.eve = eve));
})(this); })(this);
// ┌─────────────────────────────────────────────────────────────────────┐ \\ // ┌─────────────────────────────────────────────────────────────────────┐ \\
// │ "Raphaël 2.0.1" - JavaScript Vector Library │ \\ // │ "Raphaël 2.0.2" - 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) │ \\
...@@ -246,7 +248,7 @@ ...@@ -246,7 +248,7 @@
} }
} }
} }
R.version = "2.0.1"; R.version = "2.0.2";
R.eve = eve; R.eve = eve;
var loaded, var loaded,
separator = /[, ]+/, separator = /[, ]+/,
...@@ -368,13 +370,14 @@ ...@@ -368,13 +370,14 @@
x: nu, x: nu,
y: nu y: nu
}, },
commaSpaces = /\s*,\s*/, whitespace = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]/g,
commaSpaces = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/,
hsrg = {hs: 1, rg: 1}, hsrg = {hs: 1, rg: 1},
p2s = /,?([achlmqrstvxz]),?/gi, p2s = /,?([achlmqrstvxz]),?/gi,
pathCommand = /([achlmrqstvz])[\s,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?\s*,?\s*)+)/ig, pathCommand = /([achlmrqstvz])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
tCommand = /([rstm])[\s,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?\s*,?\s*)+)/ig, tCommand = /([rstm])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
pathValues = /(-?\d*\.?\d*(?:e[\-+]?\d+)?)\s*,?\s*/ig, pathValues = /(-?\d*\.?\d*(?:e[\-+]?\d+)?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/ig,
radial_gradient = R._radial_gradient = /^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/, radial_gradient = R._radial_gradient = /^r(?:\(([^,]+?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*([^\)]+?)\))?/,
eldata = {}, eldata = {},
sortByKey = function (a, b) { sortByKey = function (a, b) {
return a.key - b.key; return a.key - b.key;
...@@ -888,31 +891,43 @@ ...@@ -888,31 +891,43 @@
}; };
// http://schepers.cc/getting-to-the-point // http://schepers.cc/getting-to-the-point
function catmullRom2bezier(crp) { function catmullRom2bezier(crp, z) {
var d = []; var d = [];
for (var i = 0, iLen = crp.length; iLen - 2 > i; i += 2) { for (var i = 0, iLen = crp.length; iLen - 2 * !z > i; i += 2) {
var p = [{x: +crp[i], y: +crp[i + 1]}, var p = [
{x: +crp[i], y: +crp[i + 1]}, {x: +crp[i - 2], y: +crp[i - 1]},
{x: +crp[i + 2], y: +crp[i + 3]}, {x: +crp[i], y: +crp[i + 1]},
{x: +crp[i + 4], y: +crp[i + 5]}]; {x: +crp[i + 2], y: +crp[i + 3]},
if (iLen - 4 == i) { {x: +crp[i + 4], y: +crp[i + 5]}
p[0] = {x: +crp[i - 2], y: +crp[i - 1]}; ];
p[3] = p[2]; if (z) {
} else if (i) { if (!i) {
p[0] = {x: +crp[i - 2], y: +crp[i - 1]}; p[0] = {x: +crp[iLen - 2], y: +crp[iLen - 1]};
} else if (iLen - 4 == i) {
p[3] = {x: +crp[0], y: +crp[1]};
} else if (iLen - 2 == i) {
p[2] = {x: +crp[0], y: +crp[1]};
p[3] = {x: +crp[2], y: +crp[3]};
}
} else {
if (iLen - 4 == i) {
p[3] = p[2];
} else if (!i) {
p[0] = {x: +crp[i], y: +crp[i + 1]};
}
} }
d.push(["C", d.push(["C",
(-p[0].x + 6 * p[1].x + p[2].x) / 6, (-p[0].x + 6 * p[1].x + p[2].x) / 6,
(-p[0].y + 6 * p[1].y + p[2].y) / 6, (-p[0].y + 6 * p[1].y + p[2].y) / 6,
(p[1].x + 6 * p[2].x - p[3].x) / 6, (p[1].x + 6 * p[2].x - p[3].x) / 6,
(p[1].y + 6*p[2].y - p[3].y) / 6, (p[1].y + 6*p[2].y - p[3].y) / 6,
p[2].x, p[2].x,
p[2].y p[2].y
]); ]);
} }
return d; return d;
} }
R.parsePathString = cacher(function (pathString) { R.parsePathString = cacher(function (pathString) {
if (!pathString) { if (!pathString) {
...@@ -1155,6 +1170,7 @@ ...@@ -1155,6 +1170,7 @@
start++; start++;
res[0] = ["M", x, y]; res[0] = ["M", x, y];
} }
var crz = pathArray.length == 3 && pathArray[0][0] == "M" && pathArray[1][0].toUpperCase() == "R" && pathArray[2][0].toUpperCase() == "Z";
for (var r, pa, i = start, ii = pathArray.length; i < ii; i++) { for (var r, pa, i = start, ii = pathArray.length; i < ii; i++) {
res.push(r = []); res.push(r = []);
pa = pathArray[i]; pa = pathArray[i];
...@@ -1183,7 +1199,7 @@ ...@@ -1183,7 +1199,7 @@
dots[++j] = +dots[j] + y; dots[++j] = +dots[j] + y;
} }
res.pop(); res.pop();
res = res[concat](catmullRom2bezier(dots)); res = res[concat](catmullRom2bezier(dots, crz));
break; break;
case "M": case "M":
mx = +pa[1] + x; mx = +pa[1] + x;
...@@ -1196,7 +1212,7 @@ ...@@ -1196,7 +1212,7 @@
} else if (pa[0] == "R") { } else if (pa[0] == "R") {
dots = [x, y][concat](pa.slice(1)); dots = [x, y][concat](pa.slice(1));
res.pop(); res.pop();
res = res[concat](catmullRom2bezier(dots)); res = res[concat](catmullRom2bezier(dots, crz));
r = ["R"][concat](pa.slice(-2)); r = ["R"][concat](pa.slice(-2));
} else { } else {
for (var k = 0, kk = pa.length; k < kk; k++) { for (var k = 0, kk = pa.length; k < kk; k++) {
...@@ -1879,7 +1895,7 @@ ...@@ -1879,7 +1895,7 @@
s.scalex = +s.scalex.toFixed(4); s.scalex = +s.scalex.toFixed(4);
s.scaley = +s.scaley.toFixed(4); s.scaley = +s.scaley.toFixed(4);
s.rotate = +s.rotate.toFixed(4); s.rotate = +s.rotate.toFixed(4);
return (s.dx && s.dy ? "t" + [s.dx, s.dy] : E) + return (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) +
(s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) + (s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) +
(s.rotate ? "r" + [s.rotate, 0, 0] : E); (s.rotate ? "r" + [s.rotate, 0, 0] : E);
} else { } else {
...@@ -2059,7 +2075,7 @@ ...@@ -2059,7 +2075,7 @@
return this; return this;
}; };
R["un" + eventName] = elproto["un" + eventName] = function (fn) { R["un" + eventName] = elproto["un" + eventName] = function (fn) {
var events = this.events, var events = this.events || [],
l = events.length; l = events.length;
while (l--) if (events[l].name == eventName && events[l].f == fn) { while (l--) if (events[l].name == eventName && events[l].f == fn) {
events[l].unbind(); events[l].unbind();
...@@ -2651,10 +2667,27 @@ ...@@ -2651,10 +2667,27 @@
return color > 255 ? 255 : color < 0 ? 0 : color; return color > 255 ? 255 : color < 0 ? 0 : color;
}; };
elproto.animateWith = function (element, anim, params, ms, easing, callback) { elproto.animateWith = function (el, anim, params, ms, easing, callback) {
var a = params ? R.animation(params, ms, easing, callback) : anim, var element = this;
status = element.status(anim); if (element.removed) {
return this.animate(a).status(a, status * anim.ms / a.ms); callback && callback.call(element);
return element;
}
var a = params instanceof Animation ? params : R.animation(params, ms, easing, callback),
x, y;
runAnimation(a, element, a.percents[0], null, element.attr());
for (var i = 0, ii = animationElements.length; i < ii; i++) {
if (animationElements[i].anim == anim && animationElements[i].el == el) {
animationElements[ii - 1].start = animationElements[i].start;
break;
}
}
return element;
//
//
// var a = params ? R.animation(params, ms, easing, callback) : anim,
// status = element.status(anim);
// return this.animate(a).status(a, status * anim.ms / a.ms);
}; };
function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) { function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) {
var cx = 3 * p1x, var cx = 3 * p1x,
...@@ -3176,7 +3209,7 @@ ...@@ -3176,7 +3209,7 @@
var anim = R.animation(params, ms, easing, collector); var anim = R.animation(params, ms, easing, collector);
item = this.items[--i].animate(anim); item = this.items[--i].animate(anim);
while (i--) { while (i--) {
this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, anim); this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, anim, anim);
} }
return this; return this;
}; };
...@@ -3624,8 +3657,8 @@ window.Raphael.svg && function (R) { ...@@ -3624,8 +3657,8 @@ window.Raphael.svg && function (R) {
}); });
use = $($("use"), { use = $($("use"), {
"xlink:href": "#" + pathId, "xlink:href": "#" + pathId,
transform: (isEnd ? " rotate(180 " + w / 2 + " " + h / 2 + ") " : S) + "scale(" + w / t + "," + h / t + ")", transform: (isEnd ? "rotate(180 " + w / 2 + " " + h / 2 + ") " : E) + "scale(" + w / t + "," + h / t + ")",
"stroke-width": 1 / ((w / t + h / t) / 2) "stroke-width": (1 / ((w / t + h / t) / 2)).toFixed(4)
}); });
marker.appendChild(use); marker.appendChild(use);
p.defs.appendChild(marker); p.defs.appendChild(marker);
...@@ -3728,8 +3761,8 @@ window.Raphael.svg && function (R) { ...@@ -3728,8 +3761,8 @@ window.Raphael.svg && function (R) {
hl.appendChild(node); hl.appendChild(node);
pn = hl; pn = hl;
} }
if (att == "target" && value == "blank") { if (att == "target") {
pn.setAttributeNS(xlink, "show", "new"); pn.setAttributeNS(xlink, "show", value == "blank" ? "new" : value);
} else { } else {
pn.setAttributeNS(xlink, att, value); pn.setAttributeNS(xlink, att, value);
} }
...@@ -3880,7 +3913,6 @@ window.Raphael.svg && function (R) { ...@@ -3880,7 +3913,6 @@ window.Raphael.svg && function (R) {
}); });
})(el); })(el);
o.paper.defs.appendChild(el); o.paper.defs.appendChild(el);
node.style.fill = "url(#" + el.id + ")";
$(node, {fill: "url(#" + el.id + ")"}); $(node, {fill: "url(#" + el.id + ")"});
o.pattern = el; o.pattern = el;
o.pattern && updatePosition(o); o.pattern && updatePosition(o);
...@@ -4135,7 +4167,11 @@ window.Raphael.svg && function (R) { ...@@ -4135,7 +4167,11 @@ window.Raphael.svg && function (R) {
paper.defs.removeChild(this.gradient); paper.defs.removeChild(this.gradient);
} }
R._tear(this, paper); R._tear(this, paper);
this.node.parentNode.removeChild(this.node); if (this.node.parentNode.tagName.toLowerCase() == "a") {
this.node.parentNode.parentNode.removeChild(this.node.parentNode);
} else {
this.node.parentNode.removeChild(this.node);
}
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;
} }
...@@ -4332,7 +4368,6 @@ window.Raphael.svg && function (R) { ...@@ -4332,7 +4368,6 @@ window.Raphael.svg && function (R) {
}; };
R._engine.text = function (svg, x, y, text) { R._engine.text = function (svg, x, y, text) {
var el = $("text"); var el = $("text");
// $(el, {x: x, y: y, "text-anchor": "middle"});
svg.canvas && svg.canvas.appendChild(el); svg.canvas && svg.canvas.appendChild(el);
var res = new Element(el, svg); var res = new Element(el, svg);
res.attrs = { res.attrs = {
...@@ -4397,7 +4432,6 @@ window.Raphael.svg && function (R) { ...@@ -4397,7 +4432,6 @@ window.Raphael.svg && function (R) {
container.width = width; container.width = width;
container.height = height; container.height = height;
container.canvas = cnvs; container.canvas = cnvs;
// plugins.call(container, container, R.fn);
container.clear(); container.clear();
container._left = container._top = 0; container._left = container._top = 0;
isFloating && (container.renderfix = function () {}); isFloating && (container.renderfix = function () {});
...@@ -4439,8 +4473,13 @@ window.Raphael.svg && function (R) { ...@@ -4439,8 +4473,13 @@ window.Raphael.svg && function (R) {
R.prototype.renderfix = function () { R.prototype.renderfix = function () {
var cnvs = this.canvas, var cnvs = this.canvas,
s = cnvs.style, s = cnvs.style,
pos = cnvs.getScreenCTM() || cnvs.createSVGMatrix(), pos;
left = -pos.e % 1, try {
pos = cnvs.getScreenCTM() || cnvs.createSVGMatrix();
} catch (e) {
pos = cnvs.createSVGMatrix();
}
var left = -pos.e % 1,
top = -pos.f % 1; top = -pos.f % 1;
if (left || top) { if (left || top) {
if (left) { if (left) {
......
raphael.svg.js
...@@ -227,8 +227,8 @@ window.Raphael.svg && function (R) { ...@@ -227,8 +227,8 @@ window.Raphael.svg && function (R) {
}); });
use = $($("use"), { use = $($("use"), {
"xlink:href": "#" + pathId, "xlink:href": "#" + pathId,
transform: (isEnd ? " rotate(180 " + w / 2 + " " + h / 2 + ") " : S) + "scale(" + w / t + "," + h / t + ")", transform: (isEnd ? "rotate(180 " + w / 2 + " " + h / 2 + ") " : E) + "scale(" + w / t + "," + h / t + ")",
"stroke-width": 1 / ((w / t + h / t) / 2) "stroke-width": (1 / ((w / t + h / t) / 2)).toFixed(4)
}); });
marker.appendChild(use); marker.appendChild(use);
p.defs.appendChild(marker); p.defs.appendChild(marker);
...@@ -331,8 +331,8 @@ window.Raphael.svg && function (R) { ...@@ -331,8 +331,8 @@ window.Raphael.svg && function (R) {
hl.appendChild(node); hl.appendChild(node);
pn = hl; pn = hl;
} }
if (att == "target" && value == "blank") { if (att == "target") {
pn.setAttributeNS(xlink, "show", "new"); pn.setAttributeNS(xlink, "show", value == "blank" ? "new" : value);
} else { } else {
pn.setAttributeNS(xlink, att, value); pn.setAttributeNS(xlink, att, value);
} }
...@@ -483,7 +483,6 @@ window.Raphael.svg && function (R) { ...@@ -483,7 +483,6 @@ window.Raphael.svg && function (R) {
}); });
})(el); })(el);
o.paper.defs.appendChild(el); o.paper.defs.appendChild(el);
node.style.fill = "url(#" + el.id + ")";
$(node, {fill: "url(#" + el.id + ")"}); $(node, {fill: "url(#" + el.id + ")"});
o.pattern = el; o.pattern = el;
o.pattern && updatePosition(o); o.pattern && updatePosition(o);
...@@ -876,7 +875,11 @@ window.Raphael.svg && function (R) { ...@@ -876,7 +875,11 @@ window.Raphael.svg && function (R) {
paper.defs.removeChild(this.gradient); paper.defs.removeChild(this.gradient);
} }
R._tear(this, paper); R._tear(this, paper);
this.node.parentNode.removeChild(this.node); if (this.node.parentNode.tagName.toLowerCase() == "a") {
this.node.parentNode.parentNode.removeChild(this.node.parentNode);
} else {
this.node.parentNode.removeChild(this.node);
}
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;
} }
...@@ -1177,7 +1180,6 @@ window.Raphael.svg && function (R) { ...@@ -1177,7 +1180,6 @@ window.Raphael.svg && function (R) {
}; };
R._engine.text = function (svg, x, y, text) { R._engine.text = function (svg, x, y, text) {
var el = $("text"); var el = $("text");
// $(el, {x: x, y: y, "text-anchor": "middle"});
svg.canvas && svg.canvas.appendChild(el); svg.canvas && svg.canvas.appendChild(el);
var res = new Element(el, svg); var res = new Element(el, svg);
res.attrs = { res.attrs = {
...@@ -1242,7 +1244,6 @@ window.Raphael.svg && function (R) { ...@@ -1242,7 +1244,6 @@ window.Raphael.svg && function (R) {
container.width = width; container.width = width;
container.height = height; container.height = height;
container.canvas = cnvs; container.canvas = cnvs;
// plugins.call(container, container, R.fn);
container.clear(); container.clear();
container._left = container._top = 0; container._left = container._top = 0;
isFloating && (container.renderfix = function () {}); isFloating && (container.renderfix = function () {});
...@@ -1293,8 +1294,13 @@ window.Raphael.svg && function (R) { ...@@ -1293,8 +1294,13 @@ window.Raphael.svg && function (R) {
R.prototype.renderfix = function () { R.prototype.renderfix = function () {
var cnvs = this.canvas, var cnvs = this.canvas,
s = cnvs.style, s = cnvs.style,
pos = cnvs.getScreenCTM() || cnvs.createSVGMatrix(), pos;
left = -pos.e % 1, try {
pos = cnvs.getScreenCTM() || cnvs.createSVGMatrix();
} catch (e) {
pos = cnvs.createSVGMatrix();
}
var left = -pos.e % 1,
top = -pos.f % 1; top = -pos.f % 1;
if (left || top) { if (left || top) {
if (left) { if (left) {
......
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