scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-08-28 22:08:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent calling constructor methods on existing items again when using importJSON().

Browse source 
Resetting _children to new array would mess up up the code that keeps track of insertion and updateVersions.

Closes #785
This commit is contained in:
Jürg Lehni 2016-01-14 19:12:00 +01:00
parent 495cf9f7ce
commit c5ec9ae0b9
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/Base.js
View file

@ -476,26 +476,29 @@ Base.inject(/** @lends Base# */{
typeof json === 'string' ? JSON.parse(json) : json,
// Provide our own create function to handle target and
// insertion.
function(type, args) {
function(ctor, args) {
// If a target is provided and its of the right type,
// import right into it.
var obj = target && target.constructor === type
? target
: Base.create(type.prototype),
isTarget = obj === target;
var useTarget = target && target.constructor === ctor,
obj = useTarget ? target
: Base.create(ctor.prototype),
// When reusing an object, try to initialize it
// through _initialize (Item), fall-back to _set.
init = useTarget ? obj._initialize || obj._set
: ctor;
// NOTE: We don't set insert false for layers since we
// want these to be created on the fly in the active
// project into which we're importing (except for if
// it's a preexisting target layer).
if (args.length === 1 && obj instanceof Item
&& (isTarget || !(obj instanceof Layer))) {
&& (useTarget || !(obj instanceof Layer))) {
var arg = args[0];
if (Base.isPlainObject(arg))
arg.insert = false;
}
type.apply(obj, args);
init.apply(obj, args);
// Clear target to only use it once.
if (isTarget)
if (useTarget)
target = null;
return obj;
});