edited for code style consistency

This commit is contained in:
or-else
2022-11-19 17:14:43 -08:00
parent 3653453897
commit 72ec3b51a0
19 changed files with 216 additions and 337 deletions
+5 -9
View File
@@ -27,15 +27,11 @@ export default class Attachment extends React.Component {
const downloader = this.props.tinode.getLargeFileHelper();
this.setState({downloader: downloader});
downloader.download(url, filename, mimetype,
(loaded) => {
this.setState({progress: loaded / this.props.size});
},
(err) => {
this.props.onError(err, 'err');
}
).then(() => {
this.setState({downloader: null, progress: 0});
}).catch((err) => {
loaded => this.setState({progress: loaded / this.props.size}),
err => this.props.onError(err, 'err')
)
.then(_ => this.setState({downloader: null, progress: 0}))
.catch(err => {
if (err) {
this.props.onError("Error downloading file: " + err.message, 'err');
}
+1 -1
View File
@@ -118,7 +118,7 @@ export default class AudioPlayer extends React.PureComponent {
this.canvasContext.lineWidth = LINE_WIDTH;
const drawFrame = () => {
const drawFrame = _ => {
if (!this.canvasRef.current || !this.audioPlayer) {
// The component is unmounted.
return;
+1 -1
View File
@@ -105,7 +105,7 @@ export default class AudioRecorder extends React.PureComponent {
let prevBarCount = 0;
let volume = 0.0;
let countPerBar = 0;
const drawFrame = () => {
const drawFrame = _ => {
if (!this.startedOn) {
return;
}
+2 -2
View File
@@ -231,7 +231,7 @@ class CallPanel extends React.PureComponent {
const desc = new RTCSessionDescription(info.payload);
this.state.pc.setRemoteDescription(desc)
.then(_ => {
this.setState({ callInitialSetupComplete: true }, () => this.drainRemoteIceCandidatesCache());
this.setState({ callInitialSetupComplete: true }, _ => this.drainRemoteIceCandidatesCache());
})
.catch(this.reportError);
}
@@ -357,7 +357,7 @@ class CallPanel extends React.PureComponent {
})
.then(_ => {
this.props.onSendAnswer(this.props.topic, this.props.seq, pc.localDescription.toJSON());
this.setState({ callInitialSetupComplete: true }, () => this.drainRemoteIceCandidatesCache());
this.setState({ callInitialSetupComplete: true }, _ => this.drainRemoteIceCandidatesCache());
})
.catch(this.handleGetUserMediaError);
}
+13 -17
View File
@@ -196,7 +196,7 @@ class ContextMenu extends React.Component {
'menu_item_forward': {
id: 'menu_item_forward',
title: formatMessage(messages.forward),
handler: () => {} /* the action is taken directly in tinode-web */
handler: _ => {} /* the action is taken directly in tinode-web */
},
'menu_item_edit': {
id: 'menu_item_edit',
@@ -227,12 +227,10 @@ class ContextMenu extends React.Component {
return props.onShowAlert(
formatMessage(messages.block), // title
formatMessage(messages.topic_block_warning), // content
(() => {
return this.topicPermissionSetter('-JP', params, errorHandler).then((ctrl) => {
this.props.onTopicRemoved(params.topicName);
return ctrl;
});
}),
(_ => this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
this.props.onTopicRemoved(params.topicName);
return ctrl;
})),
null, // "OK"
true, // Show Reject button
null // "Cancel"
@@ -246,13 +244,13 @@ class ContextMenu extends React.Component {
return props.onShowAlert(
formatMessage(messages.topic_delete), // title
formatMessage(messages.topic_delete_warning), // content
(() => {
(_ => {
const topic = this.props.tinode.getTopic(params.topicName);
if (!topic) {
console.warn("Topic not found: ", params.topicName);
return;
}
return topic.delTopic(true).catch((err) => {
return topic.delTopic(true).catch(err => {
if (errorHandler) {
errorHandler(err.message, 'err');
}
@@ -273,7 +271,7 @@ class ContextMenu extends React.Component {
console.warn("Topic not found: ", params.topicName);
return;
}
return topic.archive(true).catch((err) => {
return topic.archive(true).catch(err => {
if (errorHandler) {
errorHandler(err.message, 'err');
}
@@ -289,7 +287,7 @@ class ContextMenu extends React.Component {
console.warn("Topic not found: ", params.topicName);
return;
}
return topic.archive(false).catch((err) => {
return topic.archive(false).catch(err => {
if (errorHandler) {
errorHandler(err.message, 'err');
}
@@ -311,7 +309,7 @@ class ContextMenu extends React.Component {
console.warn("Topic or user not found: '" + params.topicName + "', '" + params.user + "'");
return;
}
return topic.delSubscription(params.user).catch((err) => {
return topic.delSubscription(params.user).catch(err => {
if (errorHandler) {
errorHandler(err.message, 'err');
}
@@ -406,7 +404,7 @@ class ContextMenu extends React.Component {
topic.delMessagesAll(hard) :
topic.delMessagesList([params.seq], hard);
return promise.catch((err) => {
return promise.catch(err => {
if (errorHandler) {
errorHandler(err.message, 'err');
}
@@ -421,7 +419,7 @@ class ContextMenu extends React.Component {
return;
}
const msg = topic.createMessage(params.content, false);
return topic.publishDraft(msg).catch((err) => {
return topic.publishDraft(msg).catch(err => {
if (errorHandler) {
errorHandler(err.message, 'err');
}
@@ -438,9 +436,7 @@ class ContextMenu extends React.Component {
let result = topic.updateMode(params.user, mode);
if (errorHandler) {
result = result.catch((err) => {
errorHandler(err.message, 'err');
});
result = result.catch(err => errorHandler(err.message, 'err'));
}
return result;
}
+1 -1
View File
@@ -50,7 +50,7 @@ export default class InPlaceEdit extends React.Component {
handleStartEditing() {
if (!this.props.readOnly) {
this.setState({active: true}, () => {
this.setState({active: true}, _ => {
if (this.selfRef.current) {
this.selfRef.current.focus();
}
+2 -2
View File
@@ -20,7 +20,7 @@ export default class LazyImage extends React.PureComponent {
this.props.whenDone
.promise
.then(data => this.setState({src: data.src, style: {...this.state.style, padding: 0}}))
.catch(() => this.setState({src: 'img/broken_image.png'}));
.catch(_ => this.setState({src: 'img/broken_image.png'}));
}
componentWillUnmount() {
@@ -33,7 +33,7 @@ export default class LazyImage extends React.PureComponent {
this.props.whenDone
.promise
.then(data => this.setState({src: data.src, style: {...this.state.style, padding: 0}}))
.catch(() => this.setState({src: 'img/broken_image.png'}));
.catch(_ => this.setState({src: 'img/broken_image.png'}));
}
}
+4 -4
View File
@@ -91,7 +91,7 @@ class TopicSecurity extends React.PureComponent {
this.props.onShowAlert(
formatMessage(messages.topic_delete), // title
formatMessage(messages.topic_delete_warning), // content
(() => { this.props.onDeleteTopic(this.props.topic); }), // onConfirm
_ => this.props.onDeleteTopic(this.props.topic), // onConfirm
null, // "OK"
true, // Show Reject button
null // "Cancel"
@@ -104,7 +104,7 @@ class TopicSecurity extends React.PureComponent {
this.props.onShowAlert(
formatMessage(this.props.deleter ? messages.delete_messages : messages.clear_messages), // title
formatMessage(this.props.deleter ? messages.delete_messages_warning : messages.clear_messages_warning), // content
(() => { this.props.onDeleteMessages(this.props.topic); }), // onConfirm
_ => this.props.onDeleteMessages(this.props.topic), // onConfirm
null, // "OK"
true, // Show Reject button
null // "Cancel"
@@ -117,7 +117,7 @@ class TopicSecurity extends React.PureComponent {
this.props.onShowAlert(
formatMessage(messages.leave_chat), // title
formatMessage(messages.leave_chat_warning), // content
(() => { this.props.onLeaveTopic(this.props.topic); }), // onConfirm
_ => this.props.onLeaveTopic(this.props.topic), // onConfirm
null, // "OK"
true, // Show Reject button
null // "Cancel"
@@ -130,7 +130,7 @@ class TopicSecurity extends React.PureComponent {
this.props.onShowAlert(
formatMessage(messages.block_contact), // title
formatMessage(messages.block_contact_warning), // content
(() => { this.props.onBlockTopic(this.props.topic); }), // onConfirm
_ => this.props.onBlockTopic(this.props.topic), // onConfirm
null, // "OK"
true, // Show Reject button
null // "Cancel"
+1 -1
View File
@@ -52,7 +52,7 @@ export default class VisiblePassword extends React.PureComponent {
handleEditingFinished(e) {
if (e) {
let currentTarget = e.currentTarget;
setTimeout(() => {
setTimeout(_ => {
if (!currentTarget.contains(document.activeElement)) {
if (this.props.onFinished) {
this.props.onFinished(this.state.value);