PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5294 from matrix-org/t3chguy/fix/w2

Browse source 
Fix StopGapWidget infinitely recursing
This commit is contained in:
Michael Telatynski 2020-10-07 11:08:44 +01:00 committed by GitHub
commit 709d33c21c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/elements/AccessibleTooltipButton.tsx
View file

@ -62,7 +62,8 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti
};
render() {
const {title, tooltip, children, tooltipClassName, ...props} = this.props;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const {title, tooltip, children, tooltipClassName, forceHide, ...props} = this.props;
const tip = this.state.hover ? <Tooltip
className="mx_AccessibleTooltipButton_container"

1
src/components/views/rooms/MessageComposer.js
View file

@ -437,6 +437,7 @@ export default class MessageComposer extends React.Component {
const canEndConf = WidgetUtils.canUserModifyWidgets(this.props.room.roomId);
controls.push(
<HangupButton
key="controls_hangup"
roomId={this.props.room.roomId}
isConference={true}
canEndConference={canEndConf}

2
src/stores/widgets/StopGapWidget.ts
View file

@ -66,7 +66,7 @@ class ElementWidget extends Widget {
if (WidgetType.JITSI.matches(this.type)) {
return WidgetUtils.getLocalJitsiWrapperUrl({
forLocalRender: true,
auth: this.rawData?.auth,
auth: super.rawData?.auth, // this.rawData can call templateUrl, do this to prevent looping
});
}
return super.templateUrl;