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

fixed historical history bug !!!!!

Browse Source
This commit is contained in:
jdescottes 2014-07-13 18:33:37 +02:00
parent 992e55dec6
commit e5f0197170
5 changed files with 68 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
css/piskel-style-packaged-2014-07-13-03-54.css → css/piskel-style-packaged-2014-07-13-06-27.css
View File

79
js/piskel-packaged-2014-07-13-03-54.js → js/piskel-packaged-2014-07-13-06-27.js
View File

@ -17141,6 +17141,21 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
return this.piskel.getLayerAt(index);
};
ns.PiskelController.prototype.hasLayerAt = function (index) {
return !!this.getLayerAt(index);
};
// FIXME ?? No added value compared to getLayerAt ??
// Except normalizing to null if undefined ?? ==> To merge
ns.PiskelController.prototype.getLayerByIndex = function (index) {
var layers = this.getLayers();
if (layers[index]) {
return layers[index];
} else {
return null;
}
};
ns.PiskelController.prototype.getCurrentFrame = function () {
var layer = this.getCurrentLayer();
return layer.getFrameAt(this.currentFrameIndex);
@ -17188,6 +17203,8 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
this.getLayers().forEach(function (l) {
l.addFrameAt(this.createEmptyFrame_(), index);
}.bind(this));
this.setCurrentFrameIndex(index);
};
ns.PiskelController.prototype.createEmptyFrame_ = function () {
@ -17213,6 +17230,7 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
this.getLayers().forEach(function (l) {
l.duplicateFrameAt(index);
});
this.setCurrentFrameIndex(index+1);
};
ns.PiskelController.prototype.moveFrame = function (fromIndex, toIndex) {
@ -17227,7 +17245,11 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
};
ns.PiskelController.prototype.setCurrentFrameIndex = function (index) {
if (this.hasFrameAt(index)) {
this.currentFrameIndex = index;
} else {
window.console.error('Could not set current frame index to ' + index);
}
};
ns.PiskelController.prototype.selectNextFrame = function () {
@ -17245,7 +17267,11 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
};
ns.PiskelController.prototype.setCurrentLayerIndex = function (index) {
if (this.hasLayerAt(index)) {
this.currentLayerIndex = index;
} else {
window.console.error('Could not set current layer index to ' + index);
}
};
ns.PiskelController.prototype.selectLayer = function (layer) {
@ -17262,15 +17288,6 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
}
};
ns.PiskelController.prototype.getLayerByIndex = function (index) {
var layers = this.getLayers();
if (layers[index]) {
return layers[index];
} else {
return null;
}
};
ns.PiskelController.prototype.generateLayerName_ = function () {
var name = "Layer " + this.layerIdCounter;
while (this.hasLayerForName_(name)) {
@ -17377,7 +17394,7 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
ns.PublicPiskelController.prototype.raiseSaveStateEvent_ = function (fn, args) {
$.publish(Events.PISKEL_SAVE_STATE, {
type : pskl.service.HistoryService.REPLAY,
type : pskl.service.HistoryService.REPLAY_NO_SNAPSHOT,
scope : this,
replay : {
fn : fn,
@ -18002,7 +18019,6 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
if (action === ACTION.CLONE) {
this.piskelController.duplicateFrameAt(index);
this.piskelController.setCurrentFrameIndex(index + 1);
this.updateScrollerOverflows();
} else if (action === ACTION.DELETE) {
this.piskelController.removeFrameAt(index);
@ -18011,7 +18027,6 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
this.piskelController.setCurrentFrameIndex(index);
} else if (action === ACTION.NEW_FRAME) {
this.piskelController.addFrame();
this.piskelController.setCurrentFrameIndex(this.piskelController.getFrameCount() - 1);
this.updateScrollerOverflows();
}
};
@ -20717,10 +20732,17 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
this.saveState__b = this.onSaveStateEvent.bind(this);
this.lastLoadState = -1;
this.saveNextAsSnapshot = false;
};
ns.HistoryService.SNAPSHOT = 'SNAPSHOT';
ns.HistoryService.REPLAY = 'REPLAY';
/**
* This event alters the state (frames, layers) of the piskel. The event is triggered before the execution of associated command.
* Don't store snapshots for such events.
*/
ns.HistoryService.REPLAY_NO_SNAPSHOT = 'REPLAY_NO_SNAPSHOT';
ns.HistoryService.prototype.init = function () {
$.subscribe(Events.PISKEL_SAVE_STATE, this.saveState__b);
@ -20747,8 +20769,18 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
layerIndex : this.piskelController.currentLayerIndex
};
if (stateInfo.type === ns.HistoryService.SNAPSHOT || this.currentIndex % SNAPSHOT_PERIOD === 0) {
var isSnapshot = stateInfo.type === ns.HistoryService.SNAPSHOT;
var isNoSnapshot = stateInfo.type === ns.HistoryService.REPLAY_NO_SNAPSHOT;
var isAtAutoSnapshotInterval = this.currentIndex % SNAPSHOT_PERIOD === 0 || this.saveNextAsSnapshot;
if (isNoSnapshot && isAtAutoSnapshotInterval) {
this.saveNextAsSnapshot = true;
} else if (isSnapshot || isAtAutoSnapshotInterval) {
state.piskel = this.piskelController.serialize(true);
this.saveNextAsSnapshot = false;
}
if (isSnapshot) {
}
this.stateQueue.push(state);
@ -20769,12 +20801,8 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
};
ns.HistoryService.prototype.getPreviousSnapshotIndex_ = function (index) {
var counter = 0;
while (this.stateQueue[index] && !this.stateQueue[index].piskel) {
index = index - 1;
if(++counter > 2*SNAPSHOT_PERIOD) {
break;
}
}
return index;
};
@ -20794,14 +20822,14 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
}
} catch (e) {
window.console.error("[CRITICAL ERROR] : Unable to load a history state.");
window.console.error("Can you open an issue on http://github.com/juliandescottes/piskel or contact @piskelapp on twitter ? Thanks !");
window.console.error("Thanks !");
if (typeof e === "string") {
window.console.error(e);
} else {
window.console.error(e.message);
window.console.error(e.stack);
}
this.stateQueue = [];
this.currentIndex = -1;
}
};
@ -20835,6 +20863,7 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
if (lastState) {
this.setupState(lastState);
}
this.currentIndex = index;
$.publish(Events.PISKEL_RESET);
if (originalSize !== this.getPiskelSize_()) {
@ -21695,7 +21724,7 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
});
// reset
this.pixels = [];
this.resetUsedPixels_();
};
ns.SimplePen.prototype.replay = function (frame, replayData) {
@ -21707,6 +21736,10 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
frame.setPixel(pixel.col, pixel.row, pixel.color);
});
};
ns.SimplePen.prototype.resetUsedPixels_ = function() {
this.pixels = [];
};
})();
;/**
* @provide pskl.drawingtools.Eraser
@ -21739,6 +21772,7 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
darken : {},
lighten : {}
};
this.superclass.resetUsedPixels_.call(this);
};
/**
* @override
@ -21774,14 +21808,13 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
};
ns.Lighten.prototype.releaseToolAt = function(col, row, color, frame, overlay, event) {
// apply on real frame
this.setPixelsToFrame_(frame, this.pixels);
this.resetUsedPixels_();
$.publish(Events.PISKEL_SAVE_STATE, {
type : pskl.service.HistoryService.SNAPSHOT
});
this.resetUsedPixels_();
};
})();;(function() {
var ns = $.namespace("pskl.drawingtools");

8
js/piskel-packaged-min-2014-07-13-03-54.js → js/piskel-packaged-min-2014-07-13-06-27.js
View File

File diff suppressed because one or more lines are too long

8
js/piskel-packaged-min.js vendored
View File

File diff suppressed because one or more lines are too long

4
piskel-boot-0.1.0.js
View File

@ -1,9 +1,9 @@
(function () {
/**
* See @Gruntfile.js => after build, -2014-07-13-03-54 is replaced by the build version
* See @Gruntfile.js => after build, -2014-07-13-06-27 is replaced by the build version
*/
var version = '-2014-07-13-03-54';
var version = '-2014-07-13-06-27';
var versionHasNotBeenReplaced = version.indexOf('@@') === 0;
if (versionHasNotBeenReplaced) {
version = '';