imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feed

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-03-17 16:13:40 +01:00
commit 431a2c033d
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
448 changed files with 9411 additions and 2052 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/voip/CallView.tsx
View file

@ -31,6 +31,7 @@ import CallContextMenu from '../context_menus/CallContextMenu';
import { avatarUrlForMember } from '../../../Avatar';
import DialpadContextMenu from '../context_menus/DialpadContextMenu';
import { CallFeed } from 'matrix-js-sdk/src/webrtc/callFeed';
import {replaceableComponent} from "../../../utils/replaceableComponent";
interface IProps {
// The call for us to display
@ -95,6 +96,7 @@ const CONTROLS_HIDE_DELAY = 1000;
// height to get the max height of the video
const CONTEXT_MENU_VPADDING = 8; // How far the context menu sits above the button (px)
@replaceableComponent("views.voip.CallView")
export default class CallView extends React.Component<IProps, IState> {
private dispatcherRef: string;
private contentRef = createRef<HTMLDivElement>();