Merge pull request #372 from schlagmichdoch/fix-share-mode

Fix share-mode and enable pasting for Firefox users
schlagmichdoch · Feb 13, 2025 · 8826893 · 8826893
2 parents 94096aa + efc360e
commit 8826893
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/public/scripts/network.js b/public/scripts/network.js
@@ -1082,7 +1082,7 @@ class PeersManager {
     }
 
     async _onFilesSelected(message) {
-        let files = await mime.addMissingMimeTypesToFiles(message.files);
+        let files = mime.addMissingMimeTypesToFiles(message.files);
         await this.peers[message.to].requestFileTransfer(files);
     }
 

diff --git a/public/scripts/ui.js b/public/scripts/ui.js
@@ -179,10 +179,13 @@ class PeersUI {
 
         this._onDragEnd();
 
-        if ($$('x-peer') || !$$('x-peer').contains(e.target)) return; // dropped on peer
+        if ($$('x-peer') && $$('x-peer').contains(e.target)) return; // dropped on peer
 
-        const files = e.dataTransfer.files;
-        const text = e.dataTransfer.getData("text");
+        let files = e.dataTransfer.files;
+        let text = e.dataTransfer.getData("text");
+
+        // convert FileList to Array
+        files = [...files];
 
         if (files.length > 0) {
             Events.fire('activate-share-mode', {
@@ -215,8 +218,11 @@ class PeersUI {
         if (this.shareMode.active || Dialog.anyDialogShown()) return;
 
         e.preventDefault()
-        const files = e.clipboardData.files;
-        const text = e.clipboardData.getData("Text");
+        let files = e.clipboardData.files;
+        let text = e.clipboardData.getData("Text");
+
+        // convert FileList to Array
+        files = [...files];
 
         if (files.length > 0) {
             Events.fire('activate-share-mode', {files: files});
@@ -278,8 +284,6 @@ class PeersUI {
                 descriptorInstructions = Localization.getTranslation("instructions.activate-share-mode-shared-file");
             }
 
-            files = await mime.addMissingMimeTypesToFiles(files);
-
             if (files[0].type.split('/')[0] === 'image') {
                 try {
                     let imageUrl = await getThumbnailAsDataUrl(files[0], 80, null, 0.9);

diff --git a/public/scripts/util.js b/public/scripts/util.js
@@ -396,20 +396,20 @@ const mime = (() => {
     }
 
     return {
-        async guessMimeByFilename(filename) {
+        guessMimeByFilename(filename) {
             const split = filename.split('.');
             if (split.length === 1) {
                 // Filename does not include suffix
-                return "";
+                return false;
             }
             const suffix = split[split.length - 1].toLowerCase();
-            return suffixToMimeMap[suffix] || "";
+            return suffixToMimeMap[suffix];
         },
-        async addMissingMimeTypesToFiles(files) {
+        addMissingMimeTypesToFiles(files) {
             // if filetype is empty guess via suffix otherwise leave unchanged
             for (let i = 0; i < files.length; i++) {
                 if (!files[i].type) {
-                    files[i] = new File([files[i]], files[i].name, {type: await mime.guessMimeByFilename(files[i].name) || ""});
+                    files[i] = new File([files[i]], files[i].name, {type: mime.guessMimeByFilename(files[i].name) || ""});
                 }
             }
             return files;

diff --git a/public/styles/styles-main.css b/public/styles/styles-main.css
@@ -11,10 +11,6 @@ body {
     overflow-x: hidden;
     overscroll-behavior: none;
     overflow-y: hidden;
-    /* Only allow selection on message and pair key */
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    user-select: none;
     transition: color 300ms;
 }