Merged r19089 from trunk to 4.1-stable (#32469, #3816).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19090 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index b856ff4154c62179b1623448cf53938c8a280e6e..4a33daf55baad2680e1bfacd44ec78e68bd58b08 100644 (file)
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -255,6 +255,7 @@ function copyImageFromClipboard(e) {
   if (!$(e.target).hasClass('wiki-edit')) { return; }
   var clipboardData = e.clipboardData || e.originalEvent.clipboardData
   if (!clipboardData) { return; }
+  if (clipboardData.types.some(t => /^text/.test(t))) { return; }
 
   var items = clipboardData.items
   for (var i = 0 ; i < items.length ; i++) {