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 753855f91979d1a8312b943faec60b994094cab2..2ad037b60718730e728ce8f6cb5d20c41a98b4cb 100644 (file)
--- 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() {