From 3dfe102b737745523ed1ef2169f582877320b87f Mon Sep 17 00:00:00 2001 From: Phillip Lang Martinez Date: Tue, 8 Nov 2022 00:31:43 +0200 Subject: [PATCH] fix error when pasting text add max byte condition --- qortal-ui-core/language/us.json | 3 +- .../plugins/core/components/ChatPage.js | 33 ++++++++++--------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index 3e32d857..97fe5c03 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -487,7 +487,8 @@ "cchange25": "Edit Message", "cchange26": "File size exceeds 5 MB", "cchange27": "A registered name is required to send images", - "cchange28": "This file is not an image" + "cchange28": "This file is not an image", + "cchange29": "Maximum message size is 1000 bytes" }, "welcomepage": { "wcchange1": "Welcome to Q-Chat", diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js index 5465c4ab..a62e724a 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatPage.js +++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js @@ -1512,10 +1512,10 @@ class ChatPage extends LitElement { } else if (/^\s*$/.test(trimmedMessage)) { this.isLoading = false; this.chatEditor.enable(); - } else if (trimmedMessage.length >= 256) { + } else if (this.chatMessageSize >= 1000) { this.isLoading = false; this.chatEditor.enable(); - let err1string = get("chatpage.cchange24"); + let err1string = get("chatpage.cchange29"); parentEpml.request('showSnackBar', `${err1string}`); } else if (this.repliedToMessageObj) { let chatReference = this.repliedToMessageObj.reference @@ -1882,7 +1882,6 @@ class ChatPage extends LitElement { for (let i = 0; i < events.length; i++) { const event = events[i] editor.content.body.addEventListener(event, async function (e) { - console.log("hello world12") if (e.type === 'click') { e.preventDefault(); e.stopPropagation(); @@ -1891,30 +1890,34 @@ class ChatPage extends LitElement { if (e.type === 'paste') { e.preventDefault(); const item_list = await navigator.clipboard.read(); - console.log({item_list}) let image_type; // we will feed this later const item = item_list.find( item => // choose the one item holding our image - item.types.some( type => { // does this item have our type + item.types.some( type => { if (type.startsWith( 'image/')) { - image_type = type; // store which kind of image type it is + image_type = type; return true; } }) ); - const blob = item && await item.getType( image_type ); + if(item){ + const blob = item && await item.getType( image_type ); var file = new File([blob], "name", { type: image_type }); editorConfig.insertImage(file) - navigator.clipboard.readText().then(clipboardText => { - let escapedText = editorConfig.escape(clipboardText); - editor.insertText(escapedText); - }).catch(err => { - // Fallback if everything fails... - let textData = (e.originalEvent || e).clipboardData.getData('text/plain'); - editor.insertText(textData); - }) + } else { + navigator.clipboard.readText().then(clipboardText => { + let escapedText = editorConfig.escape(clipboardText); + editor.insertText(escapedText); + }).catch(err => { + // Fallback if everything fails... + let textData = (e.originalEvent || e).clipboardData.getData('text/plain'); + editor.insertText(textData); + }) + } + + return false; }