[mirotalksfu] - fix typo

main
Miroslav Pejic 4 years ago
parent ebd34c186a
commit a316a3ec8e

@ -41,7 +41,7 @@ let isVideoOn = true;
let recTimer = null; let recTimer = null;
let recElapsedTime = null; let recElapsedTime = null;
const fileSharingInput = 'image/*'; const wbImageInput = 'image/*';
const wbWidth = 800; const wbWidth = 800;
const wbHeight = 600; const wbHeight = 600;
let wbCanvas = null; let wbCanvas = null;
@ -932,42 +932,44 @@ function setupWhiteboardCanvasSize() {
wbCanvas.setWidth(optimalSize[0] * scaleFactorX); wbCanvas.setWidth(optimalSize[0] * scaleFactorX);
wbCanvas.setHeight(optimalSize[1] * scaleFactorX); wbCanvas.setHeight(optimalSize[1] * scaleFactorX);
wbCanvas.setZoom(scaleFactorX); wbCanvas.setZoom(scaleFactorX);
document.documentElement.style.setProperty('--wb-width', optimalSize[0] * scaleFactorX); setWhiteboardSize(optimalSize[0] * scaleFactorX, optimalSize[1] * scaleFactorX);
document.documentElement.style.setProperty('--wb-height', optimalSize[1] * scaleFactorX);
} else if (scaleFactorX > scaleFactorY && scaleFactorY < 1) { } else if (scaleFactorX > scaleFactorY && scaleFactorY < 1) {
wbCanvas.setWidth(optimalSize[0] * scaleFactorY); wbCanvas.setWidth(optimalSize[0] * scaleFactorY);
wbCanvas.setHeight(optimalSize[1] * scaleFactorY); wbCanvas.setHeight(optimalSize[1] * scaleFactorY);
wbCanvas.setZoom(scaleFactorY); wbCanvas.setZoom(scaleFactorY);
document.documentElement.style.setProperty('--wb-width', optimalSize[0] * scaleFactorY); setWhiteboardSize(optimalSize[0] * scaleFactorY, optimalSize[1] * scaleFactorY);
document.documentElement.style.setProperty('--wb-height', optimalSize[1] * scaleFactorY);
} else { } else {
wbCanvas.setWidth(optimalSize[0]); wbCanvas.setWidth(optimalSize[0]);
wbCanvas.setHeight(optimalSize[1]); wbCanvas.setHeight(optimalSize[1]);
wbCanvas.setZoom(1); wbCanvas.setZoom(1);
document.documentElement.style.setProperty('--wb-width', optimalSize[0]); setWhiteboardSize(optimalSize[0], optimalSize[1]);
document.documentElement.style.setProperty('--wb-height', optimalSize[1]);
} }
wbCanvas.calcOffset(); wbCanvas.calcOffset();
wbCanvas.renderAll(); wbCanvas.renderAll();
} }
function whiteboardIsDrawingMode(b) { function setWhiteboardSize(w, h) {
wbCanvas.isDrawingMode = b; document.documentElement.style.setProperty('--wb-width', w);
if (b) { document.documentElement.style.setProperty('--wb-height', h);
whiteboardPencilBtn.style.color = 'green'; }
whiteboardObjectBtn.style.color = 'white';
whiteboardEraserBtn.style.color = 'white'; function whiteboardIsDrawingMode(status) {
wbCanvas.isDrawingMode = status;
if (status) {
setColor(whiteboardPencilBtn, 'green');
setColor(whiteboardObjectBtn, 'white');
setColor(whiteboardEraserBtn, 'white');
wbIsEraser = false; wbIsEraser = false;
} else { } else {
whiteboardPencilBtn.style.color = 'white'; setColor(whiteboardPencilBtn, 'white');
whiteboardObjectBtn.style.color = 'green'; setColor(whiteboardObjectBtn, 'green');
} }
} }
function whiteboardIsEraser(b) { function whiteboardIsEraser(status) {
whiteboardIsDrawingMode(false); whiteboardIsDrawingMode(false);
wbIsEraser = b; wbIsEraser = status;
whiteboardEraserBtn.style.color = wbIsEraser ? 'green' : 'white'; setColor(whiteboardEraserBtn, wbIsEraser ? 'green' : 'white');
} }
function whiteboardAddObj(type) { function whiteboardAddObj(type) {
@ -1000,7 +1002,7 @@ function whiteboardAddObj(type) {
title: 'Select the image', title: 'Select the image',
input: 'file', input: 'file',
inputAttributes: { inputAttributes: {
accept: fileSharingInput, accept: wbImageInput,
'aria-label': 'Select the image', 'aria-label': 'Select the image',
}, },
showDenyButton: true, showDenyButton: true,
@ -1016,7 +1018,7 @@ function whiteboardAddObj(type) {
imgObj.src = event.target.result; imgObj.src = event.target.result;
imgObj.onload = function () { imgObj.onload = function () {
let image = new fabric.Image(imgObj); let image = new fabric.Image(imgObj);
image.set({ top: 0, left: 0 }).scale(0.5); image.set({ top: 0, left: 0 }).scale(0.3);
addWbCanvasObj(image); addWbCanvasObj(image);
}; };
}; };
@ -1170,7 +1172,7 @@ function wbCanvasSaveImg() {
function wbCanvasToJson() { function wbCanvasToJson() {
if (rc.thereIsConsumers()) { if (rc.thereIsConsumers()) {
var wbCanvasJson = JSON.stringify(wbCanvas.toJSON()); let wbCanvasJson = JSON.stringify(wbCanvas.toJSON());
rc.socket.emit('wbCanvasToJson', wbCanvasJson); rc.socket.emit('wbCanvasToJson', wbCanvasJson);
} }
} }

@ -41,7 +41,7 @@ function resizeVideoMedia() {
function setWidth(width, margin) { function setWidth(width, margin) {
let Cameras = document.getElementsByClassName('Camera'); let Cameras = document.getElementsByClassName('Camera');
for (var s = 0; s < Cameras.length; s++) { for (let s = 0; s < Cameras.length; s++) {
Cameras[s].style.width = width + 'px'; Cameras[s].style.width = width + 'px';
Cameras[s].style.margin = margin + 'px'; Cameras[s].style.margin = margin + 'px';
Cameras[s].style.height = width * 0.7 + 'px'; Cameras[s].style.height = width * 0.7 + 'px';

Loading…
Cancel
Save