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

When running in Node-Webkit, hold onto the full savePath when opening.piskel files via the gui or drag and drop.

Browse Source
This commit is contained in:
Lee Grey 2015-03-22 00:39:23 +13:00
parent 6a6f75b3ce
commit c9b581f6db
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/service/DesktopStorageService.js
View File

@ -34,12 +34,12 @@
ns.DesktopStorageService.prototype.openPiskel = function () { ns.DesktopStorageService.prototype.openPiskel = function () {
pskl.utils.FileUtilsDesktop.chooseFileDialog(function(filename){ pskl.utils.FileUtilsDesktop.chooseFileDialog(function(filename){
var chosenFilename = filename; var savePath = filename;
pskl.utils.FileUtilsDesktop.readFile(chosenFilename, function(content){ pskl.utils.FileUtilsDesktop.readFile(savePath, function(content){
pskl.utils.PiskelFileUtils.decodePiskelFile(content, function (piskel, descriptor, fps) { pskl.utils.PiskelFileUtils.decodePiskelFile(content, function (piskel, descriptor, fps) {
piskel.setDescriptor(descriptor); piskel.setDescriptor(descriptor);
// store save path so we can re-save without opening the save dialog // store save path so we can re-save without opening the save dialog
piskel.savePath = chosenFilename; piskel.savePath = savePath;
pskl.app.piskelController.setPiskel(piskel); pskl.app.piskelController.setPiskel(piskel);
pskl.app.animationController.setFPS(fps); pskl.app.animationController.setFPS(fps);
}); });

1
src/js/service/HistoryService.js
View File

@ -8,7 +8,6 @@
this.stateQueue = []; this.stateQueue = [];
this.currentIndex = -1; this.currentIndex = -1;
this.lastLoadState = -1; this.lastLoadState = -1;
this.saveNextAsSnapshot = false; this.saveNextAsSnapshot = false;

13
src/js/utils/PiskelFileUtils.js
View File

@ -13,7 +13,18 @@
loadFromFile : function (file, onSuccess, onError) { loadFromFile : function (file, onSuccess, onError) {
pskl.utils.FileUtils.readFile(file, function (content) { pskl.utils.FileUtils.readFile(file, function (content) {
var rawPiskel = pskl.utils.Base64.toText(content); var rawPiskel = pskl.utils.Base64.toText(content);
ns.PiskelFileUtils.decodePiskelFile(rawPiskel, onSuccess, onError); ns.PiskelFileUtils.decodePiskelFile(
rawPiskel,
function (piskel, descriptor, fps) {
// if using Node-Webkit, store the savePath on load
// Note: the 'path' property is unique to Node-Webkit, and holds the full path
if (pskl.utils.Environment.detectNodeWebkit()) {
piskel.savePath = file.path;
}
onSuccess(piskel, descriptor, fps);
},
onError
);
}); });
}, },