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 #290: add missing parameter to dismissSelection in BaseSelect

Browse Source
This commit is contained in:
Julian Descottes
2016-07-31 00:00:45 +02:00
committed by juliandescottes
parent 0d5dc21a41
commit 22797e5dc5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/tools/drawing/selection/AbstractDragSelect.js
View File

@@ -16,7 +16,7 @@
ns.AbstractDragSelect.prototype.onSelectStart_ = function (col, row, frame, overlay) { ns.AbstractDragSelect.prototype.onSelectStart_ = function (col, row, frame, overlay) {
if (this.hasSelection) { if (this.hasSelection) {
this.hasSelection = false; this.hasSelection = false;
this.dismissSelection(); this.dismissSelection(overlay);
} else { } else {
this.hasSelection = true; this.hasSelection = true;
this.onDragSelectStart_(col, row); this.onDragSelectStart_(col, row);

2
src/js/tools/drawing/selection/BaseSelect.js
View File

@@ -111,7 +111,7 @@
/** /**
* Protected method, should be called when the selection is dismissed. * Protected method, should be called when the selection is dismissed.
*/ */
ns.BaseSelect.prototype.dismissSelection = function () { ns.BaseSelect.prototype.dismissSelection = function (overlay) {
if (this.isMovingContent_) { if (this.isMovingContent_) {
$.publish(Events.SELECTION_PASTE); $.publish(Events.SELECTION_PASTE);
this.isMovingContent_ = false; this.isMovingContent_ = false;

2
src/js/tools/drawing/selection/ShapeSelect.js
View File

@@ -24,7 +24,7 @@
ns.ShapeSelect.prototype.onSelectStart_ = function (col, row, frame, overlay) { ns.ShapeSelect.prototype.onSelectStart_ = function (col, row, frame, overlay) {
if (this.hasSelection) { if (this.hasSelection) {
this.hasSelection = false; this.hasSelection = false;
this.dismissSelection(); this.dismissSelection(overlay);
} else { } else {
this.hasSelection = true; this.hasSelection = true;
// From the pixel cliked, get shape using an algorithm similar to the paintbucket one: // From the pixel cliked, get shape using an algorithm similar to the paintbucket one: