Fix constructor for Firefox

novnc · May 4, 2020 · a066619 · a066619
1 parent db03925
commit a066619
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/core/rfb.js b/core/rfb.js
@@ -1531,7 +1531,12 @@ export default class RFB extends EventTargetMixin {
             if (Clipboard.isSupported) {
                 const clipboardData = new DataTransfer();
                 clipboardData.setData("text/plain", text);
-                this._canvas.dispatchEvent(new ClipboardEvent('copy', { clipboardData }));
+                const clipboardEvent = new ClipboardEvent('paste', { clipboardData });
+                // Force initialization since the constructor is broken in Firefox
+                if (!clipboardEvent.clipboardData.items.length) {
+                    clipboardEvent.clipboardData.items.add(text, "text/plain");
+                }
+                this._canvas.dispatchEvent(clipboardEvent);
             }
 
         } else {

diff --git a/tests/test.clipboard.js b/tests/test.clipboard.js
@@ -31,7 +31,12 @@ describe('Automatic Clipboard Sync', function () {
         if (Clipboard.isSupported) {
             const clipboardData = new DataTransfer();
             clipboardData.setData("text/plain", text);
-            clipboard._handleCopy(new ClipboardEvent('paste', { clipboardData }));
+            const clipboardEvent = new ClipboardEvent('paste', { clipboardData });
+            // Force initialization since the constructor is broken in Firefox
+            if (!clipboardEvent.clipboardData.items.length) {
+                clipboardEvent.clipboardData.items.add(text, "text/plain");
+            }
+            clipboard._handleCopy(clipboardEvent);
             if (navigator.clipboard.writeText) {
                 expect(navigator.clipboard.writeText).to.have.been.calledWith(text);
             }
@@ -45,7 +50,12 @@ describe('Automatic Clipboard Sync', function () {
         if (Clipboard.isSupported) {
             const clipboardData = new DataTransfer();
             clipboardData.setData("text/plain", text);
-            clipboard._handlePaste(new ClipboardEvent('paste', { clipboardData }));
+            const clipboardEvent = new ClipboardEvent('paste', { clipboardData });
+            // Force initialization since the constructor is broken in Firefox
+            if (!clipboardEvent.clipboardData.items.length) {
+                clipboardEvent.clipboardData.items.add(text, "text/plain");
+            }
+            clipboard._handlePaste(clipboardEvent);
             if (navigator.clipboard.readText) {
                 expect(navigator.clipboard.readText).to.have.been.called;
             }