web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #135 from blumeva/staging

Browse Source 
Staging
This commit is contained in:
ansuz
2017-06-13 14:23:41 +02:00
committed by GitHub
parent 1b574da053 0004be521c
commit 88c2c0afde
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.fr.js
View File

@@ -214,6 +214,8 @@ define(function () {
out.canvas_enable = "Activer le dessin"; out.canvas_enable = "Activer le dessin";
out.canvas_width = "Épaisseur"; out.canvas_width = "Épaisseur";
out.canvas_opacity = "Opacité"; out.canvas_opacity = "Opacité";
out.canvas_opacityLabel = "opacité: {0}";
out.canvas_widthLabel = "taille: {0}";
// File manager // File manager

3
customize.dist/translations/messages.js
View File

@@ -216,6 +216,9 @@ define(function () {
out.canvas_enable = "Enable draw"; out.canvas_enable = "Enable draw";
out.canvas_width = "Width"; out.canvas_width = "Width";
out.canvas_opacity = "Opacity"; out.canvas_opacity = "Opacity";
out.canvas_opacityLabel = "opacity: {0}";
out.canvas_widthLabel = "Width: {0}";
// File manager // File manager

4
www/whiteboard/main.js
View File

@@ -97,7 +97,7 @@ window.canvas = canvas;
var updateBrushWidth = function () { var updateBrushWidth = function () {
var val = $width.val(); var val = $width.val();
canvas.freeDrawingBrush.width = Number(val); canvas.freeDrawingBrush.width = Number(val);
$widthLabel.text(val); $widthLabel.text(Cryptpad.Messages._getKey("canvas_widthLabel", [val]));
createCursor(); createCursor();
}; };
updateBrushWidth(); updateBrushWidth();
@@ -108,7 +108,7 @@ window.canvas = canvas;
var val = $opacity.val(); var val = $opacity.val();
brush.opacity = Number(val); brush.opacity = Number(val);
canvas.freeDrawingBrush.color = Colors.hex2rgba(brush.color, brush.opacity); canvas.freeDrawingBrush.color = Colors.hex2rgba(brush.color, brush.opacity);
$opacityLabel.text(val); $opacityLabel.text(Cryptpad.Messages._getKey("canvas_opacityLabel", [val]));
createCursor(); createCursor();
}; };
updateBrushOpacity(); updateBrushOpacity();