From ce860230e80896888390720614868b38471bd076 Mon Sep 17 00:00:00 2001 From: adb Date: Mon, 9 Nov 2020 01:13:01 +0100 Subject: [PATCH] linebreak update --- api.js | 2 +- package-lock.json | 12 ++++++++++++ src/components/message.vue | 1 + src/components/messageReceive.vue | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/api.js b/api.js index c18fd77..7521469 100644 --- a/api.js +++ b/api.js @@ -36,7 +36,7 @@ wss.on('connection', (ws, req) => { ws.send(JSON.stringify({type: "error", content: "your message was empty"})) else{ msg.content.user = thisuser - msg.content.text = msg.content.text.replace(//g, ">").replace(/\n/g, "
") + //msg.content.text = msg.content.text.replace(//g, ">").replace(/\n/g, "
") wss.clients.forEach(client => client.send(JSON.stringify(msg))) } else if (msg.type === 'login' && msg.content.user !== ""){ diff --git a/package-lock.json b/package-lock.json index ec9fe12..17afd0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2481,6 +2481,18 @@ "requires": { "inherits": "2.0.1" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.0.0-rc.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-rc.1.tgz", + "integrity": "sha512-yR+BS90EOXTNieasf8ce9J3TFCpm2DGqoqdbtiwQ33hon3FyIznLX7sKavAq1VmfBnOeV6It0Htg4aniv8ph1g==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, diff --git a/src/components/message.vue b/src/components/message.vue index e73e5c4..bf76fc8 100644 --- a/src/components/message.vue +++ b/src/components/message.vue @@ -34,6 +34,7 @@ export default { border-radius: 1rem 1rem 0 1rem; text-align: left; word-break: break-word; + white-space: pre-line; } @media (min-width: 45rem){ diff --git a/src/components/messageReceive.vue b/src/components/messageReceive.vue index 2a1b2ff..f34b3af 100644 --- a/src/components/messageReceive.vue +++ b/src/components/messageReceive.vue @@ -33,5 +33,6 @@ export default { border-radius: 1rem 1rem 1rem 0; text-align: left; word-break: break-word; + white-space: pre-line; } \ No newline at end of file