Fixed undo/redo bug

This commit is contained in:
juliandescottes 2012-09-08 16:50:29 +02:00
parent c16eba0eb9
commit 6bf1c773c8

View File

@ -3,7 +3,7 @@
ns.Frame = function (pixels) { ns.Frame = function (pixels) {
this.pixels = pixels; this.pixels = pixels;
this.previousStates = [this._clonePixels()]; this.previousStates = [this.getPixels()];
this.stateIndex = 0; this.stateIndex = 0;
}; };
@ -27,12 +27,30 @@
return new ns.Frame(this._clonePixels()); return new ns.Frame(this._clonePixels());
}; };
ns.Frame.prototype._clonePixels = function () { /**
var pixels = []; * Returns a copy of the pixels used by the frame
for (var col = 0 ; col < this.getWidth() ; col++) { */
pixels[col] = this.pixels[col].slice(0 , this.getHeight()); ns.Frame.prototype.getPixels = function () {
return this.clonePixels_(this.pixels)
};
/**
* Copies the passed pixels into the frame.
*/
ns.Frame.prototype.setPixels = function (pixels) {
this.pixels = this.clonePixels_(pixels);
};
/**
* Clone a set of pixels. Should be static utility method
* @private
*/
ns.Frame.prototype.clonePixels_ = function (pixels) {
var clonedPixels = [];
for (var col = 0 ; col < pixels.length ; col++) {
clonedPixels[col] = pixels[col].slice(0 , this.getHeight());
} }
return pixels; return clonedPixels;
}; };
ns.Frame.prototype.serialize = function () { ns.Frame.prototype.serialize = function () {
@ -63,7 +81,7 @@
// remove all states past current state // remove all states past current state
this.previousStates.length = this.stateIndex + 1; this.previousStates.length = this.stateIndex + 1;
// push new state // push new state
this.previousStates.push(this._clonePixels()); this.previousStates.push(this.getPixels());
// set the stateIndex to latest saved state // set the stateIndex to latest saved state
this.stateIndex = this.previousStates.length - 1; this.stateIndex = this.previousStates.length - 1;
}; };
@ -71,14 +89,14 @@
ns.Frame.prototype.loadPreviousState = function () { ns.Frame.prototype.loadPreviousState = function () {
if (this.stateIndex > 0) { if (this.stateIndex > 0) {
this.stateIndex--; this.stateIndex--;
this.pixels = this.previousStates[this.stateIndex]; this.setPixels(this.previousStates[this.stateIndex]);
} }
}; };
ns.Frame.prototype.loadNextState = function () { ns.Frame.prototype.loadNextState = function () {
if (this.stateIndex < this.previousStates.length - 1) { if (this.stateIndex < this.previousStates.length - 1) {
this.stateIndex++; this.stateIndex++;
this.pixels = this.previousStates[this.stateIndex]; this.setPixels(this.previousStates[this.stateIndex]);
} }
}; };
})(); })();