Merge branch 'maintenance' into devel

This commit is contained in:
Gina Häußge 2016-02-03 12:53:12 +01:00
commit c3776106ec

View file

@ -654,17 +654,6 @@ $(function() {
var dropZoneSdBackground = $("#drop_sd_background");
var timeout = window.dropZoneTimeout;
var dataTransfer = undefined;
if (e.dataTransfer) {
dataTransfer = e.dataTransfer;
} else if (e.originalEvent && e.originalEvent.dataTransfer) {
dataTransfer = e.originalEvent.dataTransfer;
}
if (!dataTransfer || !dataTransfer.items || dataTransfer.items.length > 1 || dataTransfer.items[0].kind != "file") {
return;
}
if (!timeout) {
dropOverlay.addClass('in');
} else {