Qortal/qortal-ui
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-03-27 15:55:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from JustinWesleyFerrari/feature/refactor-chat

Browse Source 
Feature/refactor chat
This commit is contained in:
AlphaX-Projects 2022-09-15 20:54:56 +02:00 committed by GitHub
commit 8a98bfcfa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qortal-ui-plugins/plugins/core/components/ChatPage.js
View File

@ -315,7 +315,6 @@ class ChatPage extends LitElement {
} }
async processMessages(messages, isInitial) { async processMessages(messages, isInitial) {
console.log({ messages })
if (isInitial) { if (isInitial) {
this.messages = messages.map((eachMessage) => { this.messages = messages.map((eachMessage) => {

33
qortal-ui-plugins/plugins/core/components/ChatScroller.js
View File

@ -1,17 +1,18 @@
import { LitElement, html, css } from 'lit' import { LitElement, html, css } from 'lit';
import { render } from 'lit/html.js' import { render } from 'lit/html.js';
import { repeat } from 'lit/directives/repeat.js' import { repeat } from 'lit/directives/repeat.js';
import { translate, get } from 'lit-translate' import { translate, get } from 'lit-translate';
import { Epml } from "../../../epml" import {unsafeHTML} from 'lit/directives/unsafe-html.js';
import { chatStyles } from './ChatScroller-css.js' import { chatStyles } from './ChatScroller-css.js'
import './LevelFounder.js' import { Epml } from "../../../epml";
import './NameMenu.js' import './LevelFounder.js';
import './ChatModals.js' import './NameMenu.js';
import '@vaadin/icons' import './ChatModals.js';
import '@vaadin/icon' import '@vaadin/icons';
import '@material/mwc-button' import '@vaadin/icon';
import '@material/mwc-dialog' import '@material/mwc-button';
import '@material/mwc-icon' import '@material/mwc-dialog';
import '@material/mwc-icon';
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent }) const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
class ChatScroller extends LitElement { class ChatScroller extends LitElement {
@ -81,7 +82,6 @@ class ChatScroller extends LitElement {
_upObserverhandler(entries) { _upObserverhandler(entries) {
if (entries[0].isIntersecting) { if (entries[0].isIntersecting) {
let _scrollElement = entries[0].target.nextElementSibling let _scrollElement = entries[0].target.nextElementSibling
console.log({ _scrollElement })
this._getOldMessage(_scrollElement) this._getOldMessage(_scrollElement)
} }
} }
@ -132,6 +132,8 @@ class MessageTemplate extends LitElement {
static get properties() { static get properties() {
return { return {
messageObj: { type: Object }, messageObj: { type: Object },
emojiPicker: { attribute: false },
escapeHTML: { attribute: false },
hideMessages: { type: Array }, hideMessages: { type: Array },
openDialogPrivateMessage: {type: Boolean}, openDialogPrivateMessage: {type: Boolean},
openDialogBlockUser: {type: Boolean}, openDialogBlockUser: {type: Boolean},
@ -178,7 +180,6 @@ class MessageTemplate extends LitElement {
} }
render() { render() {
console.log(this.showBlockAddressIcon)
const hidemsg = this.hideMessages const hidemsg = this.hideMessages
let avatarImg = '' let avatarImg = ''
@ -210,7 +211,7 @@ class MessageTemplate extends LitElement {
</div> </div>
<div class="message-data-avatar" style="width:42px; height:42px; ${this.messageObj.sender === this.myAddress ? "float:left;" : "float:left;"} margin:3px;">${avatarImg}</div> <div class="message-data-avatar" style="width:42px; height:42px; ${this.messageObj.sender === this.myAddress ? "float:left;" : "float:left;"} margin:3px;">${avatarImg}</div>
<div class="message-container"> <div class="message-container">
<div id="messageContent" class="message ${this.messageObj.sender === this.myAddress ? "my-message float-left" : "other-message float-left"}">${this.emojiPicker.parse(this.escapeHTML(this.messageObj.decodedMessage))}</div> <div id="messageContent" class="message ${this.messageObj.sender === this.myAddress ? "my-message float-left" : "other-message float-left"}">${unsafeHTML(this.emojiPicker.parse(this.escapeHTML(this.messageObj.decodedMessage)))}</div>
<chat-menu <chat-menu
tabindex="0" tabindex="0"
class="chat-hover" class="chat-hover"