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

Make Item#setDocument() and #removeFromParent() private.

Browse source
This commit is contained in:
Jürg Lehni 2011-05-07 14:50:48 +01:00
parent ef8a2aad9b
commit 3ff2880ca8
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/document/Symbol.js
View file

@ -29,7 +29,7 @@ var Symbol = this.Symbol = Base.extend({
setDefinition: function(item) {
this._definition = item;
this._definition.removeFromParent();
this._definition._removeFromParent();
this._definition.setPosition(new Point(0, 0));
}

18
src/item/Item.js
View file

@ -91,14 +91,12 @@ var Item = this.Item = Base.extend({
return this._document;
},
// TODO: This is dangerous, and should probably not be exposed, since
// items would need to be removed from the DOM as well otherwise
setDocument: function(document) {
_setDocument: function(document) {
if (document != this._document) {
this._document = document;
if (this.children) {
for (var i = 0, l = this.children.length; i < l; i++)
this.children[i].setDocument(document);
this.children[i]._setDocument(document);
}
}
},
@ -268,7 +266,7 @@ var Item = this.Item = Base.extend({
/**
* Removes the item from its parent's children list.
*/
removeFromParent: function() {
_removeFromParent: function() {
if (this.parent) {
var ok = !!this.parent.children.splice(this.getIndex(), 1).length;
// TODO: Reassign _index
@ -284,7 +282,7 @@ var Item = this.Item = Base.extend({
remove: function() {
if (this.isSelected())
this.setSelected(false);
return this.removeFromParent();
return this._removeFromParent();
},
/**
@ -804,11 +802,11 @@ var Item = this.Item = Base.extend({
function append(top) {
return function(item) {
if (this.children && item.removeFromParent()) {
if (this.children && item._removeFromParent()) {
this.children.splice(top ? this.children.length : 0, 0, item);
// TODO: Reassign _index
item.parent = this;
item.setDocument(this._document);
item._setDocument(this._document);
return true;
}
return false;
@ -818,12 +816,12 @@ var Item = this.Item = Base.extend({
function move(above) {
return function(item) {
// first remove the item from its parent's children list
if (item.parent && this.removeFromParent()) {
if (item.parent && this._removeFromParent()) {
item.parent.children.splice(item.getIndex()
+ (above ? 1 : -1), 0, this);
// TODO: Reassign _index
this.parent = item.parent;
this.setDocument(item._document);
this._setDocument(item._document);
return true;
}
return false;

6
src/item/Layer.js
View file

@ -32,7 +32,7 @@ var Layer = this.Layer = Group.extend({
* Removes the layer from its document's layers list
* or its parent's children list.
*/
removeFromParent: function() {
_removeFromParent: function() {
if (!this.parent) {
return !!this._document.layers.splice(this.getIndex(), 1).length;
} else {
@ -58,10 +58,10 @@ var Layer = this.Layer = Group.extend({
return function(item) {
// if the item is a layer and contained within Document#layers
if (item instanceof Layer && !item.parent
&& this.removeFromParent()) {
&& this._removeFromParent()) {
item._document.layers.splice(item.getIndex() + (above ? 1 : -1),
0, this);
this.setDocument(item._document);
this._setDocument(item._document);
return true;
} else {
return this.base(item);