From: Go MAEDA <maeda@farend.jp>
Date: Fri, 26 Jun 2020 13:50:09 +0000 (+0000)
Subject: Merged r19834 from trunk to 4.1-stable (#33639).
X-Git-Tag: 4.1.2~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f3acfc772ab057f7832f7dcf8e7d75b593d142f7;p=redmine.git

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 39315d8f8..f5d2f727b 100644
--- 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++) {