From d462ae85074eb11c24319b97e61904ec27a2130f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 8 Jun 2018 13:40:48 +0200 Subject: [PATCH] Use "dropnofiles" callback to disable the drop state in the UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a file is dragged from the desktop to the file list the file list is highlighted, and when the file is finally dropped or the drag operation is cancelled the highlighting is removed. In some cases, due to a wrong implementation, a browser may end a file drag with a drop with no files (for example, when a folder or text is dragged), which would cause the highlight to not be removed. Now those cases are handled with the "dropnofiles" callback, which restores the UI and also shows a message to the user. The error message is just a generic one, as in some cases it is not even possible to know whether the problem came from a text drag or a folder drag, and whether the problem appears or not depends on the browser, version and even operating system. Signed-off-by: Daniel Calviño Sánchez --- apps/files/js/file-upload.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index dfa460c914..4244bd673d 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -1166,6 +1166,16 @@ OC.Uploader.prototype = _.extend({ }); fileupload.on('fileuploaddragleave fileuploaddrop', disableDropState); + // In some browsers the "drop" event can be triggered with no + // files even if the "dragover" event seemed to suggest that a + // file was being dragged (and thus caused "fileuploaddragover" + // to be triggered). + fileupload.on('fileuploaddropnofiles', function() { + disableDropState(); + + OC.Notification.show(t('files', 'Uploading that item is not supported'), {type: 'error'}); + }); + fileupload.on('fileuploadchunksend', function(e, data) { // modify the request to adjust it to our own chunking var upload = self.getUpload(data);