mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 15:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use native clipboard.writeText, Cleanup polyfill

Browse source
This commit is contained in:
RobinLinus 2020-12-20 04:41:16 +01:00
parent 212562727f
commit a1eb71a768
3 changed files with 43 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/index.html
View file

@ -195,6 +195,7 @@
<!-- Scripts --> <!-- Scripts -->
<script src="scripts/network.js"></script> <script src="scripts/network.js"></script>
<script src="scripts/ui.js"></script> <script src="scripts/ui.js"></script>
<script src="scripts/clipboard.js" async></script>
<!-- Sounds --> <!-- Sounds -->
<audio id="blop" autobuffer="true"> <audio id="blop" autobuffer="true">
<source src="/sounds/blop.mp3" type="audio/mpeg"> <source src="/sounds/blop.mp3" type="audio/mpeg">

38
client/scripts/clipboard.js Normal file
View file

@ -0,0 +1,38 @@
// Polyfill for Navigator.clipboard.writeText
if (!navigator.clipboard) {
navigator.clipboard = {
writeText: text => {
// A <span> contains the text to copy
const span = document.createElement('span');
span.textContent = text;
span.style.whiteSpace = 'pre'; // Preserve consecutive spaces and newlines
// Paint the span outside the viewport
span.style.position = 'absolute';
span.style.left = '-9999px';
span.style.top = '-9999px';
const win = window;
const selection = win.getSelection();
win.document.body.appendChild(span);
const range = win.document.createRange();
selection.removeAllRanges();
range.selectNode(span);
selection.addRange(range);
let success = false;
try {
success = win.document.execCommand('copy');
} catch (err) {
return Promise.error();
}
selection.removeAllRanges();
span.remove();
return Promise.resolve();
}
}
}

38
client/scripts/ui.js
View file

@ -24,7 +24,7 @@ class PeersUI {
} }
_onPeerJoined(peer) { _onPeerJoined(peer) {
if (document.getElementById(peer.id)) return; if ($(peer.id)) return; // peer already exists
const peerUI = new PeerUI(peer); const peerUI = new PeerUI(peer);
$$('x-peers').appendChild(peerUI.$el); $$('x-peers').appendChild(peerUI.$el);
} }
@ -348,8 +348,8 @@ class ReceiveTextDialog extends Dialog {
window.blop.play(); window.blop.play();
} }
_onCopy() { async _onCopy() {
if (!document.copy(this.$text.textContent)) return; await navigator.clipboard.writeText(this.$text.textContent);
Events.fire('notify-user', 'Copied to clipboard'); Events.fire('notify-user', 'Copied to clipboard');
} }
} }
@ -440,7 +440,7 @@ class Notifications {
_copyText(message, notification) { _copyText(message, notification) {
notification.close(); notification.close();
if (!document.copy(message)) return; if (!navigator.clipboard.writeText(message)) return;
this._notify('Copied text to clipboard'); this._notify('Copied text to clipboard');
} }
@ -512,36 +512,6 @@ class Snapdrop {
const snapdrop = new Snapdrop(); const snapdrop = new Snapdrop();
document.copy = text => {
// A <span> contains the text to copy
const span = document.createElement('span');
span.textContent = text;
span.style.whiteSpace = 'pre'; // Preserve consecutive spaces and newlines
// Paint the span outside the viewport
span.style.position = 'absolute';
span.style.left = '-9999px';
span.style.top = '-9999px';
const win = window;
const selection = win.getSelection();
win.document.body.appendChild(span);
const range = win.document.createRange();
selection.removeAllRanges();
range.selectNode(span);
selection.addRange(range);
let success = false;
try {
success = win.document.execCommand('copy');
} catch (err) {}
selection.removeAllRanges();
span.remove();
return success;
}
if ('serviceWorker' in navigator) { if ('serviceWorker' in navigator) {