Merge pull request #135 from blumeva/staging

Staging
This commit is contained in:
ansuz
2017-06-13 14:23:41 +02:00
committed by GitHub
3 changed files with 7 additions and 2 deletions

View File

@@ -97,7 +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]));
createCursor();
};
updateBrushWidth();
@@ -108,7 +108,7 @@ 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();
};
updateBrushOpacity();