diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-11-19 02:36:08 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-11-19 02:36:08 +0000 |
| commit | e88dfda424f47543218fcca50b47e5ffb03ab4b6 (patch) | |
| tree | 7b02574f5cf2b4e8d7575c2be012b0fd88479def /public | |
| parent | a59f8813ab727256d2a20f029242ddd1a441c518 (diff) | |
| download | redmine-e88dfda424f47543218fcca50b47e5ffb03ab4b6.tar.gz redmine-e88dfda424f47543218fcca50b47e5ffb03ab4b6.zip | |
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
Diffstat (limited to 'public')
| -rw-r--r-- | public/javascripts/attachments.js | 1 |
1 files changed, 1 insertions, 0 deletions
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++) { |