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) { handleServerAddressChange(name) {
this.setState({serverAddress: name}); this.setState({serverAddress: name});
this.props.onServerAddressChange(name);
} }
render() { render() {
-1
View File
@@ -114,7 +114,6 @@ class SidepanelView extends React.Component {
<SettingsView <SettingsView
transport={this.props.transport} transport={this.props.transport}
serverAddress={this.props.serverAddress} serverAddress={this.props.serverAddress}
onServerAddressChange={this.props.onGlobalSettings}
onCancel={this.props.onCancel} onCancel={this.props.onCancel}
onUpdate={this.props.onGlobalSettings} /> : onUpdate={this.props.onGlobalSettings} /> :
+7 -3
View File
@@ -170,15 +170,19 @@ class ContextMenu extends React.Component {
console.log("Topic not found: ", params.topicName); console.log("Topic not found: ", params.topicName);
return; return;
} }
// We don't know if the message is still pending (e.g. attachment is being uploaded), // 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. // so try cancelling first. No harm if we can't cancel.
if (topic.cancelSend(params.seq)) { // The message can be cancelled if transmission to the server has not
return Promise.resolve(); // started yet or if the message send has failed.
if (!all && topic.cancelSend(params.seq)) {
return;
} }
// Can't cancel. Delete instead. // Can't cancel. Delete instead.
var promise = all ? let promise = all ?
topic.delMessagesAll(hard) : topic.delMessagesAll(hard) :
topic.delMessagesList([params.seq], hard); topic.delMessagesList([params.seq], hard);
promise.catch((err) => { promise.catch((err) => {
if (errorHandler) { if (errorHandler) {
errorHandler(err.message, 'err'); errorHandler(err.message, 'err');
+3 -5
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
+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