Browse Source

Merged r21463 to 4.2-stable (#36013).

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21493 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.5
Marius Balteanu 2 years ago
parent
commit
5b44366d8d
1 changed files with 6 additions and 8 deletions
  1. 6
    8
      public/javascripts/attachments.js

+ 6
- 8
public/javascripts/attachments.js View File

@@ -275,11 +275,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()
@@ -288,9 +287,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);

Loading…
Cancel
Save