fix forwarding previews, remove audio button when forwarding

This commit is contained in:
or-else
2022-03-16 20:01:00 -07:00
parent 7044ce08c1
commit 3d2af23f14
8 changed files with 28 additions and 31 deletions
+2 -2
View File
@@ -1475,10 +1475,10 @@ class TinodeWeb extends React.Component {
} }
const header = '➦ ' + params.userName; const header = '➦ ' + params.userName;
const content = typeof params.content == 'string' ? Drafty.init(params.content) : Drafty.forwardedContent(params.content); const content = typeof params.content == 'string' ? Drafty.init(params.content) : Drafty.forwardedContent(params.content);
const preview = Drafty.preview(content, FORWARDED_PREVIEW_LENGTH, undefined, params.forwarded != null); const preview = Drafty.preview(content, FORWARDED_PREVIEW_LENGTH, true);
const msg = Drafty.append(Drafty.appendLineBreak(Drafty.mention(header, params.userFrom)), content); const msg = Drafty.append(Drafty.appendLineBreak(Drafty.mention(header, params.userFrom)), content);
const msgPreview = Drafty.quote(header, params.userFrom, preview); const msgPreview = Drafty.quote(header, params.userFrom, preview);
const head = { const head = {
forwarded: params.topicName + ':' + params.seq forwarded: params.topicName + ':' + params.seq
}; };
+3 -3
View File
@@ -45,7 +45,7 @@ class SendMessage extends React.PureComponent {
quote: null, quote: null,
message: '', message: '',
audioRec: false, audioRec: false,
audioEnabled: !!navigator.mediaDevices.getUserMedia && this.props.onAttachAudio, audioAvailable: !!navigator.mediaDevices.getUserMedia,
// Make initial keypress time as if it happened 5001 milliseconds in the past. // Make initial keypress time as if it happened 5001 milliseconds in the past.
keypressTimestamp: new Date().getTime() - KEYPRESS_DELAY - 1 keypressTimestamp: new Date().getTime() - KEYPRESS_DELAY - 1
}; };
@@ -201,7 +201,7 @@ class SendMessage extends React.PureComponent {
</div> </div>
{this.state.quote} {this.state.quote}
</div>); </div>);
const audioEnabled = this.state.audioAvailable && this.props.onAttachAudio;
return ( return (
<div id="send-message-wrapper"> <div id="send-message-wrapper">
{this.state.quote && !this.props.noInput ? quote : null} {this.state.quote && !this.props.noInput ? quote : null}
@@ -230,7 +230,7 @@ class SendMessage extends React.PureComponent {
onKeyPress={this.handleKeyPress} onKeyPress={this.handleKeyPress}
ref={(ref) => {this.messageEditArea = ref;}} ref={(ref) => {this.messageEditArea = ref;}}
autoFocus />)} autoFocus />)}
{this.state.message || !this.state.audioEnabled ? {this.state.message || !audioEnabled ?
<a href="#" onClick={this.handleSend} title="Send"> <a href="#" onClick={this.handleSend} title="Send">
<i className="material-icons">send</i> <i className="material-icons">send</i>
</a> : </a> :
+5 -4
View File
@@ -6615,7 +6615,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
onSendMessage: this.sendMessage, onSendMessage: this.sendMessage,
onAttachFile: this.props.forwardMessage ? null : this.handleAttachFile, onAttachFile: this.props.forwardMessage ? null : this.handleAttachFile,
onAttachImage: this.props.forwardMessage ? null : this.handleAttachImage, onAttachImage: this.props.forwardMessage ? null : this.handleAttachImage,
onAttachAudio: this.sendAudioAttachment, onAttachAudio: this.props.forwardMessage ? null : this.sendAudioAttachment,
onError: this.props.onError, onError: this.props.onError,
reply: this.state.reply, reply: this.state.reply,
onQuoteClick: this.handleQuoteClick, onQuoteClick: this.handleQuoteClick,
@@ -8973,7 +8973,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
const header = '➦ ' + params.userName; const header = '➦ ' + params.userName;
const content = typeof params.content == 'string' ? tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.init(params.content) : tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.forwardedContent(params.content); const content = typeof params.content == 'string' ? tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.init(params.content) : tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.forwardedContent(params.content);
const preview = tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.preview(content, _config_js__WEBPACK_IMPORTED_MODULE_11__.FORWARDED_PREVIEW_LENGTH, undefined, params.forwarded != null); const preview = tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.preview(content, _config_js__WEBPACK_IMPORTED_MODULE_11__.FORWARDED_PREVIEW_LENGTH, true);
const msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.append(tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.appendLineBreak(tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.mention(header, params.userFrom)), content); const msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.append(tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.appendLineBreak(tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.mention(header, params.userFrom)), content);
const msgPreview = tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.quote(header, params.userFrom, preview); const msgPreview = tinode_sdk__WEBPACK_IMPORTED_MODULE_4__.Drafty.quote(header, params.userFrom, preview);
const head = { const head = {
@@ -14648,7 +14648,7 @@ class SendMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComp
quote: null, quote: null,
message: '', message: '',
audioRec: false, audioRec: false,
audioEnabled: !!navigator.mediaDevices.getUserMedia && this.props.onAttachAudio, audioAvailable: !!navigator.mediaDevices.getUserMedia,
keypressTimestamp: new Date().getTime() - _config_js__WEBPACK_IMPORTED_MODULE_4__.KEYPRESS_DELAY - 1 keypressTimestamp: new Date().getTime() - _config_js__WEBPACK_IMPORTED_MODULE_4__.KEYPRESS_DELAY - 1
}; };
this.handlePasteEvent = this.handlePasteEvent.bind(this); this.handlePasteEvent = this.handlePasteEvent.bind(this);
@@ -14807,6 +14807,7 @@ class SendMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComp
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", { }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
className: "material-icons gray" className: "material-icons gray"
}, "close"))), this.state.quote); }, "close"))), this.state.quote);
const audioEnabled = this.state.audioAvailable && this.props.onAttachAudio;
return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
id: "send-message-wrapper" id: "send-message-wrapper"
}, this.state.quote && !this.props.noInput ? quote : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }, this.state.quote && !this.props.noInput ? quote : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -14846,7 +14847,7 @@ class SendMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComp
this.messageEditArea = ref; this.messageEditArea = ref;
}, },
autoFocus: true autoFocus: true
}), this.state.message || !this.state.audioEnabled ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", { }), this.state.message || !audioEnabled ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", {
href: "#", href: "#",
onClick: this.handleSend, onClick: this.handleSend,
title: "Send" title: "Send"
+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
+13 -17
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