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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Filipe Vieira 2014-04-30 23:59:47 +01:00
commit b2bdb252b7
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/app.js
View File

@ -54,8 +54,8 @@
this.minimapController = new pskl.controller.MinimapController(this.piskelController, this.animationController, this.drawingController, $('#preview-canvas-container'));
this.minimapController.init();
this.previewsController = new pskl.controller.PreviewFilmController(this.piskelController, $('#preview-list'));
this.previewsController.init();
this.previewFilmController = new pskl.controller.PreviewFilmController(this.piskelController, $('#preview-list'));
this.previewFilmController.init();
this.layersListController = new pskl.controller.LayersListController(this.piskelController);
this.layersListController.init();
@ -144,7 +144,7 @@
render : function (delta) {
this.drawingController.render(delta);
this.animationController.render(delta);
this.previewsController.render(delta);
this.previewFilmController.render(delta);
},
readSizeFromURL_ : function () {

12
src/js/drawingtools/selectiontools/BaseSelect.js
View File

@ -34,16 +34,14 @@
// mode to create a selection.
// If the initial click is on a previous selection, we go in "moveSelection"
// mode to allow to move the selection by drag'n dropping it.
if(overlay.getPixel(col, row) != Constants.SELECTION_TRANSPARENT_COLOR) {
this.mode = "select";
this.onSelectStart_(col, row, color, frame, overlay);
}
else {
if(this.isInSelection(col, row)) {
this.mode = "moveSelection";
this.onSelectionDragStart_(col, row, color, frame, overlay);
}
else {
this.mode = "select";
this.onSelectStart_(col, row, color, frame, overlay);
}
};
/**