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

Inherit #transformContent setting from parent, if not explicitely defined.

Browse source
This commit is contained in:
Jürg Lehni 2014-03-01 22:52:00 +01:00
parent dad7821ee9
commit a8578326ea
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/item/Item.js
View file

@ -1152,7 +1152,7 @@ var Item = Base.extend(Callback, /** @lends Item# */{
}, },
setTransformContent: function(transform) { setTransformContent: function(transform) {
this._transformContent = transform; this._transformContent = !!transform;
if (transform) if (transform)
this.applyMatrix(); this.applyMatrix();
}, },
@ -1172,6 +1172,7 @@ var Item = Base.extend(Callback, /** @lends Item# */{
if (this._project !== project) { if (this._project !== project) {
// Uninstall events before switching project, then install them // Uninstall events before switching project, then install them
// again. // again.
// NOTE: _installEvents handles all children too!
if (this._project) if (this._project)
this._installEvents(false); this._installEvents(false);
this._project = project; this._project = project;
@ -1945,16 +1946,23 @@ var Item = Base.extend(Callback, /** @lends Item# */{
// Use the loop also to filter out wrong _type. // Use the loop also to filter out wrong _type.
for (var i = items.length - 1; i >= 0; i--) { for (var i = items.length - 1; i >= 0; i--) {
var item = items[i]; var item = items[i];
if (_type && item._type !== _type) if (_type && item._type !== _type) {
items.splice(i, 1); items.splice(i, 1);
else } else {
item._remove(true); item._remove(true);
}
} }
Base.splice(children, items, index, 0); Base.splice(children, items, index, 0);
var transformContent = this._transformContent;
for (var i = 0, l = items.length; i < l; i++) { for (var i = 0, l = items.length; i < l; i++) {
var item = items[i]; var item = items[i];
item._parent = this; item._parent = this;
item._setProject(this._project, true); item._setProject(this._project, true);
// Only pass on the transformContent setting if it's different
// and the child has not its onw setting already.
if (item._transformContent ^ transformContent
&& !item.hasOwnProperty('_transformContent'))
item.setTransformContent(transformContent)
// Setting the name again makes sure all name lookup structures // Setting the name again makes sure all name lookup structures
// are kept in sync. // are kept in sync.
if (item._name) if (item._name)