]> cat aescling's git repositories - mastodon.git/commitdiff
Allow event defaults on index for text data transfer (#9840)
authortmm576 <tmm576@users.noreply.github.com>
Thu, 17 Jan 2019 22:27:51 +0000 (17:27 -0500)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 17 Jan 2019 22:27:51 +0000 (23:27 +0100)
app/javascript/mastodon/features/ui/index.js

index a59c0a257a2ab5ac665db7cd2f33676bcdedd1d6..f01c2bf247861d4d3676303a238271f7d0c7aec0 100644 (file)
@@ -243,6 +243,7 @@ class UI extends React.PureComponent {
   }
 
   handleDragOver = (e) => {
+    if (this.dataTransferIsText(e.dataTransfer)) return false;
     e.preventDefault();
     e.stopPropagation();
 
@@ -256,6 +257,7 @@ class UI extends React.PureComponent {
   }
 
   handleDrop = (e) => {
+    if (this.dataTransferIsText(e.dataTransfer)) return;
     e.preventDefault();
 
     this.setState({ draggingOver: false });
@@ -279,6 +281,10 @@ class UI extends React.PureComponent {
     this.setState({ draggingOver: false });
   }
 
+  dataTransferIsText = (dataTransfer) => {
+    return (dataTransfer && Array.from(dataTransfer.types).includes('text/plain') && dataTransfer.items.length === 1);
+  }
+
   closeUploadModal = () => {
     this.setState({ draggingOver: false });
   }