Commit fbf2f9c7 authored by Cyril Vazquez's avatar Cyril Vazquez
Browse files

Merge branch 'develop' into 'Support/2.8.X'

Develop

See merge request !731
parents 156e1a42 65c10f5e
Pipeline #19375 failed with stages
in 22 seconds
......@@ -51,6 +51,9 @@ class Zip
} elseif (is_array($package)) {
$data = $package['handler'];
$encoding = null;
} else if (is_string($package)) {
$data = $package;
$encoding = null;
}
......
......@@ -136,7 +136,7 @@ var zipContent = "";
e.preventDefault();
e.stopPropagation();
$('#packageDropZone').css('opacity', '0.5');
selectPackageFile();
selectPackageFile(e.originalEvent.dataTransfer);
}
}
}
......@@ -179,9 +179,12 @@ var zipContent = "";
return false;
}
function selectPackageFile()
function selectPackageFile(source)
{
let file = $('#packagefileBrowser').get(0).files[0];
if (!source) {
source = $('#packagefileBrowser').get(0);
}
let file = source.files[0];
$('#packageFileName').html(file.name);
$('#packageFileSize').html(file.size + ' ' + $('#byte_text').html());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment