diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-06-26 13:50:09 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-06-26 13:50:09 +0000 |
| commit | f3acfc772ab057f7832f7dcf8e7d75b593d142f7 (patch) | |
| tree | eff35e5b0c0ffa089dfc54761b892b7aa592a548 /public | |
| parent | f9cec4a18a1689b326dced3eab406d8628101930 (diff) | |
| download | redmine-f3acfc772ab057f7832f7dcf8e7d75b593d142f7.tar.gz redmine-f3acfc772ab057f7832f7dcf8e7d75b593d142f7.zip | |
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
Diffstat (limited to 'public')
| -rw-r--r-- | public/javascripts/attachments.js | 2 |
1 files changed, 1 insertions, 1 deletions
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++) { |