From 218c0b511b94e3c5a5d03f55ffa4dc348de23bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Szab=C3=B3?= Date: Fri, 26 Aug 2016 01:51:43 +0200 Subject: [PATCH] Fix callbacks to work with the new serializer --- src/js/app.js | 7 +++---- src/js/controller/settings/ImportController.js | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index 9849f0ac..0dd207f6 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -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); }); }, diff --git a/src/js/controller/settings/ImportController.js b/src/js/controller/settings/ImportController.js index d144efc9..fe960c8d 100644 --- a/src/js/controller/settings/ImportController.js +++ b/src/js/controller/settings/ImportController.js @@ -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_(); }