mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into import-picture-panel

Browse Source
This commit is contained in:
jdescottes
2013-10-16 23:15:09 +02:00
parent 1156008213 721783ce6c
commit 07cb37f2bf
6 changed files with 143 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/controller/PiskelController.js
View File

@@ -2,7 +2,11 @@
var ns = $.namespace('pskl.controller');
ns.PiskelController = function (piskel) {
this.setPiskel(piskel);
if (piskel) {
this.setPiskel(piskel);
} else {
throw 'A piskel instance is mandatory for instanciating PiskelController';
}
};
ns.PiskelController.prototype.setPiskel = function (piskel) {
@@ -184,13 +188,7 @@
return pskl.utils.Serializer.serializePiskel(this.piskel);
};
ns.PiskelController.prototype.deserialize = function (json) {
try {
var piskel = pskl.utils.Serializer.deserializePiskel(json);
this.setPiskel(piskel);
} catch (e) {
console.error('Failed to deserialize');
console.error(e.stack);
}
ns.PiskelController.prototype.load = function (data) {
this.deserialize(JSON.stringify(data));
};
})();