fixes in settings view and message deletion

This commit is contained in:
or-else
2018-11-21 11:50:04 +03:00
parent 7248b5c398
commit fbbab3e7d6
7 changed files with 13 additions and 13 deletions
-1
View File
@@ -32,7 +32,6 @@ export default class SettingsView extends React.PureComponent {
handleServerAddressChange(name) {
this.setState({serverAddress: name});
this.props.onServerAddressChange(name);
}
render() {
-1
View File
@@ -114,7 +114,6 @@ class SidepanelView extends React.Component {
<SettingsView
transport={this.props.transport}
serverAddress={this.props.serverAddress}
onServerAddressChange={this.props.onGlobalSettings}
onCancel={this.props.onCancel}
onUpdate={this.props.onGlobalSettings} /> :
+7 -3
View File
@@ -170,15 +170,19 @@ class ContextMenu extends React.Component {
console.log("Topic not found: ", params.topicName);
return;
}
// We don't know if the message is still pending (e.g. attachment is being uploaded),
// so try cancelling first. No harm if we can't cancel.
if (topic.cancelSend(params.seq)) {
return Promise.resolve();
// The message can be cancelled if transmission to the server has not
// started yet or if the message send has failed.
if (!all && topic.cancelSend(params.seq)) {
return;
}
// Can't cancel. Delete instead.
var promise = all ?
let promise = all ?
topic.delMessagesAll(hard) :
topic.delMessagesList([params.seq], hard);
promise.catch((err) => {
if (errorHandler) {
errorHandler(err.message, 'err');