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

Post merge fixes

Browse Source
This commit is contained in:
juliandescottes 2013-11-23 19:33:00 +01:00
parent ce111be5c8
commit 3de3c3542e
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/service/LocalStorageService.js
View File

@ -45,14 +45,9 @@
*/ */
ns.LocalStorageService.prototype.restoreFromLocalStorage_ = function() { ns.LocalStorageService.prototype.restoreFromLocalStorage_ = function() {
var framesheet = JSON.parse(window.localStorage.snapShot); var framesheet = JSON.parse(window.localStorage.snapShot);
<<<<<<< HEAD
pskl.utils.serialization.Deserializer.deserialize(framesheet, function (piskel) { pskl.utils.serialization.Deserializer.deserialize(framesheet, function (piskel) {
pskl.app.piskelController.setPiskel(piskel); pskl.app.piskelController.setPiskel(piskel);
}); });
=======
var piskel = pskl.utils.Serializer.createPiskel(framesheet);
pskl.app.piskelController.setPiskel(piskel);
>>>>>>> master
}; };
/** /**

1
piskel-script-list.js
View File

@ -50,7 +50,6 @@ exports.scripts = [
"js/rendering/frame/FrameRenderer.js", "js/rendering/frame/FrameRenderer.js",
"js/rendering/frame/CachedFrameRenderer.js", "js/rendering/frame/CachedFrameRenderer.js",
"js/rendering/CanvasRenderer.js", "js/rendering/CanvasRenderer.js",
"js/rendering/FrameRenderer.js",
"js/rendering/FramesheetRenderer.js", "js/rendering/FramesheetRenderer.js",
"js/rendering/PiskelRenderer.js", "js/rendering/PiskelRenderer.js",