bug fixes

This commit is contained in:
or-else
2022-06-02 09:27:54 -07:00
parent feb2e4b3e3
commit 3af0b4409c
8 changed files with 18 additions and 17 deletions
+4
View File
@@ -1695,6 +1695,10 @@ video {
margin-top: 0.5rem; margin-top: 0.5rem;
} }
.caller-card .trusted-badge {
display: inline-block;
}
.call-party.peer .caller-name.inactive { .call-party.peer .caller-name.inactive {
position: absolute; position: absolute;
font-size: larger; font-size: larger;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -30,7 +30,7 @@ class BadgeList extends React.PureComponent {
if (this.props.trustedBadges && this.props.trustedBadges.length > 0) { if (this.props.trustedBadges && this.props.trustedBadges.length > 0) {
badges = []; badges = [];
this.props.trustedBadges.map((b) => { this.props.trustedBadges.map((b) => {
const comment = formatMessage(messages['badge_' + b]); const comment = this.props.short ? null : formatMessage(messages['badge_' + b]);
const style = 'material-icons ' + b + '-color'; const style = 'material-icons ' + b + '-color';
badges.push(<div className="trusted-badge" key={b}><i className={style}>{icon_mapping[b] || b}</i> {comment}</div>); badges.push(<div className="trusted-badge" key={b}><i className={style}>{icon_mapping[b] || b}</i> {comment}</div>);
}); });
+3 -5
View File
@@ -12,7 +12,7 @@ import { clipStr } from '../lib/utils.js'
const RING_SOUND = new Audio('audio/call-in.m4a'); const RING_SOUND = new Audio('audio/call-in.m4a');
export default class IncomingCall extends React.Component { export default class CallIncoming extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
@@ -128,10 +128,8 @@ export default class IncomingCall extends React.Component {
topic={this.props.topic} topic={this.props.topic}
title={this.state.fullName} /> title={this.state.fullName} />
</div> </div>
<div className="caller-name">{clipStr(this.state.fullName, MAX_PEER_TITLE_LENGTH)}</div> <div className="caller-name">{clipStr(this.state.fullName, MAX_PEER_TITLE_LENGTH)}
</div> <BadgeList short={true} trustedBadges={this.state.trustedBadges} /></div>
<div className="group incoming-call-badges">
<BadgeList trustedBadges={this.state.trustedBadges} />
</div> </div>
<div className="controls"> <div className="controls">
{this.props.callState == CALL_STATE_INCOMING_RECEIVED ? {this.props.callState == CALL_STATE_INCOMING_RECEIVED ?
+6 -7
View File
@@ -10848,7 +10848,7 @@ class BadgeList extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCompon
if (this.props.trustedBadges && this.props.trustedBadges.length > 0) { if (this.props.trustedBadges && this.props.trustedBadges.length > 0) {
badges = []; badges = [];
this.props.trustedBadges.map(b => { this.props.trustedBadges.map(b => {
const comment = formatMessage(messages['badge_' + b]); const comment = this.props.short ? null : formatMessage(messages['badge_' + b]);
const style = 'material-icons ' + b + '-color'; const style = 'material-icons ' + b + '-color';
badges.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { badges.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "trusted-badge", className: "trusted-badge",
@@ -10910,7 +10910,7 @@ class ButtonBack extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCompo
"use strict"; "use strict";
__webpack_require__.r(__webpack_exports__); __webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, { /* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": () => (/* binding */ IncomingCall) /* harmony export */ "default": () => (/* binding */ CallIncoming)
/* harmony export */ }); /* harmony export */ });
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react"); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
@@ -10928,7 +10928,7 @@ __webpack_require__.r(__webpack_exports__);
const RING_SOUND = new Audio('audio/call-in.m4a'); const RING_SOUND = new Audio('audio/call-in.m4a');
class IncomingCall extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) { class CallIncoming extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
@@ -11058,11 +11058,10 @@ class IncomingCall extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
title: this.state.fullName title: this.state.fullName
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { })), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "caller-name" className: "caller-name"
}, (0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_6__.clipStr)(this.state.fullName, _config_js__WEBPACK_IMPORTED_MODULE_3__.MAX_PEER_TITLE_LENGTH))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }, (0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_6__.clipStr)(this.state.fullName, _config_js__WEBPACK_IMPORTED_MODULE_3__.MAX_PEER_TITLE_LENGTH), react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_badge_list_jsx__WEBPACK_IMPORTED_MODULE_1__["default"], {
className: "group incoming-call-badges" short: true,
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_badge_list_jsx__WEBPACK_IMPORTED_MODULE_1__["default"], {
trustedBadges: this.state.trustedBadges trustedBadges: this.state.trustedBadges
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "controls" className: "controls"
}, this.props.callState == _constants_js__WEBPACK_IMPORTED_MODULE_4__.CALL_STATE_INCOMING_RECEIVED ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("button", { }, this.props.callState == _constants_js__WEBPACK_IMPORTED_MODULE_4__.CALL_STATE_INCOMING_RECEIVED ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("button", {
className: "danger", className: "danger",
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long