From f1abaa7304683aab5576fe0cde45efecec956715 Mon Sep 17 00:00:00 2001 From: Isaiah Odhner Date: Mon, 30 Sep 2019 09:32:24 -0400 Subject: [PATCH] Make parameter for hiding the main canvas handles --- src/OnCanvasHelperLayer.js | 4 ++-- src/OnCanvasObject.js | 11 ++++++++--- src/OnCanvasSelection.js | 2 +- src/OnCanvasTextBox.js | 2 +- src/tools.js | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/OnCanvasHelperLayer.js b/src/OnCanvasHelperLayer.js index 53013f8..49d30f1 100644 --- a/src/OnCanvasHelperLayer.js +++ b/src/OnCanvasHelperLayer.js @@ -1,5 +1,5 @@ -function OnCanvasHelperLayer(x, y, width, height){ - OnCanvasObject.call(this, x, y, width, height); +function OnCanvasHelperLayer(x, y, width, height, hideMainCanvasHandles){ + OnCanvasObject.call(this, x, y, width, height, hideMainCanvasHandles); this.$el.addClass("helper-layer"); this.$el.css({ diff --git a/src/OnCanvasObject.js b/src/OnCanvasObject.js index 9e71669..38ed604 100644 --- a/src/OnCanvasObject.js +++ b/src/OnCanvasObject.js @@ -1,13 +1,16 @@ -function OnCanvasObject(x, y, width, height){ +function OnCanvasObject(x, y, width, height, hideMainCanvasHandles){ this.x = x; this.y = y; this.width = width; this.height = height; + this.hideMainCanvasHandles = hideMainCanvasHandles; this.$el = $(E("div")).addClass("on-canvas-object").appendTo($canvas_area); - $canvas_handles.hide(); + if (this.hideMainCanvasHandles) { + $canvas_handles.hide(); + } } OnCanvasObject.prototype.position = function(){ @@ -26,5 +29,7 @@ OnCanvasObject.prototype.position = function(){ OnCanvasObject.prototype.destroy = function(){ this.$el.remove(); - $canvas_handles.show(); + if (this.hideMainCanvasHandles) { + $canvas_handles.show(); + } }; diff --git a/src/OnCanvasSelection.js b/src/OnCanvasSelection.js index 7dc216b..62e74a9 100644 --- a/src/OnCanvasSelection.js +++ b/src/OnCanvasSelection.js @@ -1,7 +1,7 @@ function OnCanvasSelection(x, y, width, height){ var sel = this; - OnCanvasObject.call(sel, x, y, width, height); + OnCanvasObject.call(sel, x, y, width, height, true); sel.$el.addClass("selection"); diff --git a/src/OnCanvasTextBox.js b/src/OnCanvasTextBox.js index ac2badf..afdf461 100644 --- a/src/OnCanvasTextBox.js +++ b/src/OnCanvasTextBox.js @@ -2,7 +2,7 @@ function OnCanvasTextBox(x, y, width, height){ var tb = this; - OnCanvasObject.call(tb, x, y, width, height); + OnCanvasObject.call(tb, x, y, width, height, true); tb.$el.addClass("textbox"); tb.$editor = $(E("textarea")).addClass("textbox-editor"); diff --git a/src/tools.js b/src/tools.js index 5074910..3b5be14 100644 --- a/src/tools.js +++ b/src/tools.js @@ -27,7 +27,7 @@ tools = [{ if (tool.helper_layer) { tool.helper_layer.destroy(); } - tool.helper_layer = new OnCanvasHelperLayer(0, 0, canvas.width, canvas.height); + tool.helper_layer = new OnCanvasHelperLayer(0, 0, canvas.width, canvas.height, true); // End prior selection, drawing it to the canvas deselect();