Skip to content

殷洪（管理员） / raphael

Go to a project
Commit a3d3b76d by Dmitry Baranovskiy
Options

Fixed set removal process and exclude method

parent 2ea2ddd8
Showing with 17 additions and 20 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
...@@ -4190,7 +4190,7 @@ ...@@ -4190,7 +4190,7 @@
\*/ \*/
setproto.forEach = function (callback, thisArg) { setproto.forEach = function (callback, thisArg) {
for (var i = 0, ii = this.items.length; i < ii; i++) { for (var i = 0, ii = this.items.length; i < ii; i++) {
if (callback.call(thisArg, this.items[i]) === false) { if (callback.call(thisArg, this.items[i], i) === false) {
return this; return this;
} }
} }
...@@ -4280,13 +4280,8 @@ ...@@ -4280,13 +4280,8 @@
= (boolean) `true` if object was found & removed from the set = (boolean) `true` if object was found & removed from the set
\*/ \*/
setproto.exclude = function (el) { setproto.exclude = function (el) {
for (var i = 0, ii = this.length, found; i < ii; i++) if (found || this[i] == el) { for (var i = 0, ii = this.length; i < ii; i++) if (this[i] == el) {
this[i] = this[i + 1]; this.splice(i, 1);
found = 1;
}
if (found) {
this.length--;
delete this[i];
return true; return true;
} }
}; };
......
raphael.js
...@@ -1569,12 +1569,15 @@ ...@@ -1569,12 +1569,15 @@
tlen = t.length, tlen = t.length,
absolute = t[0] != (t[0] = Str(t[0]).toLowerCase()), absolute = t[0] != (t[0] = Str(t[0]).toLowerCase()),
inver = absolute ? m.invert() : 0, inver = absolute ? m.invert() : 0,
x1 = inver && inver.x(0, 0), x1,
y1 = inver && inver.y(0, 0), y1,
x2, y2, x2,
y2,
bb; bb;
if (t[0] == "t" && tlen == 3) { if (t[0] == "t" && tlen == 3) {
if (absolute) { if (absolute) {
x1 = inver.x(0, 0),
y1 = inver.y(0, 0),
x2 = inver.x(t[1], t[2]); x2 = inver.x(t[1], t[2]);
y2 = inver.y(t[1], t[2]); y2 = inver.y(t[1], t[2]);
m.translate(x2 - x1, y2 - y1); m.translate(x2 - x1, y2 - y1);
...@@ -1606,7 +1609,7 @@ ...@@ -1606,7 +1609,7 @@
if (absolute) { if (absolute) {
x2 = inver.x(t[3], t[4]); x2 = inver.x(t[3], t[4]);
y2 = inver.y(t[3], t[4]); y2 = inver.y(t[3], t[4]);
m.scale(t[1], t[2], x2 - x1, y2 - y1); m.scale(t[1], t[2], x2, y2);
} else { } else {
m.scale(t[1], t[2], t[3], t[4]); m.scale(t[1], t[2], t[3], t[4]);
} }
...@@ -3073,7 +3076,7 @@ ...@@ -3073,7 +3076,7 @@
setproto.forEach = function (callback, thisArg) { setproto.forEach = function (callback, thisArg) {
for (var i = 0, ii = this.items.length; i < ii; i++) { for (var i = 0, ii = this.items.length; i < ii; i++) {
if (callback.call(thisArg, this.items[i]) === false) { if (callback.call(thisArg, this.items[i], i) === false) {
return this; return this;
} }
} }
...@@ -3136,13 +3139,8 @@ ...@@ -3136,13 +3139,8 @@
}; };
setproto.exclude = function (el) { setproto.exclude = function (el) {
for (var i = 0, ii = this.length, found; i < ii; i++) if (found || this[i] == el) { for (var i = 0, ii = this.length; i < ii; i++) if (this[i] == el) {
this[i] = this[i + 1]; this.splice(i, 1);
found = 1;
}
if (found) {
this.length--;
delete this[i];
return true; return true;
} }
}; };
...@@ -4103,6 +4101,7 @@ window.Raphael.svg && function (R) { ...@@ -4103,6 +4101,7 @@ window.Raphael.svg && function (R) {
if (this.removed) { if (this.removed) {
return; return;
} }
this.paper.__set__ && this.paper.__set__.exclude(this);
eve.unbind("*.*." + this.id); eve.unbind("*.*." + this.id);
R._tear(this, this.paper); R._tear(this, this.paper);
this.node.parentNode.removeChild(this.node); this.node.parentNode.removeChild(this.node);
...@@ -5036,6 +5035,7 @@ window.Raphael.vml && function (R) { ...@@ -5036,6 +5035,7 @@ window.Raphael.vml && function (R) {
if (this.removed) { if (this.removed) {
return; return;
} }
this.paper.__set__ && this.paper.__set__.exclude(this);
R.eve.unbind("*.*." + this.id); R.eve.unbind("*.*." + this.id);
R._tear(this, this.paper); R._tear(this, this.paper);
this.node.parentNode.removeChild(this.node); this.node.parentNode.removeChild(this.node);
......
raphael.svg.js
...@@ -873,6 +873,7 @@ window.Raphael.svg && function (R) { ...@@ -873,6 +873,7 @@ window.Raphael.svg && function (R) {
if (this.removed) { if (this.removed) {
return; return;
} }
this.paper.__set__ && this.paper.__set__.exclude(this);
eve.unbind("*.*." + this.id); eve.unbind("*.*." + this.id);
R._tear(this, this.paper); R._tear(this, this.paper);
this.node.parentNode.removeChild(this.node); this.node.parentNode.removeChild(this.node);
......
raphael.vml.js
...@@ -588,6 +588,7 @@ window.Raphael.vml && function (R) { ...@@ -588,6 +588,7 @@ window.Raphael.vml && function (R) {
if (this.removed) { if (this.removed) {
return; return;
} }
this.paper.__set__ && this.paper.__set__.exclude(this);
R.eve.unbind("*.*." + this.id); R.eve.unbind("*.*." + this.id);
R._tear(this, this.paper); R._tear(this, this.paper);
this.node.parentNode.removeChild(this.node); this.node.parentNode.removeChild(this.node);
......
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