scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-20 22:39:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix item-based onFrame handlers so they can be removed again properly.

Browse source
This commit is contained in:
Jürg Lehni 2012-12-03 08:49:49 -08:00
parent a3a7545cb0
commit 5b56bd7fbf
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/item/Item.js
View file

@ -77,8 +77,15 @@ var Item = this.Item = Base.extend(Callback, /** @lends Item# */{
var onFrameItems = [];
function onFrame(event) {
for (var i = 0, l = onFrameItems.length; i < l; i++)
onFrameItems[i].fire('frame', event);
// Note: Do not optimaize onFrameItems.length since it may change!
for (var i = 0; i < onFrameItems.length; i++) {
var item = onFrameItems[i];
if (item)
item.fire('frame', event);
else
// item was marked for delition. Remove it, and reduce index
onFrameItems.splice(i--, 1);
}
}
return Base.each(['onMouseDown', 'onMouseUp', 'onMouseDrag', 'onClick',
@ -93,9 +100,16 @@ var Item = this.Item = Base.extend(Callback, /** @lends Item# */{
onFrameItems.push(this);
},
uninstall: function() {
onFrameItems.splice(onFrameItems.indexOf(this), 1);
if (!onFrameItems.length)
// Mark for deletion, but do not remove it yet, since
// removing handlers from inside handlers would mess up
// onFrame loop above otherwise.
onFrameItems[onFrameItems.indexOf(this)] = null;
if (onFrameItems.length == 1) {
// If this is the last one, just stop animating
// straight away.
this._project.view.detach('frame', onFrame);
onFrameItems = [];
}
}
},