Merge branch 'master' into fixes

This commit is contained in:
Khush Jammu 2020-06-01 12:21:38 +08:00 committed by GitHub
commit 30bd5b9ba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

4
public/css/chat.css vendored
View File

@ -338,7 +338,7 @@ button:hover {
padding: 12px; padding: 12px;
max-width: 100%; max-width: 100%;
border-style: solid; border-style: solid;
border-width: 3px; border-width: 2px;
border-color: var(--bloc-color); border-color: var(--bloc-color);
border-radius: 20px 20px 20px 5px; border-radius: 20px 20px 20px 5px;
box-shadow: 6px 6px 12px #030506, -6px -6px 12px #23242a; box-shadow: 6px 6px 12px #030506, -6px -6px 12px #23242a;
@ -349,7 +349,7 @@ button:hover {
background-color: rgb(47, 48, 52); background-color: rgb(47, 48, 52);
color: #fff; color: #fff;
border-style: solid; border-style: solid;
border-width: 3px; border-width: 2px;
border-color: var(--bloc-color); border-color: var(--bloc-color);
border-radius: 20px 20px 5px 20px; border-radius: 20px 20px 5px 20px;
box-shadow: 6px 6px 12px #030506, -6px -6px 12px #22232a; box-shadow: 6px 6px 12px #030506, -6px -6px 12px #22232a;

View File

@ -32,6 +32,7 @@ var dataChannel = new Map();
var VideoChat = { var VideoChat = {
videoEnabled: true, videoEnabled: true,
audioEnabled: true, audioEnabled: true,
borderColor: `hsl(${Math.floor(Math.random() * 360)}, 70%, 80%)`,
connected: new Map(), connected: new Map(),
localICECandidates: {}, localICECandidates: {},
socket: io(), socket: io(),
@ -175,6 +176,8 @@ var VideoChat = {
recieveCaptions(cleanedMessage); recieveCaptions(cleanedMessage);
} else if (dataType === "tog:") { } else if (dataType === "tog:") {
toggleSendCaptions(); toggleSendCaptions();
} else if (dataType === "clr:") {
setStreamColor(uuid, cleanedMessage);
} }
}; };
// Called when dataChannel is successfully opened // Called when dataChannel is successfully opened