merge fixes from devel

This commit is contained in:
or-else
2022-06-30 11:05:53 -07:00
9 changed files with 22 additions and 18 deletions
+1 -1
View File
@@ -32,7 +32,7 @@ If applicable, add screenshots to help explain your problem.
- TinodeWeb Version [e.g. 0.16.6]
**Console log**
Please attach or insert console log which illustrates the problem.
Please attach or insert console log which illustrates the problem. Please use the log produced by `index-dev.html`, not `index.html`; `index.html` uses minified javascript which produces unusable logs.
**Additional context**
Add any other context about the problem here.
+5 -3
View File
@@ -814,11 +814,11 @@ class TinodeWeb extends React.Component {
} else if (what == 'del') {
// TODO: messages deleted (hard or soft) -- update pill counter.
} else if (what == 'upd' || what == 'call') {
// call, upd - handled elsewhere. Explicitly ignoring here.
// upd, call - handled by the SDK. Explicitly ignoring here.
} else {
// TODO(gene): handle other types of notifications:
// * ua -- user agent changes (maybe display a pictogram for mobile/desktop).
console.info("Unsupported (yet) contact update:" + what + " in: " + cont.topic);
console.info("Unsupported (yet) presence update:", what, "in", cont.topic);
}
}
@@ -1329,7 +1329,9 @@ class TinodeWeb extends React.Component {
handleUnarchive(topicName) {
const topic = this.tinode.getTopic(topicName);
if (topic) {
topic.archive(false);
topic.archive(false).catch((err) => {
this.handleError(err.message, 'err');
});
}
}
+1 -1
View File
@@ -45,7 +45,7 @@ class SendMessage extends React.PureComponent {
quote: null,
message: '',
audioRec: false,
audioAvailable: !!navigator.mediaDevices.getUserMedia,
audioAvailable: !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia),
// Make initial keypress time as if it happened 5001 milliseconds in the past.
keypressTimestamp: new Date().getTime() - KEYPRESS_DELAY - 1
};
+5 -3
View File
@@ -8366,7 +8366,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
});
}
} else if (what == 'del') {} else if (what == 'upd' || what == 'call') {} else {
console.info("Unsupported (yet) contact update:" + what + " in: " + cont.topic);
console.info("Unsupported (yet) presence update:", what, "in", cont.topic);
}
}
@@ -8913,7 +8913,9 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
const topic = this.tinode.getTopic(topicName);
if (topic) {
topic.archive(false);
topic.archive(false).catch(err => {
this.handleError(err.message, 'err');
});
}
}
@@ -15743,7 +15745,7 @@ class SendMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComp
quote: null,
message: '',
audioRec: false,
audioAvailable: !!navigator.mediaDevices.getUserMedia,
audioAvailable: !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia),
keypressTimestamp: new Date().getTime() - _config_js__WEBPACK_IMPORTED_MODULE_4__.KEYPRESS_DELAY - 1
};
this.handlePasteEvent = this.handlePasteEvent.bind(this);
+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
+6 -6
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