Skip to content

殷洪（管理员） / raphael

Go to a project
Commit 0c4db232 by Dmitry Baranovskiy
Options

Fix for Firefox rendering, exposed createUUID() and added docs for delay() method

parent 1dacaa38
Showing with 21 additions and 11 deletions
raphael-min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
raphael.core.js
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
return rectPath(bbox.x, bbox.y, bbox.width, bbox.height); return rectPath(bbox.x, bbox.y, bbox.width, bbox.height);
} }
}, },
mapPath = function (path, matrix) { mapPath = R.mapPath = function (path, matrix) {
if (!matrix) { if (!matrix) {
return path; return path;
} }
...@@ -467,7 +467,13 @@ ...@@ -467,7 +467,13 @@
return value; return value;
}; };
var createUUID = R._createUUID = (function (uuidRegEx, uuidReplacer) { /*\
* Raphael.createUUID
[ method ]
**
* Returns RFC4122, version 4 ID
\*/
var createUUID = R.createUUID = (function (uuidRegEx, uuidReplacer) {
return function () { return function () {
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(uuidRegEx, uuidReplacer).toUpperCase(); return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(uuidRegEx, uuidReplacer).toUpperCase();
}; };
...@@ -3655,6 +3661,9 @@ ...@@ -3655,6 +3661,9 @@
- delay (number) number of ms to pass between animation start and actual animation - delay (number) number of ms to pass between animation start and actual animation
** **
= (object) new altered Animation object = (object) new altered Animation object
| var anim = Raphael.animation({cx: 10, cy: 20}, 2e3);
| circle1.animate(anim); // run the given animation immediately
| circle2.animate(anim.delay(500)); // run the given animation after 500 ms
\*/ \*/
Animation.prototype.delay = function (delay) { Animation.prototype.delay = function (delay) {
var a = new Animation(this.anim, this.ms); var a = new Animation(this.anim, this.ms);
......
raphael.js
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
return rectPath(bbox.x, bbox.y, bbox.width, bbox.height); return rectPath(bbox.x, bbox.y, bbox.width, bbox.height);
} }
}, },
mapPath = function (path, matrix) { mapPath = R.mapPath = function (path, matrix) {
if (!matrix) { if (!matrix) {
return path; return path;
} }
...@@ -513,7 +513,8 @@ ...@@ -513,7 +513,8 @@
return value; return value;
}; };
var createUUID = R._createUUID = (function (uuidRegEx, uuidReplacer) {
var createUUID = R.createUUID = (function (uuidRegEx, uuidReplacer) {
return function () { return function () {
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(uuidRegEx, uuidReplacer).toUpperCase(); return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(uuidRegEx, uuidReplacer).toUpperCase();
}; };
...@@ -3698,7 +3699,7 @@ window.Raphael.svg && function (R) { ...@@ -3698,7 +3699,7 @@ window.Raphael.svg && function (R) {
o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode); o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
var el = $("clipPath"), var el = $("clipPath"),
rc = $("rect"); rc = $("rect");
el.id = R._createUUID(); el.id = R.createUUID();
$(rc, { $(rc, {
x: rect[0], x: rect[0],
y: rect[1], y: rect[1],
...@@ -3808,7 +3809,7 @@ window.Raphael.svg && function (R) { ...@@ -3808,7 +3809,7 @@ window.Raphael.svg && function (R) {
if (isURL) { if (isURL) {
el = $("pattern"); el = $("pattern");
var ig = $("image"); var ig = $("image");
el.id = R._createUUID(); el.id = R.createUUID();
$(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1}); $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
$(ig, {x: 0, y: 0, "xlink:href": isURL[1]}); $(ig, {x: 0, y: 0, "xlink:href": isURL[1]});
el.appendChild(ig); el.appendChild(ig);
...@@ -4206,7 +4207,7 @@ window.Raphael.svg && function (R) { ...@@ -4206,7 +4207,7 @@ window.Raphael.svg && function (R) {
var fltr = $("filter"), var fltr = $("filter"),
blur = $("feGaussianBlur"); blur = $("feGaussianBlur");
t.attrs.blur = size; t.attrs.blur = size;
fltr.id = R._createUUID(); fltr.id = R.createUUID();
$(blur, {stdDeviation: +size || 1.5}); $(blur, {stdDeviation: +size || 1.5});
fltr.appendChild(blur); fltr.appendChild(blur);
t.paper.defs.appendChild(fltr); t.paper.defs.appendChild(fltr);
......
raphael.svg.js
...@@ -362,7 +362,7 @@ window.Raphael.svg && function (R) { ...@@ -362,7 +362,7 @@ window.Raphael.svg && function (R) {
o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode); o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
var el = $("clipPath"), var el = $("clipPath"),
rc = $("rect"); rc = $("rect");
el.id = R._createUUID(); el.id = R.createUUID();
$(rc, { $(rc, {
x: rect[0], x: rect[0],
y: rect[1], y: rect[1],
...@@ -472,7 +472,7 @@ window.Raphael.svg && function (R) { ...@@ -472,7 +472,7 @@ window.Raphael.svg && function (R) {
if (isURL) { if (isURL) {
el = $("pattern"); el = $("pattern");
var ig = $("image"); var ig = $("image");
el.id = R._createUUID(); el.id = R.createUUID();
$(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1}); $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
$(ig, {x: 0, y: 0, "xlink:href": isURL[1]}); $(ig, {x: 0, y: 0, "xlink:href": isURL[1]});
el.appendChild(ig); el.appendChild(ig);
...@@ -1110,7 +1110,7 @@ window.Raphael.svg && function (R) { ...@@ -1110,7 +1110,7 @@ window.Raphael.svg && function (R) {
var fltr = $("filter"), var fltr = $("filter"),
blur = $("feGaussianBlur"); blur = $("feGaussianBlur");
t.attrs.blur = size; t.attrs.blur = size;
fltr.id = R._createUUID(); fltr.id = R.createUUID();
$(blur, {stdDeviation: +size || 1.5}); $(blur, {stdDeviation: +size || 1.5});
fltr.appendChild(blur); fltr.appendChild(blur);
t.paper.defs.appendChild(fltr); t.paper.defs.appendChild(fltr);
...@@ -1280,7 +1280,7 @@ window.Raphael.svg && function (R) { ...@@ -1280,7 +1280,7 @@ 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(), pos = cnvs.getScreenCTM() || cnvs.createSVGMatrix(),
left = -pos.e % 1, left = -pos.e % 1,
top = -pos.f % 1; top = -pos.f % 1;
if (left || top) { if (left || top) {
......
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