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

Fix issue with items with frame events never being removed from _frameItems list.

Browse source
This commit is contained in:
Jürg Lehni 2013-11-27 12:38:56 +01:00
parent cbefaf0dd1
commit 18db7c0d56
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/item/Item.js
View file

@ -147,10 +147,10 @@ var Item = Base.extend(Callback, /** @lends Item# */{
}, {
onFrame: {
install: function() {
this._project.view._animateItem(this, true);
this._animateItem(true);
},
uninstall: function() {
this._project.view._animateItem(this, false);
this._animateItem(false);
}
},
@ -160,6 +160,10 @@ var Item = Base.extend(Callback, /** @lends Item# */{
);
},
_animateItem: function(animate) {
this._project.view._animateItem(this, animate);
},
_serialize: function(options, dictionary) {
var props = {},
that = this;
@ -1020,7 +1024,12 @@ var Item = Base.extend(Callback, /** @lends Item# */{
_setProject: function(project) {
if (this._project != project) {
var hasOnFrame = this.responds('frame');
if (hasOnFrame)
this._animateItem(false);
this._project = project;
if (hasOnFrame)
this._animateItem(true);
if (this._children) {
for (var i = 0, l = this._children.length; i < l; i++) {
this._children[i]._setProject(project);
@ -1914,6 +1923,8 @@ var Item = Base.extend(Callback, /** @lends Item# */{
this._removeNamed();
if (this._index != null)
Base.splice(this._parent._children, null, this._index, 1);
if (this.responds('frame'))
this._animateItem(false);
// Notify parent of changed hierarchy
if (notify)
this._parent._changed(/*#=*/ Change.HIERARCHY);

2
src/ui/View.js
View file

@ -108,7 +108,7 @@ var View = Base.extend(Callback, /** @lends View# */{
},
/**
* Removes this view from and frees the associated element.
* Removes this view from the project and frees the associated element.
*/
remove: function() {
if (!this._project)