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

Fix callbacks to work with the new serializer

Browse Source
This commit is contained in:
Dávid Szabó 2016-08-26 01:51:43 +02:00 committed by Julian Descottes
parent a3fd2f0d89
commit 218c0b511b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/js/app.js
View File

@ -175,11 +175,10 @@
}
},
loadPiskel_ : function (serializedPiskel, descriptor, fps) {
pskl.utils.serialization.Deserializer.deserialize(serializedPiskel, function (piskel) {
piskel.setDescriptor(descriptor);
loadPiskel_ : function (serializedPiskel) {
pskl.utils.serialization.Deserializer.deserialize(serializedPiskel, function (piskel, extra) {
pskl.app.piskelController.setPiskel(piskel);
pskl.app.previewController.setFPS(fps);
pskl.app.previewController.setFPS(extra.fps);
});
},

5
src/js/controller/settings/ImportController.js
View File

@ -79,10 +79,9 @@
ns.ImportController.prototype.openPiskelFile_ = function (file) {
if (this.isPiskel_(file)) {
pskl.utils.PiskelFileUtils.loadFromFile(file, function (piskel, descriptor, fps) {
piskel.setDescriptor(descriptor);
pskl.utils.PiskelFileUtils.loadFromFile(file, function (piskel, extra) {
pskl.app.piskelController.setPiskel(piskel);
pskl.app.previewController.setFPS(fps);
pskl.app.previewController.setFPS(extra.fps);
});
this.closeDrawer_();
}