Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte
This commit is contained in:
commit
e5b3088b5e
@ -7,8 +7,6 @@
|
||||
import {videoFocusStore} from "../../Stores/VideoFocusStore";
|
||||
import {showReportScreenStore} from "../../Stores/ShowReportScreenStore";
|
||||
import {getColorByString, srcObject} from "./utils";
|
||||
import {obtainedMediaConstraintIsMobileStore} from "../../Stores/MediaStore";
|
||||
import {onDestroy} from "svelte";
|
||||
|
||||
export let peer: VideoPeer;
|
||||
let streamStore = peer.streamStore;
|
||||
@ -20,12 +18,6 @@
|
||||
showReportScreenStore.set({ userId:peer.userId, userName: peer.userName });
|
||||
}
|
||||
|
||||
let isMobile : boolean|null;
|
||||
const unsubscribe = obtainedMediaConstraintIsMobileStore.subscribe(value => {
|
||||
isMobile = value;
|
||||
});
|
||||
onDestroy(unsubscribe);
|
||||
|
||||
</script>
|
||||
|
||||
<div class="video-container">
|
||||
@ -45,7 +37,7 @@
|
||||
<img alt="Report this user" src={reportImg}>
|
||||
<span>Report/Block</span>
|
||||
</button>
|
||||
<video class:mobile="{isMobile === true}" use:srcObject={$streamStore} autoplay playsinline on:click={() => videoFocusStore.toggleFocus(peer)}></video>
|
||||
<video use:srcObject={$streamStore} autoplay playsinline on:click={() => videoFocusStore.toggleFocus(peer)}></video>
|
||||
<img src={blockSignImg} class="block-logo" alt="Block" />
|
||||
{#if $constraintStore && $constraintStore.audio !== false}
|
||||
<SoundMeterWidget stream={$streamStore}></SoundMeterWidget>
|
||||
|
@ -7,7 +7,6 @@ import type { UserSimplePeerInterface } from "./SimplePeer";
|
||||
import { readable, Readable, Unsubscriber } from "svelte/store";
|
||||
import {
|
||||
localStreamStore,
|
||||
obtainedMediaConstraintIsMobileStore,
|
||||
obtainedMediaConstraintStore,
|
||||
ObtainedMediaStreamConstraints,
|
||||
} from "../Stores/MediaStore";
|
||||
@ -162,9 +161,6 @@ export class VideoPeer extends Peer {
|
||||
} else {
|
||||
mediaManager.disabledVideoByUserId(this.userId);
|
||||
}
|
||||
if (message.isMobile != undefined) {
|
||||
obtainedMediaConstraintIsMobileStore.set(message.isMobile);
|
||||
}
|
||||
} else if (message.type === MESSAGE_TYPE_MESSAGE) {
|
||||
if (!blackListManager.isBlackListed(this.userUuid)) {
|
||||
chatMessagesStore.addExternalMessage(this.userId, message.message);
|
||||
|
@ -40,7 +40,6 @@
|
||||
.main-section {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
min-width: 400px;
|
||||
|
||||
& > div {
|
||||
z-index: 2;
|
||||
|
@ -44,7 +44,7 @@ body .message-info.warning{
|
||||
video {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
max-height: 90vh;
|
||||
object-fit: cover;
|
||||
cursor: url('./images/cursor_pointer.png'), pointer;
|
||||
|
||||
&.mobile{
|
||||
@ -76,7 +76,6 @@ body .message-info.warning{
|
||||
left: 5px;
|
||||
bottom: 5px;
|
||||
padding: 10px;
|
||||
z-index: 2;
|
||||
|
||||
&.active {
|
||||
display: block !important;
|
||||
@ -547,6 +546,10 @@ input[type=range]:focus::-ms-fill-upper {
|
||||
cursor: url('./images/cursor_pointer.png'), pointer;
|
||||
border-radius: 15px 15px 15px 15px;
|
||||
pointer-events: auto;
|
||||
|
||||
video {
|
||||
max-height: 21vh;
|
||||
}
|
||||
}
|
||||
|
||||
.sidebar > div:hover {
|
||||
|
Loading…
Reference in New Issue
Block a user