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

Handle both strings and objects in Base.importJson().

Browse source 
And keep returning strings from #exportJson().
This commit is contained in:
Jürg Lehni 2013-04-05 16:58:00 +02:00
parent 9d2fd2f675
commit 9adfc01c8d
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/Base.js
View file

@ -61,9 +61,6 @@ this.Base = Base.inject(/** @lends Base# */{
// To support JSON.stringify:
toJSON: function() {
// TODO: We should probably have exportJson() / importJson() deal with
// objects rather than strings too, so we can just delegate to those
// here.
return Base.serialize(this);
},
@ -382,7 +379,8 @@ this.Base = Base.inject(/** @lends Base# */{
},
importJson: function(json) {
return Base.deserialize(JSON.parse(json));
return Base.deserialize(
typeof json === 'string' ? JSON.parse(json) : json);
},
/**