|
@@ -2141,12 +2141,12 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
|
|
|
// Drag and drop uploads from anywhere on filebrowser screen
|
|
// Drag and drop uploads from anywhere on filebrowser screen
|
|
|
if (window.FileReader) {
|
|
if (window.FileReader) {
|
|
|
var showHoverMsg = function (msg) {
|
|
var showHoverMsg = function (msg) {
|
|
|
- $('.hoverText').html(msg);
|
|
|
|
|
- $('.hoverMsg').removeClass('hide');
|
|
|
|
|
|
|
+ $('.filebrowser .hoverText').html(msg);
|
|
|
|
|
+ $('.filebrowser .hoverMsg').removeClass('hide');
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
var hideHoverMsg = function () {
|
|
var hideHoverMsg = function () {
|
|
|
- $('.hoverMsg').addClass('hide');
|
|
|
|
|
|
|
+ $('.filebrowser .hoverMsg').addClass('hide');
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
var _isDraggingOverText = false,
|
|
var _isDraggingOverText = false,
|
|
@@ -2170,14 +2170,14 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- $('.hoverText').on('dragenter', function (e) {
|
|
|
|
|
|
|
+ $('.filebrowser .hoverText').on('dragenter', function (e) {
|
|
|
e.preventDefault();
|
|
e.preventDefault();
|
|
|
e.stopPropagation();
|
|
e.stopPropagation();
|
|
|
e.stopImmediatePropagation();
|
|
e.stopImmediatePropagation();
|
|
|
_isDraggingOverText = true;
|
|
_isDraggingOverText = true;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- $('.hoverText').on('dragleave', function (e) {
|
|
|
|
|
|
|
+ $('.filebrowser .hoverText').on('dragleave', function (e) {
|
|
|
e.preventDefault();
|
|
e.preventDefault();
|
|
|
e.stopPropagation();
|
|
e.stopPropagation();
|
|
|
e.stopImmediatePropagation();
|
|
e.stopImmediatePropagation();
|
|
@@ -2185,7 +2185,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
|
|
|
_isExternalFile = true;
|
|
_isExternalFile = true;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- $('.hoverMsg').on('dragleave', function (e) {
|
|
|
|
|
|
|
+ $('.filebrowser .hoverMsg').on('dragleave', function (e) {
|
|
|
if (!_isDraggingOverText) {
|
|
if (!_isDraggingOverText) {
|
|
|
hideHoverMsg();
|
|
hideHoverMsg();
|
|
|
}
|
|
}
|
|
@@ -2216,7 +2216,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
|
|
|
'<div class="progress-row-bar" data-dz-uploadprogress></div>' +
|
|
'<div class="progress-row-bar" data-dz-uploadprogress></div>' +
|
|
|
'</div>',
|
|
'</div>',
|
|
|
drop: function (e) {
|
|
drop: function (e) {
|
|
|
- $('.hoverMsg').addClass('hide');
|
|
|
|
|
|
|
+ $('.filebrowser .hoverMsg').addClass('hide');
|
|
|
|
|
|
|
|
// Ensure dropped item was a file
|
|
// Ensure dropped item was a file
|
|
|
if (e.dataTransfer.files.length > 0) {
|
|
if (e.dataTransfer.files.length > 0) {
|
|
@@ -2266,7 +2266,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
if (ops.path.toLowerCase() !== 's3a://') {
|
|
if (ops.path.toLowerCase() !== 's3a://') {
|
|
|
- _dropzone = new Dropzone($('.hoverMsg')[0], options);
|
|
|
|
|
|
|
+ _dropzone = new Dropzone($('.filebrowser .hoverMsg')[0], options);
|
|
|
|
|
|
|
|
_dropzone.on('queuecomplete', function () {
|
|
_dropzone.on('queuecomplete', function () {
|
|
|
setTimeout(function () {
|
|
setTimeout(function () {
|