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

Merge branch 'master' into enhancement-palette-sorting

Browse Source 
Conflicts:
	src/js/utils/FrameUtils.js
This commit is contained in:
jdescottes
2014-09-21 21:56:22 +02:00
parent 6445b44d02 9ef46d5ec5
commit 8a29b78af8
17 changed files with 289 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/controller/PreviewFilmController.js
View File

@ -218,7 +218,7 @@
};
ns.PreviewFilmController.prototype.clonePreviewCanvas_ = function (canvas) {
var clone = pskl.CanvasUtils.clone(canvas);
var clone = pskl.utils.CanvasUtils.clone(canvas);
clone.classList.add('tile-view', 'canvas');
return clone;
};

2
src/js/controller/dialogs/ImportImageController.js
View File

@ -106,7 +106,7 @@
gifLoader.load({
success : function(){
var images = gifLoader.getFrames().map(function (frame) {
return pskl.CanvasUtils.createFromImageData(frame.data);
return pskl.utils.CanvasUtils.createFromImageData(frame.data);
});
this.createPiskelFromImages_(images);
this.closeDialog();

2
src/js/controller/piskel/PiskelController.js
View File

@ -158,7 +158,7 @@
ns.PiskelController.prototype.getFrameCount = function () {
var layer = this.piskel.getLayerAt(0);
return layer.length();
return layer.size();
};
ns.PiskelController.prototype.setCurrentFrameIndex = function (index) {

2
src/js/controller/settings/PngExportController.js
View File

@ -34,7 +34,7 @@
var canvas = this.getFrameAsCanvas_(frame);
var basename = this.pngFilePrefixInput.value;
var filename = basename + (i+1) + ".png";
zip.file(filename, pskl.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
zip.file(filename, pskl.utils.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
}
var fileName = this.getPiskelName_() + '.zip';