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

Issue #315 : avoid saving state when replaying state

Browse Source
This commit is contained in:
jdescottes 2015-10-02 01:48:35 +02:00
parent a8f727fdcd
commit c9529dc65c
7 changed files with 149 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/tools/transform/AbstractTransformTool.js
View File

@ -8,7 +8,15 @@
ns.AbstractTransformTool.prototype.apply = function (evt) {
var allFrames = evt.shiftKey;
var allLayers = evt.ctrlKey;
this.applyTool_(evt.altKey, allFrames, allLayers);
$.publish(Events.PISKEL_RESET);
this.raiseSaveStateEvent_({
altKey : evt.altKey,
allFrames : allFrames,
allLayers : allLayers
});
};
ns.AbstractTransformTool.prototype.applyTool_ = function (altKey, allFrames, allLayers) {
@ -20,13 +28,6 @@
this.applyToolOnFrame_(frame, altKey);
}.bind(this));
}.bind(this));
$.publish(Events.PISKEL_RESET);
this.raiseSaveStateEvent_({
altKey : altKey,
allFrames : allFrames,
allLayers : allLayers
});
};
ns.AbstractTransformTool.prototype.raiseSaveStateEvent_ = function (replayData) {

2
src/js/tools/transform/Clone.js
View File

@ -17,7 +17,5 @@
frame.setPixels(ref.getPixels());
}
});
$.publish(Events.PISKEL_RESET);
this.raiseSaveStateEvent_({});
};
})();

5
test/drawing/DrawingTests.browser.js
View File

@ -19,6 +19,7 @@
"transform.clone.twice.undo.once.json",
"transform.rotate.once.alt.json",
"transform.rotate.twice.undo.once.json",
"transform.mirror.once.alt.json",
"transform.mirror.twice.undo.once.json"
"transform.flip.once.alt.json",
"transform.flip.twice.undo.once.json",
"transform.flip.thrice.undo.all.redo.all.json"
]}

5
test/drawing/DrawingTests.casper.js
View File

@ -18,6 +18,7 @@
"transform.clone.twice.undo.once.json",
"transform.rotate.once.alt.json",
"transform.rotate.twice.undo.once.json",
"transform.mirror.once.alt.json",
"transform.mirror.twice.undo.once.json"
"transform.flip.once.alt.json",
"transform.flip.twice.undo.once.json",
"transform.flip.thrice.undo.all.redo.all.json"
];

0
test/drawing/tests/transform.mirror.once.alt.json → test/drawing/tests/transform.flip.once.alt.json
View File

135
test/drawing/tests/transform.flip.thrice.undo.all.redo.all.json Normal file
View File

@ -0,0 +1,135 @@
{
"events": [{
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mousemove",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 0
},
"type": "mouse-event"
}, {
"type": "transformtool-event",
"toolId": "tool-flip",
"event": {
"shiftKey": false,
"altKey": false,
"ctrlKey": false
}
}, {
"type": "transformtool-event",
"toolId": "tool-flip",
"event": {
"shiftKey": false,
"altKey": false,
"ctrlKey": false
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 89,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 89,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 89,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}],
"initialState": {
"size": {
"width": 2,
"height": 2
},
"primaryColor": "#000000",
"secondaryColor": "rgba(0, 0, 0, 0)",
"selectedTool": "tool-pen",
"step": 100
},
"png": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFElEQVQIW2NkYGD4z8DAwMjIAAUADikBA/ggJToAAAAASUVORK5CYII="
}

0
test/drawing/tests/transform.mirror.twice.undo.once.json → test/drawing/tests/transform.flip.twice.undo.once.json
View File