diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index edc717b57..eb6f0c392 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -146,6 +146,7 @@ define(function () { // Canvas out.canvas_clear = "Nettoyer"; + out.canvas_delete = "Supprimer la sélection"; out.canvas_disable = "Désactiver le dessin"; out.canvas_enable = "Activer le dessin"; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 2af12e044..0f95fbc3e 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -148,6 +148,7 @@ define(function () { // Canvas out.canvas_clear = "Clear"; + out.canvas_delete = "Delete selection"; out.canvas_disable = "Disable draw"; out.canvas_enable = "Enable draw"; diff --git a/www/whiteboard/index.html b/www/whiteboard/index.html index 746bfccfc..4bdeb7e77 100644 --- a/www/whiteboard/index.html +++ b/www/whiteboard/index.html @@ -23,6 +23,7 @@
+
diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js index e9f9ff9df..8b4c3311b 100644 --- a/www/whiteboard/main.js +++ b/www/whiteboard/main.js @@ -47,6 +47,7 @@ define([ var $pickers = $('#pickers'); var $colors = $('#colors'); var $cursors = $('#cursors'); + var $deleteButton = $('#delete'); var $toggle = $('#toggleDraw'); var $width = $('#width'); @@ -151,23 +152,27 @@ define([ module.draw = !module.draw; canvas.isDrawingMode = module.draw; $toggle.text(module.draw ? Messages.canvas_disable : Messages.canvas_enable); + if (module.draw) { $deleteButton.hide(); } + else { $deleteButton.show(); } }; $toggle.click(toggleDrawMode); - $(window).on('keyup', function (e) { - if (e.which === 46) { - if (canvas.getActiveObject()) { - canvas.getActiveObject().remove(); - } - if (canvas.getActiveGroup()) { - canvas.getActiveGroup()._objects.forEach(function (el) { - el.remove(); - }); - canvas.discardActiveGroup(); - } - canvas.renderAll(); - onLocal(); + var deleteSelection = function () { + if (canvas.getActiveObject()) { + canvas.getActiveObject().remove(); } + if (canvas.getActiveGroup()) { + canvas.getActiveGroup()._objects.forEach(function (el) { + el.remove(); + }); + canvas.discardActiveGroup(); + } + canvas.renderAll(); + onLocal(); + }; + $deleteButton.click(deleteSelection); + $(window).on('keyup', function (e) { + if (e.which === 46) { deleteSelection (); } }); var setEditable = function (bool) { diff --git a/www/whiteboard/whiteboard.css b/www/whiteboard/whiteboard.css index 5fe1b6841..93dc14f5c 100644 --- a/www/whiteboard/whiteboard.css +++ b/www/whiteboard/whiteboard.css @@ -38,6 +38,7 @@ body { vertical-align: middle; } #controls #clear, +#controls #delete, #controls #toggleDraw { display: inline; vertical-align: middle; diff --git a/www/whiteboard/whiteboard.less b/www/whiteboard/whiteboard.less index 75c979456..0b13c07bf 100644 --- a/www/whiteboard/whiteboard.less +++ b/www/whiteboard/whiteboard.less @@ -45,7 +45,7 @@ body { #width { .middle; } - #clear, #toggleDraw { + #clear, #delete, #toggleDraw { display: inline; vertical-align: middle; }