From: Go MAEDA <maeda@farend.jp>
Date: Tue, 19 Nov 2019 02:36:08 +0000 (+0000)
Subject: Merged r19089 from trunk to 4.1-stable (#32469, #3816).
X-Git-Tag: 4.1.0~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e88dfda424f47543218fcca50b47e5ffb03ab4b6;p=redmine.git

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 b856ff415..4a33daf55 100644
--- 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++) {