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

Merging from master after PR zoom level

Browse Source
This commit is contained in:
juliandescottes
2013-11-23 19:25:51 +01:00
parent 86cd1cdeaa e88d8fae07
commit ce111be5c8
27 changed files with 956 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/service/LocalStorageService.js
View File

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