Merged r19834 from trunk to 4.1-stable (#33639).

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

diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 39315d8f8b0f94983c0c4661e59a02ef01a392d6..f5d2f727bfb58907598f51a5e9d697df83b55c06 100644 (file)
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -257,7 +257,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(function(t){ return /^text/.test(t); })) { return; }
+  if (clipboardData.types.some(function(t){ return /^text\/plain$/.test(t); })) { return; }
 
   var items = clipboardData.items
   for (var i = 0 ; i < items.length ; i++) {