|
|
@ -51,7 +51,7 @@ export class ChatView implements Observer<ChatMessageViewModel> { |
|
|
|
} break; |
|
|
|
case "new": { |
|
|
|
const rev: ChatMessageViewModel[] = Object.create(cd.data) |
|
|
|
rev.reverse(); |
|
|
|
// rev.reverse();
|
|
|
|
let arr: string[] = []; |
|
|
|
rev.forEach((vm: ChatMessageViewModel) => { |
|
|
|
const vmTemp: ChatMessageViewModel = { ...vm }; |
|
|
@ -67,7 +67,7 @@ export class ChatView implements Observer<ChatMessageViewModel> { |
|
|
|
else { |
|
|
|
rendered = DOMPurify.sanitize(this._messageReceiveTemplate(vmTemp)); |
|
|
|
} |
|
|
|
$(this._messageContainer).prepend(rendered); |
|
|
|
$(this._messageContainer).append(rendered); |
|
|
|
}); |
|
|
|
$(this._messageContainer).stop().animate({ |
|
|
|
scrollTop: $(this._messageContainer)[0].scrollHeight |
|
|
@ -148,27 +148,24 @@ export class ChatView implements Observer<ChatMessageViewModel> { |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
// @ts-ignore
|
|
|
|
const messageContent = chatInput.value; |
|
|
|
const context = { |
|
|
|
fromUser: JsonAPI.principleName, toUser: "", |
|
|
|
message: this._markdownService.render(messageContent), |
|
|
|
messageTime: new Date().toLocaleString() |
|
|
|
const msgTime = new Date(); |
|
|
|
const context: ChatMessageViewModel = { |
|
|
|
fromUser: JsonAPI.principleName || "error", |
|
|
|
toUser: "", |
|
|
|
message: messageContent, |
|
|
|
messageTime: msgTime |
|
|
|
}; |
|
|
|
// @ts-ignore
|
|
|
|
const msgContainer: string = this._messageSendTemplate(context); |
|
|
|
$(this._messageContainer).append(DOMPurify.sanitize(msgContainer)); |
|
|
|
// scrollChatAreaAnimated(2400);
|
|
|
|
// let messageCipher = sjcl.encrypt(passphraseInput.value, messageContent, { mode: "gcm", ts: 128, adata: "", iter: iterations });
|
|
|
|
|
|
|
|
this.update({data: new Array(context), op: "new"}) |
|
|
|
|
|
|
|
let messageCipher: MessageCipherDTO = this._encryptionService.encrypt(passphraseInput.value, messageContent) |
|
|
|
// let messageCipherJson = JSON.parse(messageCipher);
|
|
|
|
let chatMessageDTO = { |
|
|
|
"fromUser": JsonAPI.principleName, |
|
|
|
"fromUser": JsonAPI.principleName || "", |
|
|
|
"toUser": contactName, |
|
|
|
"messageCipher": messageCipher, |
|
|
|
// "messageTime": null
|
|
|
|
messageTime: msgTime |
|
|
|
} |
|
|
|
// @ts-ignore
|
|
|
|
this._sendMessageAJAX(chatMessageDTO); |
|
|
|
} |
|
|
|
|
|
|
|