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

Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-07-20 13:24:05 +02:00
commit 66a3b0fe5f
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
313 changed files with 4348 additions and 3855 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/voip/CallPreview.tsx
View file

@ -30,6 +30,7 @@ import { replaceableComponent } from "../../../utils/replaceableComponent";
import UIStore from '../../../stores/UIStore';
import { lerp } from '../../../utils/AnimationUtils';
import { MarkedExecution } from '../../../utils/MarkedExecution';
import { EventSubscription } from 'fbemitter';
const PIP_VIEW_WIDTH = 336;
const PIP_VIEW_HEIGHT = 232;
@ -108,7 +109,7 @@ function getPrimarySecondaryCalls(calls: MatrixCall[]): [MatrixCall, MatrixCall[
*/
@replaceableComponent("views.voip.CallPreview")
export default class CallPreview extends React.Component<IProps, IState> {
private roomStoreToken: any;
private roomStoreToken: EventSubscription;
private dispatcherRef: string;
private settingsWatcherRef: string;
private callViewWrapper = createRef<HTMLDivElement>();
@ -240,7 +241,7 @@ export default class CallPreview extends React.Component<IProps, IState> {
this.scheduledUpdate.mark();
};
private onRoomViewStoreUpdate = (payload) => {
private onRoomViewStoreUpdate = () => {
if (RoomViewStore.getRoomId() === this.state.roomId) return;
const roomId = RoomViewStore.getRoomId();

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

@ -598,16 +598,18 @@ export default class CallView extends React.Component<IProps, IState> {
const transfereeName = transfereeRoom ? transfereeRoom.name : _t("unknown person");
holdTransferContent = <div className="mx_CallView_holdTransferContent">
{_t(
{ _t(
"Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>",
{
transferTarget: transferTargetName,
transferee: transfereeName,
},
{
a: sub => <AccessibleButton kind="link" onClick={this.onTransferClick}>{sub}</AccessibleButton>,
a: sub => <AccessibleButton kind="link" onClick={this.onTransferClick}>
{ sub }
</AccessibleButton>,
},
)}
) }
</div>;
} else if (isOnHold) {
let onHoldText = null;
@ -616,7 +618,7 @@ export default class CallView extends React.Component<IProps, IState> {
_td("You held the call <a>Switch</a>") : _td("You held the call <a>Resume</a>");
onHoldText = _t(holdString, {}, {
a: sub => <AccessibleButton kind="link" onClick={this.onCallResumeClick}>
{sub}
{ sub }
</AccessibleButton>,
});
} else if (this.state.isLocalOnHold) {
@ -625,7 +627,7 @@ export default class CallView extends React.Component<IProps, IState> {
});
}
holdTransferContent = <div className="mx_CallView_holdTransferContent">
{onHoldText}
{ onHoldText }
</div>;
}
@ -720,7 +722,7 @@ export default class CallView extends React.Component<IProps, IState> {
/>
</div>
</div>
<div className="mx_CallView_holdTransferContent">{_t("Connecting")}</div>
<div className="mx_CallView_holdTransferContent">{ _t("Connecting") }</div>
{ this.renderCallControls() }
</div>
);
@ -783,16 +785,16 @@ export default class CallView extends React.Component<IProps, IState> {
}
const headerControls = <div className="mx_CallView_header_controls">
{fullScreenButton}
{expandButton}
{ fullScreenButton }
{ expandButton }
</div>;
let header: React.ReactNode;
if (!this.props.pipMode) {
header = <div className="mx_CallView_header">
<div className="mx_CallView_header_phoneIcon"></div>
<span className="mx_CallView_header_callType">{callTypeText}</span>
{headerControls}
<span className="mx_CallView_header_callType">{ callTypeText }</span>
{ headerControls }
</div>;
myClassName = 'mx_CallView_large';
} else {
@ -802,7 +804,7 @@ export default class CallView extends React.Component<IProps, IState> {
<AccessibleButton element='span' onClick={this.onSecondaryRoomAvatarClick}>
<RoomAvatar room={secCallRoom} height={16} width={16} />
<span className="mx_CallView_secondaryCall_roomName">
{_t("%(name)s on hold", { name: secCallRoom.name })}
{ _t("%(name)s on hold", { name: secCallRoom.name }) }
</span>
</AccessibleButton>
</span>;
@ -817,13 +819,13 @@ export default class CallView extends React.Component<IProps, IState> {
<RoomAvatar room={callRoom} height={32} width={32} />
</AccessibleButton>
<div className="mx_CallView_header_callInfo">
<div className="mx_CallView_header_roomName">{callRoom.name}</div>
<div className="mx_CallView_header_roomName">{ callRoom.name }</div>
<div className="mx_CallView_header_callTypeSmall">
{callTypeText}
{secondaryCallInfo}
{ callTypeText }
{ secondaryCallInfo }
</div>
</div>
{headerControls}
{ headerControls }
</div>
);
myClassName = 'mx_CallView_pip';

6
src/components/views/voip/DialPad.tsx
View file

@ -42,9 +42,9 @@ class DialPadButton extends React.PureComponent<IButtonProps> {
switch (this.props.kind) {
case DialPadButtonKind.Digit:
return <AccessibleButton className="mx_DialPad_button" onClick={this.onClick}>
{this.props.digit}
{ this.props.digit }
<div className="mx_DialPad_buttonSubText">
{this.props.digitSubtext}
{ this.props.digitSubtext }
</div>
</AccessibleButton>;
case DialPadButtonKind.Dial:
@ -80,7 +80,7 @@ export default class Dialpad extends React.PureComponent<IProps> {
}
return <div className="mx_DialPad">
{buttonNodes}
{ buttonNodes }
</div>;
}
}

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

@ -101,7 +101,7 @@ export default class DialpadModal extends React.PureComponent<IProps, IState> {
</div>
<div className="mx_DialPadModal_header">
<form onSubmit={this.onFormSubmit}>
{dialPadField}
{ dialPadField }
</form>
</div>
<div className="mx_DialPadModal_dialPad">

8
src/components/views/voip/IncomingCallBox.tsx
View file

@ -133,8 +133,8 @@ export default class IncomingCallBox extends React.Component<IProps, IState> {
width={32}
/>
<div>
<h1>{caller}</h1>
<p>{incomingCallText}</p>
<h1>{ caller }</h1>
<p>{ incomingCallText }</p>
</div>
<AccessibleTooltipButton
className={silenceClass}
@ -144,7 +144,7 @@ export default class IncomingCallBox extends React.Component<IProps, IState> {
</div>
<div className="mx_IncomingCallBox_buttons">
<AccessibleButton
className={"mx_IncomingCallBox_decline"}
className="mx_IncomingCallBox_decline"
onClick={this.onRejectClick}
kind="danger"
>
@ -152,7 +152,7 @@ export default class IncomingCallBox extends React.Component<IProps, IState> {
</AccessibleButton>
<div className="mx_IncomingCallBox_spacer" />
<AccessibleButton
className={"mx_IncomingCallBox_accept"}
className="mx_IncomingCallBox_accept"
onClick={this.onAnswerClick}
kind="primary"
>