From dbe6df1ab6add24a3227c19a7cabcd9718529e97 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <github@xpaw.me>
Date: Mon, 9 Jul 2018 21:37:52 +0300
Subject: [PATCH] Fix clipboard "fixes"

---
 client/components/MessageList.vue | 5 +++++
 client/js/clipboard.js            | 7 ++-----
 client/js/lounge.js               | 1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index 6254c116..9b3eb8c7 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -4,6 +4,7 @@
 		role="log"
 		aria-live="polite"
 		aria-relevant="additions"
+		@copy="onCopy"
 	>
 		<template v-for="(message, id) in getCondensedMessages">
 			<div
@@ -41,6 +42,7 @@
 
 <script>
 const constants = require("../js/constants");
+const clipboard = require("../js/clipboard");
 import Message from "./Message.vue";
 import MessageCondensed from "./MessageCondensed.vue";
 
@@ -110,6 +112,9 @@ export default {
 
 			return true;
 		},
+		onCopy() {
+			clipboard(this.$el);
+		},
 	},
 };
 </script>
diff --git a/client/js/clipboard.js b/client/js/clipboard.js
index 2b05d47e..980bf9d0 100644
--- a/client/js/clipboard.js
+++ b/client/js/clipboard.js
@@ -1,9 +1,8 @@
 "use strict";
 
 const $ = require("jquery");
-const chat = document.getElementById("chat");
 
-function copyMessages() {
+module.exports = function(chat) {
 	const selection = window.getSelection();
 
 	// If selection does not span multiple elements, do nothing
@@ -37,6 +36,4 @@ function copyMessages() {
 		selection.removeAllRanges();
 		selection.addRange(range);
 	}, 0);
-}
-
-$(chat).on("copy", ".messages", copyMessages);
+};
diff --git a/client/js/lounge.js b/client/js/lounge.js
index 2610e3cd..7feb357a 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -18,7 +18,6 @@ window.vueMounted = () => {
 	const utils = require("./utils");
 	require("./webpush");
 	require("./keybinds");
-	require("./clipboard");
 
 	const sidebar = $("#sidebar, #footer");
 	const viewport = $("#viewport");