From: Go MAEDA Date: Mon, 9 Mar 2020 10:57:36 +0000 (+0000) Subject: Merged r19566 from trunk to 4.0-stable (#32656). X-Git-Tag: 4.0.7~12 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe7fd22a0c14506edd64ad8bcba3d06af394266a;p=redmine.git Merged r19566 from trunk to 4.0-stable (#32656). git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19568 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 753855f91..2ad037b60 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -185,6 +185,7 @@ handleFileDropEvent.target = ''; function dragOverHandler(e) { $(this).addClass('fileover'); blockEventPropagation(e); + e.dataTransfer.dropEffect = 'copy'; } function dragOutHandler(e) { @@ -195,6 +196,7 @@ function dragOutHandler(e) { function setupFileDrop() { if (window.File && window.FileList && window.ProgressEvent && window.FormData) { + $.event.fixHooks.dragover = { props: [ 'dataTransfer' ] }; $.event.fixHooks.drop = { props: [ 'dataTransfer' ] }; $('form div.box:not(.filedroplistner)').has('input:file.filedrop').each(function() {