From c7023134898554b27ff78bed0541d6a25074f190 Mon Sep 17 00:00:00 2001 From: XWiki SAS Date: Mon, 12 Jun 2017 17:34:45 +0200 Subject: [PATCH 1/5] change label texte --- www/whiteboard/main.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js index dce656473..a96fdb457 100644 --- a/www/whiteboard/main.js +++ b/www/whiteboard/main.js @@ -50,7 +50,7 @@ define([ }; var $toggle = $('#toggleDraw'); - var $width = $('#width'); + var $width = $('#width'); // brush width var $widthLabel = $('label[for="width"]'); var $opacity = $('#opacity'); var $opacityLabel = $('label[for="opacity"]'); @@ -98,7 +98,9 @@ window.canvas = canvas; var val = $width.val(); canvas.freeDrawingBrush.width = Number(val); $widthLabel.text(val); + $widthLabel.text("width: " + $width.val()) createCursor(); + console.log("change size") }; updateBrushWidth(); @@ -108,8 +110,11 @@ window.canvas = canvas; var val = $opacity.val(); brush.opacity = Number(val); canvas.freeDrawingBrush.color = Colors.hex2rgba(brush.color, brush.opacity); - $opacityLabel.text(val); + $opacityLabel.text(val) + $opacityLabel.text("opacity: " + $opacity.val()); createCursor(); + console.log("change opacity") + console.log("opacity: " + $opacity.val()) }; updateBrushOpacity(); From 49370764c17f881362c0346c5d65333524816204 Mon Sep 17 00:00:00 2001 From: XWiki SAS Date: Mon, 12 Jun 2017 18:14:33 +0200 Subject: [PATCH 2/5] change whiteboard translation --- customize.dist/translations/messages.js | 3 +++ www/whiteboard/main.js | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index fa08fb1c7..cc279516c 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -211,6 +211,9 @@ define(function () { out.canvas_enable = "Enable draw"; out.canvas_width = "Width"; out.canvas_opacity = "Opacity"; + out.canvas_opacityLabel = "opacity: {0}"; + out.canvas_widthLabel = "Width: {0}"; + // File manager diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js index a96fdb457..a19b5ba63 100644 --- a/www/whiteboard/main.js +++ b/www/whiteboard/main.js @@ -97,7 +97,8 @@ window.canvas = canvas; var updateBrushWidth = function () { var val = $width.val(); canvas.freeDrawingBrush.width = Number(val); - $widthLabel.text(val); + $widthLabel.text(val) + $widthLabel.text(Cryptpad.Messages._getKey("canvas_widthLabel", [val])) $widthLabel.text("width: " + $width.val()) createCursor(); console.log("change size") @@ -111,7 +112,7 @@ window.canvas = canvas; brush.opacity = Number(val); canvas.freeDrawingBrush.color = Colors.hex2rgba(brush.color, brush.opacity); $opacityLabel.text(val) - $opacityLabel.text("opacity: " + $opacity.val()); + $opacityLabel.text(Cryptpad.Messages._getKey("canvas_opacityLabel", [val])); createCursor(); console.log("change opacity") console.log("opacity: " + $opacity.val()) From 40cf7ea107344672b3c73b3bda94d1e3d70aa7f8 Mon Sep 17 00:00:00 2001 From: XWiki SAS Date: Tue, 13 Jun 2017 14:11:22 +0200 Subject: [PATCH 3/5] change whiteboard --- www/whiteboard/main.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js index a19b5ba63..4005929cc 100644 --- a/www/whiteboard/main.js +++ b/www/whiteboard/main.js @@ -99,9 +99,7 @@ window.canvas = canvas; canvas.freeDrawingBrush.width = Number(val); $widthLabel.text(val) $widthLabel.text(Cryptpad.Messages._getKey("canvas_widthLabel", [val])) - $widthLabel.text("width: " + $width.val()) createCursor(); - console.log("change size") }; updateBrushWidth(); @@ -114,8 +112,6 @@ window.canvas = canvas; $opacityLabel.text(val) $opacityLabel.text(Cryptpad.Messages._getKey("canvas_opacityLabel", [val])); createCursor(); - console.log("change opacity") - console.log("opacity: " + $opacity.val()) }; updateBrushOpacity(); From 74c9b663ddf9826b4ebd4f3e94014c236790d998 Mon Sep 17 00:00:00 2001 From: XWiki SAS Date: Tue, 13 Jun 2017 14:14:36 +0200 Subject: [PATCH 4/5] changing whiteboard --- www/whiteboard/main.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js index 4005929cc..40e76f9fd 100644 --- a/www/whiteboard/main.js +++ b/www/whiteboard/main.js @@ -50,7 +50,7 @@ define([ }; var $toggle = $('#toggleDraw'); - var $width = $('#width'); // brush width + var $width = $('#width'); var $widthLabel = $('label[for="width"]'); var $opacity = $('#opacity'); var $opacityLabel = $('label[for="opacity"]'); @@ -97,8 +97,7 @@ window.canvas = canvas; var updateBrushWidth = function () { var val = $width.val(); canvas.freeDrawingBrush.width = Number(val); - $widthLabel.text(val) - $widthLabel.text(Cryptpad.Messages._getKey("canvas_widthLabel", [val])) + $widthLabel.text(Cryptpad.Messages._getKey("canvas_widthLabel", [val])); createCursor(); }; updateBrushWidth(); @@ -109,7 +108,6 @@ window.canvas = canvas; var val = $opacity.val(); brush.opacity = Number(val); canvas.freeDrawingBrush.color = Colors.hex2rgba(brush.color, brush.opacity); - $opacityLabel.text(val) $opacityLabel.text(Cryptpad.Messages._getKey("canvas_opacityLabel", [val])); createCursor(); }; From 0004be521cf8d4edd1f5125bbc2582254c7b42d3 Mon Sep 17 00:00:00 2001 From: XWiki SAS Date: Tue, 13 Jun 2017 14:21:22 +0200 Subject: [PATCH 5/5] change translation --- customize.dist/translations/messages.fr.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 64b40f553..f4e504fb3 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -209,6 +209,8 @@ define(function () { out.canvas_enable = "Activer le dessin"; out.canvas_width = "Épaisseur"; out.canvas_opacity = "Opacité"; + out.canvas_opacityLabel = "opacité: {0}"; + out.canvas_widthLabel = "taille: {0}"; // File manager