Merged r21463 to 4.1-stable (#36013).

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

diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index f5d2f727bfb58907598f51a5e9d697df83b55c06..b5173c06700abf2f9b95620b741eef77983e6d42 100644 (file)
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -259,11 +259,10 @@ function copyImageFromClipboard(e) {
   if (!clipboardData) { 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++) {
-    var item = items[i];
-    if (item.type.indexOf("image") != -1) {
-      var blob = item.getAsFile();
+  var files = clipboardData.files
+  for (var i = 0 ; i < files.length ; i++) {
+    var file = files[i];
+    if (file.type.indexOf("image") != -1) {
       var date = new Date();
       var filename = 'clipboard-'
         + date.getFullYear()
@@ -272,9 +271,8 @@ function copyImageFromClipboard(e) {
         + ('0'+date.getHours()).slice(-2)
         + ('0'+date.getMinutes()).slice(-2)
         + '-' + randomKey(5).toLocaleLowerCase()
-        + '.' + blob.name.split('.').pop();
-      var file = new Blob([blob], {type: blob.type});
-      file.name = filename;
+        + '.' + file.name.split('.').pop();
+
       var inputEl = $('input:file.filedrop').first()
       handleFileDropEvent.target = e.target;
       addFile(inputEl, file, true);