diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-08-26 18:32:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 18:32:03 +0200 |
| commit | ad283e40b48f48f1ce1827cf2983375a62076c95 (patch) | |
| tree | e2ffe4387e7227638c8cbc5961457074f5707714 /apps/files/js | |
| parent | 0ec858f7e99eccc6710a0829accc2e4c3b9ed79c (diff) | |
| parent | 99b102e15ddc93126bd27d179248b948fbaf80d1 (diff) | |
| download | nextcloud-server-ad283e40b48f48f1ce1827cf2983375a62076c95.tar.gz nextcloud-server-ad283e40b48f48f1ce1827cf2983375a62076c95.zip | |
Merge pull request #6270 from nextcloud/6252-12
[stable12] Don't try the actual file upload if the checks already error out
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 3 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 11365a310ed..85284a63381 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -1113,6 +1113,9 @@ OC.Uploader.prototype = _.extend({ }); fileupload.on('fileuploaddrop', function(e, data) { self.trigger('drop', e, data); + if (e.isPropagationStopped()) { + return false; + } }); } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9fecef9f97b..82edee2efdf 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2790,6 +2790,7 @@ var isCreatable = (self.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0; if (!isCreatable) { self._showPermissionDeniedNotification(); + e.stopPropagation(); return false; } |